diff --git a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__ocp-419-quay.yaml b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__ocp-419-quay.yaml index cb162606b8c43..f17ca106d6815 100644 --- a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__ocp-419-quay.yaml +++ b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__ocp-419-quay.yaml @@ -275,6 +275,32 @@ tests: - ref: quay-tests-test-quay-api - ref: quay-tests-test-quay-e2e workflow: cucushift-installer-rehearse-aws-ipi +- as: quay-e2e-tests-quay315-ocp419-aws-s3-smoke + cron: '@yearly' + steps: + cluster_profile: aws-qe + env: + BASE_DOMAIN: qe.devcluster.openshift.com + COMPUTE_NODE_TYPE: m5.2xlarge + QUAY_OPERATOR_CHANNEL: stable-3.15 + QUAY_VERSION: "3.15" + test: + - ref: quay-tests-deploy-quay-aws-s3 + - ref: quay-tests-test-quay-e2e + workflow: cucushift-installer-rehearse-aws-ipi +- as: quay-e2e-tests-quay316-ocp419-aws-s3-smoke + cron: '@yearly' + steps: + cluster_profile: aws-qe + env: + BASE_DOMAIN: qe.devcluster.openshift.com + COMPUTE_NODE_TYPE: m5.2xlarge + QUAY_OPERATOR_CHANNEL: stable-3.16 + QUAY_VERSION: "3.16" + test: + - ref: quay-tests-deploy-quay-aws-s3 + - ref: quay-tests-test-quay-e2e + workflow: cucushift-installer-rehearse-aws-ipi 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 f105bec93021c..227df8711f075 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 @@ -3762,6 +3762,88 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build03 + cron: '@yearly' + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: quay + repo: quay-tests + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-qe + ci-operator.openshift.io/variant: ocp-419-quay + ci.openshift.io/generator: prowgen + job-release: "4.19" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-quay-quay-tests-master-ocp-419-quay-quay-e2e-tests-quay315-ocp419-aws-s3-smoke + 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-quay315-ocp419-aws-s3-smoke + - --variant=ocp-419-quay + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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 * * 3 @@ -4008,6 +4090,88 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build03 + cron: '@yearly' + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: quay + repo: quay-tests + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-qe + ci-operator.openshift.io/variant: ocp-419-quay + ci.openshift.io/generator: prowgen + job-release: "4.19" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-quay-quay-tests-master-ocp-419-quay-quay-e2e-tests-quay316-ocp419-aws-s3-smoke + 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-quay316-ocp419-aws-s3-smoke + - --variant=ocp-419-quay + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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: '@yearly' diff --git a/ci-operator/step-registry/quay-tests/test-quay-e2e/quay-tests-test-quay-e2e-commands.sh b/ci-operator/step-registry/quay-tests/test-quay-e2e/quay-tests-test-quay-e2e-commands.sh index 16cf6058fd337..836f63e1240b9 100644 --- a/ci-operator/step-registry/quay-tests/test-quay-e2e/quay-tests-test-quay-e2e-commands.sh +++ b/ci-operator/step-registry/quay-tests/test-quay-e2e/quay-tests-test-quay-e2e-commands.sh @@ -3,7 +3,17 @@ set -euo pipefail #Set Kubeconfig: -cd quay-frontend-tests +echo "Quay version is ${QUAY_VERSION}" +QUAY_VERSION_THRESHOLD="3.16" +if [ "$(printf '%s\n%s' "${QUAY_VERSION_THRESHOLD}" "${QUAY_VERSION}" | sort -V | head -n1)" = "${QUAY_VERSION_THRESHOLD}" ]; then + #For Quay versions equal to or higher than 3.16, use the new UI test suite. + cd new-ui-tests +else + #For Quay versions lower than 3.16, use the old UI test suite. + cd quay-frontend-tests +fi +echo "Current testing directory is $(pwd)" + skopeo -v oc version terraform version @@ -95,11 +105,15 @@ quay_route=$(oc get quayregistry quay -n quay-enterprise -o jsonpath='{.status.r echo "The Quay hostname is $quay_route" quay_hostname=${quay_route#*//} echo "The Quay hostname is $quay_hostname" -export CYPRESS_QUAY_ENDPOINT=$quay_hostname -echo "The quay version is ${QUAY_VERSION}" -export CYPRESS_QUAY_VERSION="${QUAY_VERSION}" +if [ "$(printf '%s\n%s' "${QUAY_VERSION_THRESHOLD}" "${QUAY_VERSION}" | sort -V | head -n1)" = "${QUAY_VERSION_THRESHOLD}" ]; then + export CYPRESS_QUAY_ENDPOINT=${quay_hostname} + export CYPRESS_QUAY_ENDPOINT_PROTOCOL="https" + export CYPRESS_QUAY_PROJECT="quay-enterprise" + export CYPRESS_OLD_UI_DISABLED=true +else + export CYPRESS_QUAY_ENDPOINT=${quay_hostname} + export CYPRESS_QUAY_VERSION="${QUAY_VERSION}" +fi NO_COLOR=1 yarn run smoke || true - - diff --git a/ci-operator/step-registry/quay-tests/test-quay-e2e/quay-tests-test-quay-e2e-ref.yaml b/ci-operator/step-registry/quay-tests/test-quay-e2e/quay-tests-test-quay-e2e-ref.yaml index b7743fe6f4066..c60840d2e64b6 100644 --- a/ci-operator/step-registry/quay-tests/test-quay-e2e/quay-tests-test-quay-e2e-ref.yaml +++ b/ci-operator/step-registry/quay-tests/test-quay-e2e/quay-tests-test-quay-e2e-ref.yaml @@ -20,7 +20,7 @@ ref: default: "false" - name: QUAY_VERSION documentation: Quay version - default: "3.14" + default: "3.16" - name: MAP_TESTS default: "false" documentation: Specify whether to update the test suite name for reporting tools