diff --git a/.github/workflows/openshift-tests.yml b/.github/workflows/openshift-tests.yml index 6e47e950..1cae7ec2 100644 --- a/.github/workflows/openshift-tests.yml +++ b/.github/workflows/openshift-tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - version: [ "2.5-ubi8", "3.1-ubi8", "3.0-ubi9", "3.1-ubi9", "3.3-ubi8", "3.3-ubi9" ] + version: [ "2.5-ubi8", "3.0-ubi9", "3.3-ubi8", "3.3-ubi9", "3.3-ubi10" ] if: | github.event.issue.pull_request @@ -20,11 +20,11 @@ jobs: - uses: sclorg/testing-farm-as-github-action@main with: api_key: ${{ secrets.TF_INTERNAL_API_KEY }} - compose: "RHEL-9.4.0-Nightly" + compose: "RHEL-9.6.0-Nightly" git_url: "https://gitlab.cee.redhat.com/platform-eng-core-services/sclorg-tmt-plans" git_ref: "master" tf_scope: "private" tmt_plan_regex: "rhel9-openshift-pytest" update_pull_request_status: true pull_request_status_name: "RHEL9-OpenShift-4 - imagestream test ${{ matrix.version }}" - variables: "REPO_URL=${{ github.server_url }}/${{ github.repository }};REPO_NAME=${{ github.repository }};PR_NUMBER=${{ github.event.issue.number }};OS=rhel9;SINGLE_VERSION=${{ matrix.version }};TEST_NAME=test-openshift-pytest" \ No newline at end of file + variables: "REPO_URL=${{ github.server_url }}/${{ github.repository }};REPO_NAME=${{ github.repository }};PR_NUMBER=${{ github.event.issue.number }};OS=rhel9;SINGLE_VERSION=${{ matrix.version }};TEST_NAME=test-openshift-pytest" diff --git a/openshift/templates/rails-postgresql-persistent.json b/openshift/templates/rails-postgresql-persistent.json index 5284995b..171d5be4 100644 --- a/openshift/templates/rails-postgresql-persistent.json +++ b/openshift/templates/rails-postgresql-persistent.json @@ -177,7 +177,7 @@ "initContainers": [ { "name": "ruby-init-container", - "image": " ", + "image": "${NAME}:latest", "command": [ "./migrate-database.sh" ], diff --git a/openshift/templates/rails.json b/openshift/templates/rails.json index c2fc3083..95bbd64f 100644 --- a/openshift/templates/rails.json +++ b/openshift/templates/rails.json @@ -155,7 +155,7 @@ "spec": { "containers": [ { - "name": "rails-example", + "name": "${NAME}", "image": "${NAME}:latest", "ports": [ {