From 8f4dbc1272eaa0b5099a82b40e6b04dc570efa2d Mon Sep 17 00:00:00 2001 From: Li Zhang Date: Fri, 19 Jun 2026 11:48:28 +0800 Subject: [PATCH 1/4] Update quay ARO Azure e2e tests to quay 3.17 on OCP 4.21 Replace quay 3.12/3.13/3.14 ARO periodic jobs with a single quay 3.17 job targeting OCP 4.21, using FBC catalog source. Co-Authored-By: Claude Opus 4.6 (1M context) --- .../quay-quay-tests-master__quay-aro-ocp.yaml | 85 +------ .../quay-quay-tests-master-periodics.yaml | 219 +----------------- 2 files changed, 15 insertions(+), 289 deletions(-) diff --git a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml index 556e1ac139b40..fe4c66f085e7b 100644 --- a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml +++ b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml @@ -1,17 +1,17 @@ base_images: cli: - name: "4.19" + name: "4.21" namespace: ocp tag: cli upi-installer: - name: "4.19" + name: "4.21" namespace: ocp tag: upi-installer build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-9-release-golang-1.21-openshift-4.18 + tag: rhel-9-release-golang-1.25-openshift-4.21 prowgen: expose: true private: true @@ -21,7 +21,7 @@ releases: architecture: amd64 product: ocp stream: nightly - version: "4.19" + version: "4.21" resources: '*': limits: @@ -30,82 +30,21 @@ resources: cpu: 100m memory: 200Mi tests: -- as: quay-e2e-tests-quay312-aro-ocp419 +- as: quay-e2e-tests-quay317-aro-ocp421 cron: 0 12 * * 3 - reporter_config: - channel: '#quay-qe' - job_states_to_report: - - success - - failure - - error - report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: - Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> - {{end}}' steps: cluster_profile: azure-qe env: ARO_WORKER_COUNT: "6" ARO_WORKER_VM_SIZE: Standard_D8s_v3 - CSO_CHANNEL: stable-3.12 - QBO_CHANNEL: stable-3.12 - QUAY_OPERATOR_CHANNEL: stable-3.12 - QUAY_VERSION: "3.12" - test: - - ref: quay-tests-deploy-quay-azure - - ref: quay-tests-test-quay-e2e - - ref: quay-tests-qbo-qe-test - - ref: quay-tests-cso-qe-test - workflow: cucushift-installer-rehearse-azure-aro -- as: quay-e2e-tests-quay314-aro-ocp419 - cron: 0 12 * * 4 - reporter_config: - channel: '#quay-qe' - job_states_to_report: - - success - - failure - - error - report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: - Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> - {{end}}' - steps: - cluster_profile: azure-qe - env: - ARO_WORKER_COUNT: "6" - ARO_WORKER_VM_SIZE: Standard_D8s_v3 - CSO_CHANNEL: stable-3.14 - QBO_CHANNEL: stable-3.14 - QUAY_OPERATOR_CHANNEL: stable-3.14 - QUAY_VERSION: "3.14" - test: - - ref: quay-tests-deploy-quay-azure - - ref: quay-tests-test-quay-e2e - - ref: quay-tests-qbo-qe-test - - ref: quay-tests-cso-qe-test - workflow: cucushift-installer-rehearse-azure-aro -- as: quay-e2e-tests-quay313-aro-ocp419 - cron: 0 12 * * 5 - reporter_config: - channel: '#quay-qe' - job_states_to_report: - - success - - failure - - error - report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: - Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> - {{end}}' - steps: - cluster_profile: azure-qe - env: - ARO_WORKER_COUNT: "6" - ARO_WORKER_VM_SIZE: Standard_D8s_v3 - CSO_CHANNEL: stable-3.13 - QBO_CHANNEL: stable-3.13 - QUAY_OPERATOR_CHANNEL: stable-3.13 - QUAY_VERSION: "3.13" + CSO_CHANNEL: stable-3.17 + MULTISTAGE_PARAM_OVERRIDE_QUAY_INDEX_IMAGE: quay.io/redhat-user-workloads/quay-eng-tenant/stable-3-17-v4-21@sha256:4d329eb8c32ce91a9844fd18959f6076da0e41cb4020544d2537f86dc875ccd7 + QBO_CHANNEL: stable-3.17 + QUAY_OPERATOR_CHANNEL: stable-3.17 + QUAY_OPERATOR_SOURCE: fbc-operator-catalog + QUAY_VERSION: "3.17" test: + - ref: quay-tests-enable-quay-catalogsource - ref: quay-tests-deploy-quay-azure - ref: quay-tests-test-quay-e2e - ref: quay-tests-qbo-qe-test diff --git a/ci-operator/jobs/quay/quay-tests/quay-quay-tests-master-periodics.yaml b/ci-operator/jobs/quay/quay-tests/quay-quay-tests-master-periodics.yaml index 6114f13f483b8..72a3f47e87fc5 100644 --- a/ci-operator/jobs/quay/quay-tests/quay-quay-tests-master-periodics.yaml +++ b/ci-operator/jobs/quay/quay-tests/quay-quay-tests-master-periodics.yaml @@ -7978,222 +7978,9 @@ periodics: ci-operator.openshift.io/cloud-cluster-profile: azure-qe ci-operator.openshift.io/variant: quay-aro-ocp ci.openshift.io/generator: prowgen - job-release: "4.19" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-quay-quay-tests-master-quay-aro-ocp-quay-e2e-tests-quay312-aro-ocp419 - reporter_config: - slack: - channel: '#quay-qe' - job_states_to_report: - - success - - failure - - error - report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: - Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> {{end}}' - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --oauth-token-path=/usr/local/github-credentials/oauth - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=quay-e2e-tests-quay312-aro-ocp419 - - --variant=quay-aro-ocp - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /usr/local/github-credentials - name: github-credentials-openshift-ci-robot-private-git-cloner - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build03 - cron: 0 12 * * 5 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: master - org: quay - repo: quay-tests - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-qe - ci-operator.openshift.io/variant: quay-aro-ocp - ci.openshift.io/generator: prowgen - job-release: "4.19" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-quay-quay-tests-master-quay-aro-ocp-quay-e2e-tests-quay313-aro-ocp419 - reporter_config: - slack: - channel: '#quay-qe' - job_states_to_report: - - success - - failure - - error - report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: - Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> {{end}}' - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --oauth-token-path=/usr/local/github-credentials/oauth - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=quay-e2e-tests-quay313-aro-ocp419 - - --variant=quay-aro-ocp - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /usr/local/github-credentials - name: github-credentials-openshift-ci-robot-private-git-cloner - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: github-credentials-openshift-ci-robot-private-git-cloner - secret: - secretName: github-credentials-openshift-ci-robot-private-git-cloner - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator -- agent: kubernetes - cluster: build03 - cron: 0 12 * * 4 - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: master - org: quay - repo: quay-tests - labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure-qe - ci-operator.openshift.io/variant: quay-aro-ocp - ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.21" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-quay-quay-tests-master-quay-aro-ocp-quay-e2e-tests-quay314-aro-ocp419 - reporter_config: - slack: - channel: '#quay-qe' - job_states_to_report: - - success - - failure - - error - report_template: '{{if eq .Status.State "success"}} :slack-green: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> {{else}} :failed: - Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> {{end}}' + name: periodic-ci-quay-quay-tests-master-quay-aro-ocp-quay-e2e-tests-quay317-aro-ocp421 spec: containers: - args: @@ -8203,7 +7990,7 @@ periodics: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=quay-e2e-tests-quay314-aro-ocp419 + - --target=quay-e2e-tests-quay317-aro-ocp421 - --variant=quay-aro-ocp command: - ci-operator From 089db747428230823aefd316626d0f92a3d72276 Mon Sep 17 00:00:00 2001 From: Li Zhang Date: Fri, 19 Jun 2026 12:02:34 +0800 Subject: [PATCH 2/4] Fix expired SAS token and add missing QBO/CSO source env vars Replace hardcoded expired Azure SAS token dates (2024-07-25) with dynamic timestamp()/timeadd() calls, and add CSO_SOURCE/QBO_SOURCE env vars set to fbc-operator-catalog for the quay 3.17 ARO job. Co-Authored-By: Claude Opus 4.6 (1M context) --- .../quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml | 2 ++ .../quay-tests-deploy-quay-azure-commands.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml index fe4c66f085e7b..8051078d9521f 100644 --- a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml +++ b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml @@ -42,6 +42,8 @@ tests: QBO_CHANNEL: stable-3.17 QUAY_OPERATOR_CHANNEL: stable-3.17 QUAY_OPERATOR_SOURCE: fbc-operator-catalog + CSO_SOURCE: fbc-operator-catalog + QBO_SOURCE: fbc-operator-catalog QUAY_VERSION: "3.17" test: - ref: quay-tests-enable-quay-catalogsource diff --git a/ci-operator/step-registry/quay-tests/deploy-quay-azure/quay-tests-deploy-quay-azure-commands.sh b/ci-operator/step-registry/quay-tests/deploy-quay-azure/quay-tests-deploy-quay-azure-commands.sh index 04dc754291520..dd61a67db0bf6 100644 --- a/ci-operator/step-registry/quay-tests/deploy-quay-azure/quay-tests-deploy-quay-azure-commands.sh +++ b/ci-operator/step-registry/quay-tests/deploy-quay-azure/quay-tests-deploy-quay-azure-commands.sh @@ -78,8 +78,8 @@ data "azurerm_storage_account_sas" "quayazure" { file = true } - start = "2022-07-24" - expiry = "2024-07-25" + start = timestamp() + expiry = timeadd(timestamp(), "8760h") permissions { read = true From b1027711e8431c968086ed038159b95751da8ab1 Mon Sep 17 00:00:00 2001 From: Li Zhang Date: Fri, 19 Jun 2026 12:53:10 +0800 Subject: [PATCH 3/4] Determinize quay ARO config env var ordering Re-sort env vars alphabetically after make update. Co-Authored-By: Claude Opus 4.6 (1M context) --- .../quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml index 8051078d9521f..2010373fc2690 100644 --- a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml +++ b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml @@ -38,12 +38,12 @@ tests: ARO_WORKER_COUNT: "6" ARO_WORKER_VM_SIZE: Standard_D8s_v3 CSO_CHANNEL: stable-3.17 + CSO_SOURCE: fbc-operator-catalog MULTISTAGE_PARAM_OVERRIDE_QUAY_INDEX_IMAGE: quay.io/redhat-user-workloads/quay-eng-tenant/stable-3-17-v4-21@sha256:4d329eb8c32ce91a9844fd18959f6076da0e41cb4020544d2537f86dc875ccd7 QBO_CHANNEL: stable-3.17 + QBO_SOURCE: fbc-operator-catalog QUAY_OPERATOR_CHANNEL: stable-3.17 QUAY_OPERATOR_SOURCE: fbc-operator-catalog - CSO_SOURCE: fbc-operator-catalog - QBO_SOURCE: fbc-operator-catalog QUAY_VERSION: "3.17" test: - ref: quay-tests-enable-quay-catalogsource From 91d7e8bfba8772e95cc245e342ed87fc9ec40251 Mon Sep 17 00:00:00 2001 From: Li Zhang Date: Fri, 19 Jun 2026 15:59:33 +0800 Subject: [PATCH 4/4] Fix QBO test SIGPIPE and make it non-blocking for CSO - Replace pipe chains with jsonpath queries in qbo-qe-test to fix exit 141 (SIGPIPE) from head closing pipes under set -o pipefail - Wrap QBO test body in subshell so failures don't block the subsequent CSO test step - Update ARO job cron schedules to yearly and add quay 3.18 job Co-Authored-By: Claude Opus 4.6 (1M context) --- .../quay-quay-tests-master__quay-aro-ocp.yaml | 28 +++++- .../quay-quay-tests-master-periodics.yaml | 96 ++++++++++++++++++- .../quay-tests-qbo-qe-test-commands.sh | 19 +++- 3 files changed, 133 insertions(+), 10 deletions(-) diff --git a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml index 2010373fc2690..5f7b66e46d8f9 100644 --- a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml +++ b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-aro-ocp.yaml @@ -30,8 +30,8 @@ resources: cpu: 100m memory: 200Mi tests: -- as: quay-e2e-tests-quay317-aro-ocp421 - cron: 0 12 * * 3 +- as: quay-e2e-tests-quay317-aro + cron: 0 12 1 1 * steps: cluster_profile: azure-qe env: @@ -39,7 +39,7 @@ tests: ARO_WORKER_VM_SIZE: Standard_D8s_v3 CSO_CHANNEL: stable-3.17 CSO_SOURCE: fbc-operator-catalog - MULTISTAGE_PARAM_OVERRIDE_QUAY_INDEX_IMAGE: quay.io/redhat-user-workloads/quay-eng-tenant/stable-3-17-v4-21@sha256:4d329eb8c32ce91a9844fd18959f6076da0e41cb4020544d2537f86dc875ccd7 + MULTISTAGE_PARAM_OVERRIDE_QUAY_INDEX_IMAGE: quay.io/redhat-user-workloads/quay-eng-tenant/stable-3-17-v4-21@sha256:2a048c3d57231d7cb7885439217af05cb36df14589c2b7dda2d9da657108319b QBO_CHANNEL: stable-3.17 QBO_SOURCE: fbc-operator-catalog QUAY_OPERATOR_CHANNEL: stable-3.17 @@ -52,6 +52,28 @@ tests: - ref: quay-tests-qbo-qe-test - ref: quay-tests-cso-qe-test workflow: cucushift-installer-rehearse-azure-aro +- as: quay-e2e-tests-quay318-aro + cron: 0 12 1 1 * + steps: + cluster_profile: azure-qe + env: + ARO_WORKER_COUNT: "6" + ARO_WORKER_VM_SIZE: Standard_D8s_v3 + CSO_CHANNEL: stable-3.18 + CSO_SOURCE: fbc-operator-catalog + MULTISTAGE_PARAM_OVERRIDE_QUAY_INDEX_IMAGE: quay.io/redhat-user-workloads/quay-eng-tenant/stable-3-18-v4-21@sha256:5684950962c8d86d0dc82ef502a19664c8ad6f274a4f391145711e8babdc241a + QBO_CHANNEL: stable-3.18 + QBO_SOURCE: fbc-operator-catalog + QUAY_OPERATOR_CHANNEL: stable-3.18 + QUAY_OPERATOR_SOURCE: fbc-operator-catalog + QUAY_VERSION: "3.18" + test: + - ref: quay-tests-enable-quay-catalogsource + - ref: quay-tests-deploy-quay-azure + - ref: quay-tests-test-quay-e2e + - ref: quay-tests-qbo-qe-test + - ref: quay-tests-cso-qe-test + workflow: cucushift-installer-rehearse-azure-aro zz_generated_metadata: branch: master org: quay diff --git a/ci-operator/jobs/quay/quay-tests/quay-quay-tests-master-periodics.yaml b/ci-operator/jobs/quay/quay-tests/quay-quay-tests-master-periodics.yaml index 72a3f47e87fc5..71432270f7222 100644 --- a/ci-operator/jobs/quay/quay-tests/quay-quay-tests-master-periodics.yaml +++ b/ci-operator/jobs/quay/quay-tests/quay-quay-tests-master-periodics.yaml @@ -7965,7 +7965,97 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build03 - cron: 0 12 * * 3 + cron: 0 12 1 1 * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: quay + repo: quay-tests + labels: + ci-operator.openshift.io/cloud: azure4 + ci-operator.openshift.io/cloud-cluster-profile: azure-qe + ci-operator.openshift.io/variant: quay-aro-ocp + ci.openshift.io/generator: prowgen + job-release: "4.21" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-quay-quay-tests-master-quay-aro-ocp-quay-e2e-tests-quay317-aro + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --oauth-token-path=/usr/local/github-credentials/oauth + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=quay-e2e-tests-quay317-aro + - --variant=quay-aro-ocp + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /usr/local/github-credentials + name: github-credentials-openshift-ci-robot-private-git-cloner + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: github-credentials-openshift-ci-robot-private-git-cloner + secret: + secretName: github-credentials-openshift-ci-robot-private-git-cloner + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build03 + cron: 0 12 1 1 * decorate: true decoration_config: skip_cloning: true @@ -7980,7 +8070,7 @@ periodics: ci.openshift.io/generator: prowgen job-release: "4.21" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-quay-quay-tests-master-quay-aro-ocp-quay-e2e-tests-quay317-aro-ocp421 + name: periodic-ci-quay-quay-tests-master-quay-aro-ocp-quay-e2e-tests-quay318-aro spec: containers: - args: @@ -7990,7 +8080,7 @@ periodics: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=quay-e2e-tests-quay317-aro-ocp421 + - --target=quay-e2e-tests-quay318-aro - --variant=quay-aro-ocp command: - ci-operator diff --git a/ci-operator/step-registry/quay-tests/qbo-qe-test/quay-tests-qbo-qe-test-commands.sh b/ci-operator/step-registry/quay-tests/qbo-qe-test/quay-tests-qbo-qe-test-commands.sh index 7dd6af35da471..7070d9ac20d4d 100644 --- a/ci-operator/step-registry/quay-tests/qbo-qe-test/quay-tests-qbo-qe-test-commands.sh +++ b/ci-operator/step-registry/quay-tests/qbo-qe-test/quay-tests-qbo-qe-test-commands.sh @@ -1,9 +1,13 @@ #!/bin/bash set -o nounset -set -o errexit set -o pipefail +QBO_RC=0 + +( +set -o errexit + #Install QBO QBO_CHANNEL="$QBO_CHANNEL" QBO_SOURCE="$QBO_SOURCE" @@ -39,9 +43,9 @@ echo "Quay Bridge Operator is deployed successfully" #execute sanity test ##Creating OAuth application and token token=$(set +o pipefail; LC_ALL=C tr -dc A-Za-z0-9