From e52780f0aa8e6642335ad497471602fffbd1c564 Mon Sep 17 00:00:00 2001 From: weliang1 Date: Tue, 9 Jun 2026 14:02:02 -0400 Subject: [PATCH 1/2] Add CI job for Y-stream version skew e2e test Adds periodic CI job to run Y-stream version skew testing for HyperShift. Test configuration: - Runs weekly (Monday 6:00 AM) - Uses OCP 4.22 (latest) and 4.21 (previous) - Executes TestYStreamVersionSkew from hypershift e2e suite - Verifies control plane and data plane version skew support This job validates CORENET-6787 (Y-stream skew support) by: - Creating cluster at 4.21.15 - Upgrading control plane to 4.22.0-rc.4 - Gradually upgrading NodePools to create mixed versions - Testing networking across version boundaries Co-Authored-By: Claude Sonnet 4.5 --- ...enshift-hypershift-release-4.22__periodics.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22__periodics.yaml index 14ab8c018dbf4..84792bebcbf40 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22__periodics.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22__periodics.yaml @@ -339,6 +339,20 @@ tests: env: TEST_SUITE: openshift/conformance/parallel/minimal workflow: hypershift-aws-e2e-backuprestore +- as: e2e-aws-ystream-version-skew + cron: 0 6 * * 1 + steps: + cluster_profile: hypershift-aws + dependencies: + OCP_IMAGE_LATEST: release:latest + OCP_IMAGE_PREVIOUS: release:latest-4-20 + env: + HYPERSHIFT_E2E_TEST: TestYStreamVersionSkew + TEST_ARGS: --e2e.test-ystream-version-skew + TEST_SUITE: hypershift + test: + - ref: hypershift-e2e-test + workflow: hypershift-aws-e2e zz_generated_metadata: branch: release-4.22 org: openshift From 28c1c0a296dc492c7b5a979863918871f7b5a28b Mon Sep 17 00:00:00 2001 From: weliang1 Date: Tue, 9 Jun 2026 17:17:32 -0400 Subject: [PATCH 2/2] Fix CI job config and regenerate Prow jobs - Fixed workflow name: hypershift-aws-e2e-external -> hypershift-aws-e2e-nested - Use CI_TESTS_RUN env var instead of HYPERSHIFT_E2E_TEST - Use release:latest-4-20 instead of release:n1minor - Regenerated Prow job configurations with make update --- ...ft-hypershift-release-4.22__periodics.yaml | 8 +- ...ift-hypershift-release-4.22-periodics.yaml | 83 +++++++++++++++++++ 2 files changed, 85 insertions(+), 6 deletions(-) diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22__periodics.yaml index 84792bebcbf40..1840ac43c42f3 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22__periodics.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22__periodics.yaml @@ -347,12 +347,8 @@ tests: OCP_IMAGE_LATEST: release:latest OCP_IMAGE_PREVIOUS: release:latest-4-20 env: - HYPERSHIFT_E2E_TEST: TestYStreamVersionSkew - TEST_ARGS: --e2e.test-ystream-version-skew - TEST_SUITE: hypershift - test: - - ref: hypershift-e2e-test - workflow: hypershift-aws-e2e + CI_TESTS_RUN: ^TestYStreamVersionSkew$ + workflow: hypershift-aws-e2e-nested zz_generated_metadata: branch: release-4.22 org: openshift diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.22-periodics.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.22-periodics.yaml index aa9ec5917d2e1..a90fa751f0c9b 100644 --- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.22-periodics.yaml +++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.22-periodics.yaml @@ -1166,6 +1166,89 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build01 + cron: 0 6 * * 1 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: release-4.22 + org: openshift + repo: hypershift + labels: + ci-operator.openshift.io/cloud: hypershift-aws + ci-operator.openshift.io/cloud-cluster-profile: hypershift-aws + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "4.22" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aws-ystream-version-skew + 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 + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-ystream-version-skew + - --variant=periodics + 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: /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: 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: build01 cron: 0 */2 * * *