From cae967a6626ae9f83a790e228b6d0367035e0b52 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Fri, 22 Nov 2024 13:53:32 -0400 Subject: [PATCH 1/3] Fail quay e2e test step when e2e tests fail This is important for prow and sippy to know the job encountered errors, today this step cannot fail. --- .../test-quay-e2e/quay-tests-test-quay-e2e-commands.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 86a66f4dcc78..6d46f2028133 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 @@ -25,7 +25,7 @@ function copyArtifacts { cp -r ./cypress/videos/* $ARTIFACT_DIR } -# Install Dependcies defined in packages.json +# Install Dependencies defined in packages.json yarn install || true #Finally Copy the Junit Testing XML files and Screenshots to /tmp/artifacts @@ -39,12 +39,12 @@ if [ "${QUAY_PROXY}" = "true" ]; then export HTTP_PROXY fi -#Trigget Quay E2E Testing +#Trigger Quay E2E Testing set +x quay_route=$(oc get quayregistry quay -n quay-enterprise -o jsonpath='{.status.registryEndpoint}') || true echo "The Quay hostname is $quay_route" quay_hostname=${quay_route#*//} echo "The Quay hostname is $quay_hostname" export CYPRESS_QUAY_ENDPOINT=$quay_hostname -yarn run smoke || true +yarn run smoke From 173c080870e95d2943e607b2317b0e94dd0cba79 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Fri, 22 Nov 2024 14:11:14 -0400 Subject: [PATCH 2/3] Enable resource watch observer on quay-quay-tests-master-ocp-418-quay-quay-e2e-tests-quay313-ocp418-lp-interop --- .../quay/quay-tests/quay-quay-tests-master__ocp-418-quay.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__ocp-418-quay.yaml b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__ocp-418-quay.yaml index 038eeac5a0bb..1a7dea1fa696 100644 --- a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__ocp-418-quay.yaml +++ b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__ocp-418-quay.yaml @@ -31,6 +31,9 @@ tests: cron: 0 0 11 6 * steps: cluster_profile: aws-cspi-qe + observers: + enable: + - observers-resource-watch env: BASE_DOMAIN: cspilp.interop.ccitredhat.com COMPUTE_NODE_TYPE: m5.4xlarge From 19641645159394bef7ab11ca733f530754007d41 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Fri, 22 Nov 2024 14:25:02 -0400 Subject: [PATCH 3/3] make ci-operator-config --- .../quay-tests/quay-quay-tests-master__ocp-418-quay.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__ocp-418-quay.yaml b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__ocp-418-quay.yaml index 1a7dea1fa696..7fc1756adfcc 100644 --- a/ci-operator/config/quay/quay-tests/quay-quay-tests-master__ocp-418-quay.yaml +++ b/ci-operator/config/quay/quay-tests/quay-quay-tests-master__ocp-418-quay.yaml @@ -31,9 +31,6 @@ tests: cron: 0 0 11 6 * steps: cluster_profile: aws-cspi-qe - observers: - enable: - - observers-resource-watch env: BASE_DOMAIN: cspilp.interop.ccitredhat.com COMPUTE_NODE_TYPE: m5.4xlarge @@ -55,6 +52,9 @@ tests: QUAY_OPERATOR_CHANNEL: stable-3.13 USER_TAGS: | scenario quay + observers: + enable: + - observers-resource-watch test: - ref: quay-tests-deploy-quay-aws-s3 - ref: quay-tests-test-quay-e2e