Skip to content

Commit 5a699f7

Browse files
LiZhang19817claude
authored andcommitted
Add Quay 3.16 API testing job with new UI support (openshift#71145)
* add quay 3.16.0 api testing with new UI spec * run make update * Fix shell script syntax error in quay-api test command Add missing line continuation backslash for multi-line command with output redirection. Resolves shellcheck errors SC1073 and SC1072. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]> * Add missing QUAY_OPERATOR_SOURCE for quay316-api-testing job Fix "QuayRegistry CRD not found" error by adding the missing QUAY_OPERATOR_SOURCE environment variable to the quay-e2e-tests-quay316-api-testing job configuration. Without this variable, the CatalogSource creation fails, preventing the Quay Operator from installing and registering the QuayRegistry CRD. Setting QUAY_OPERATOR_SOURCE to fbc-operator-catalog to match other Quay 3.16 jobs. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]> * Pin Node.js to v20.x in quay-test-console image Fix Cypress test failures caused by Node.js v22 compatibility issues. The latest LTS Node.js (v22.x) is incompatible with Cypress 12.6.0, causing "ERR_FAILED (-2) loading 'about:blank#blocked'" errors. Pinning to Node.js 20.x resolves the issue while maintaining LTS support. Error details: - The new-window event is deprecated in Electron 106 (bundled with Cypress 12.6.0) - Node.js v22 has stricter security policies that block Electron initialization - This affects all tests using the quay-test-console image including the quay-e2e-tests-quay316-api-testing job 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]> --------- Co-authored-by: Claude <[email protected]>
1 parent 96dca72 commit 5a699f7

File tree

5 files changed

+112
-3
lines changed

5 files changed

+112
-3
lines changed

ci-operator/config/quay/quay-tests/quay-quay-tests-master.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ build_root:
1111
images:
1212
- dockerfile_literal: |
1313
FROM src
14-
RUN curl --silent --location https://rpm.nodesource.com/setup_lts.x | bash - && \
14+
RUN curl --silent --location https://rpm.nodesource.com/setup_20.x | bash - && \
1515
curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
1616
PACKAGES="openssh-clients httpd-tools nodejs yarn xorg-x11-server-Xvfb gtk2-devel gtk3-devel libnotify-devel GConf2 nss libXScrnSaver alsa-lib skopeo bzip2 jq python3.9" && \
1717
yum install --setopt=tsflags=nodocs -y $PACKAGES && \

ci-operator/config/quay/quay-tests/quay-quay-tests-master__quay-api.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,22 @@ tests:
9191
- ref: quay-tests-deploy-quay-aws-s3
9292
- ref: quay-tests-test-quay-api
9393
workflow: cucushift-installer-rehearse-aws-ipi
94+
- as: quay-e2e-tests-quay316-api-testing
95+
cron: 0 0 6 * *
96+
steps:
97+
cluster_profile: aws-quay-qe
98+
env:
99+
BASE_DOMAIN: quayqe.devcluster.openshift.com
100+
COMPUTE_NODE_TYPE: m5.2xlarge
101+
QUAY_INDEX_IMAGE_BUILD: quay.io/redhat-user-workloads/quay-eng-tenant/stable-3-16-v4-20@sha256:cd002d9f0913444e26f901c7dccdfc7428c3ceec691cf5404ec08afeb2ce65ff
102+
QUAY_OPERATOR_CHANNEL: stable-3.16
103+
QUAY_OPERATOR_SOURCE: fbc-operator-catalog
104+
QUAY_VERSION: "3.16"
105+
test:
106+
- ref: quay-tests-enable-quay-catalogsource
107+
- ref: quay-tests-deploy-quay-aws-s3
108+
- ref: quay-tests-test-quay-api
109+
workflow: cucushift-installer-rehearse-aws-ipi
94110
zz_generated_metadata:
95111
branch: master
96112
org: quay

ci-operator/jobs/quay/quay-tests/quay-quay-tests-master-periodics.yaml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6068,6 +6068,88 @@ periodics:
60686068
- name: result-aggregator
60696069
secret:
60706070
secretName: result-aggregator
6071+
- agent: kubernetes
6072+
cluster: build09
6073+
cron: 0 0 6 * *
6074+
decorate: true
6075+
decoration_config:
6076+
skip_cloning: true
6077+
extra_refs:
6078+
- base_ref: master
6079+
org: quay
6080+
repo: quay-tests
6081+
labels:
6082+
ci-operator.openshift.io/cloud: aws
6083+
ci-operator.openshift.io/cloud-cluster-profile: aws-quay-qe
6084+
ci-operator.openshift.io/variant: quay-api
6085+
ci.openshift.io/generator: prowgen
6086+
job-release: "4.19"
6087+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
6088+
name: periodic-ci-quay-quay-tests-master-quay-api-quay-e2e-tests-quay316-api-testing
6089+
spec:
6090+
containers:
6091+
- args:
6092+
- --gcs-upload-secret=/secrets/gcs/service-account.json
6093+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
6094+
- --lease-server-credentials-file=/etc/boskos/credentials
6095+
- --oauth-token-path=/usr/local/github-credentials/oauth
6096+
- --report-credentials-file=/etc/report/credentials
6097+
- --secret-dir=/secrets/ci-pull-credentials
6098+
- --target=quay-e2e-tests-quay316-api-testing
6099+
- --variant=quay-api
6100+
command:
6101+
- ci-operator
6102+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
6103+
imagePullPolicy: Always
6104+
name: ""
6105+
resources:
6106+
requests:
6107+
cpu: 10m
6108+
volumeMounts:
6109+
- mountPath: /etc/boskos
6110+
name: boskos
6111+
readOnly: true
6112+
- mountPath: /secrets/ci-pull-credentials
6113+
name: ci-pull-credentials
6114+
readOnly: true
6115+
- mountPath: /secrets/gcs
6116+
name: gcs-credentials
6117+
readOnly: true
6118+
- mountPath: /usr/local/github-credentials
6119+
name: github-credentials-openshift-ci-robot-private-git-cloner
6120+
readOnly: true
6121+
- mountPath: /secrets/manifest-tool
6122+
name: manifest-tool-local-pusher
6123+
readOnly: true
6124+
- mountPath: /etc/pull-secret
6125+
name: pull-secret
6126+
readOnly: true
6127+
- mountPath: /etc/report
6128+
name: result-aggregator
6129+
readOnly: true
6130+
serviceAccountName: ci-operator
6131+
volumes:
6132+
- name: boskos
6133+
secret:
6134+
items:
6135+
- key: credentials
6136+
path: credentials
6137+
secretName: boskos-credentials
6138+
- name: ci-pull-credentials
6139+
secret:
6140+
secretName: ci-pull-credentials
6141+
- name: github-credentials-openshift-ci-robot-private-git-cloner
6142+
secret:
6143+
secretName: github-credentials-openshift-ci-robot-private-git-cloner
6144+
- name: manifest-tool-local-pusher
6145+
secret:
6146+
secretName: manifest-tool-local-pusher
6147+
- name: pull-secret
6148+
secret:
6149+
secretName: registry-pull-credentials
6150+
- name: result-aggregator
6151+
secret:
6152+
secretName: result-aggregator
60716153
- agent: kubernetes
60726154
cluster: build09
60736155
cron: 0 12 * * 3

ci-operator/step-registry/quay-tests/test/quay-api/quay-tests-test-quay-api-commands.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,18 @@ export CYPRESS_QUAY_PASSWORD="$QUAY_PASSWORD"
1616
export CYPRESS_QUAY_VERSION="$QUAY_VERSION"
1717

1818
yarn install
19-
NO_COLOR=1 yarn run cypress run --spec "cypress/e2e/quay_api_testing_all.cy.js" --browser electron --headless --reporter cypress-multi-reporters --reporter-options configFile=reporter-config.json > quay_api_testing_report || true
19+
20+
# Determine which Cypress spec to use based on Quay version
21+
CYPRESS_SPEC="cypress/e2e/quay_api_testing_all.cy.js"
22+
if [[ "${QUAY_VERSION}" == "3.16" ]]; then
23+
echo "Using new UI spec for Quay version 3.16"
24+
CYPRESS_SPEC="cypress/e2e/quay_api_testing_all_new_ui.cy.js"
25+
else
26+
echo "Using standard spec for Quay version ${QUAY_VERSION}"
27+
fi
28+
29+
NO_COLOR=1 yarn run cypress run --spec "${CYPRESS_SPEC}" --browser electron --headless --reporter cypress-multi-reporters --reporter-options configFile=reporter-config.json > \
30+
quay_api_testing_report || true
2031

2132
mkdir -p $ARTIFACT_DIR/quay_api_testing_cypress_videos || true
2233
cp cypress/results/quay_api_testing_report.xml $ARTIFACT_DIR/quay_api_testing_report.xml || true

ci-operator/step-registry/quay-tests/test/quay-api/quay-tests-test-quay-api-ref.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ ref:
2121
env:
2222
- name: QUAY_VERSION
2323
documentation: Quay Version to test
24-
default: "3.15"
24+
default: "3.16"

0 commit comments

Comments
 (0)