diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml index 52f265f394283..a3fcceb30976d 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml @@ -67,17 +67,17 @@ releases: candidate: product: ocp stream: ci - version: "4.10" + version: "4.11" hosted-ocp-previous: candidate: product: ocp relative: 1 stream: ci - version: "4.10" + version: "4.11" latest: integration: include_built_images: true - name: "4.10" + name: "4.11" namespace: ocp resources: '*': diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-main__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-main__periodics.yaml index b9911bd7a83a1..c01f79056b28e 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-main__periodics.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-main__periodics.yaml @@ -36,18 +36,18 @@ releases: candidate: product: ocp stream: ci - version: "4.10" + version: "4.11" hosted-ocp-previous: candidate: product: ocp relative: 1 - stream: nightly - version: "4.10" + stream: ci + version: "4.11" latest: candidate: product: ocp stream: ci - version: "4.10" + version: "4.11" resources: '*': limits: diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.11__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.10__periodics.yaml similarity index 96% rename from ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.11__periodics.yaml rename to ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.10__periodics.yaml index 54a731ea9bd2e..93b7d3c5ff6c6 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.11__periodics.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.10__periodics.yaml @@ -41,7 +41,7 @@ releases: candidate: product: ocp stream: ci - version: "4.11" + version: "4.10" resources: '*': limits: @@ -56,7 +56,7 @@ tests: steps: workflow: hypershift-aws-conformance zz_generated_metadata: - branch: release-4.11 + branch: release-4.10 org: openshift repo: hypershift variant: periodics diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-periodics.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-periodics.yaml index bf4a5a748f6bd..ba1c1e7f4103c 100644 --- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-periodics.yaml +++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-periodics.yaml @@ -10,7 +10,7 @@ periodics: labels: ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen - job-release: "4.10" + job-release: "4.11" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-openshift-hypershift-main-periodics-e2e-aws-periodic reporter_config: @@ -79,7 +79,7 @@ periodics: labels: ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen - job-release: "4.10" + job-release: "4.11" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-openshift-hypershift-main-periodics-e2e-aws-periodic-conformance-serial spec: @@ -134,7 +134,7 @@ periodics: labels: ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen - job-release: "4.10" + job-release: "4.11" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-openshift-hypershift-main-periodics-e2e-aws-pooled-periodic-conformance reporter_config: @@ -197,7 +197,7 @@ periodics: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen - job-release: "4.10" + job-release: "4.11" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-openshift-hypershift-main-periodics-e2e-conformance-azure spec: @@ -270,7 +270,7 @@ periodics: ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen - job-release: "4.10" + job-release: "4.11" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-openshift-hypershift-main-periodics-e2e-conformance-proxy spec: diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-presubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-presubmits.yaml index 151814fa020ab..3fd9694bf98ad 100644 --- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-main-presubmits.yaml @@ -581,7 +581,7 @@ presubmits: labels: ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen - job-release: "4.10" + job-release: "4.11" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-hypershift-main-periodics-images rerun_command: /test periodics-images diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.11-periodics.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.10-periodics.yaml similarity index 83% rename from ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.11-periodics.yaml rename to ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.10-periodics.yaml index 1c82c1353056b..80fd272af5fa4 100644 --- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.11-periodics.yaml +++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.10-periodics.yaml @@ -4,21 +4,15 @@ periodics: cron: 0 */6 * * * decorate: true extra_refs: - - base_ref: release-4.11 + - base_ref: release-4.10 org: openshift repo: hypershift labels: ci-operator.openshift.io/variant: periodics ci.openshift.io/generator: prowgen - job-release: "4.11" + job-release: "4.10" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-hypershift-release-4.11-periodics-aws-conformance - reporter_config: - slack: - channel: '#team-hypershift' - job_states_to_report: - - failure - report_template: Job *{{.Spec.Job}}* failed. <{{.Status.URL}}|View logs> + name: periodic-ci-openshift-hypershift-release-4.10-periodics-aws-conformance spec: containers: - args: diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.10-presubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.10-presubmits.yaml index 7b24eda2c30c9..b3bcd5ec0f857 100644 --- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.10-presubmits.yaml +++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.10-presubmits.yaml @@ -362,6 +362,56 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.10$ + - ^release-4\.10- + cluster: build01 + context: ci/prow/periodics-images + decorate: true + labels: + ci-operator.openshift.io/variant: periodics + ci.openshift.io/generator: prowgen + job-release: "4.10" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-hypershift-release-4.10-periodics-images + rerun_command: /test periodics-images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=[images] + - --variant=periodics + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )periodics-images,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.11-presubmits.yaml index ef986bb8846f1..7620d8cd31fce 100644 --- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.11-presubmits.yaml @@ -569,56 +569,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-4\.11$ - - ^release-4\.11- - cluster: build03 - context: ci/prow/periodics-images - decorate: true - labels: - ci-operator.openshift.io/variant: periodics - ci.openshift.io/generator: prowgen - job-release: "4.11" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-hypershift-release-4.11-periodics-images - rerun_command: /test periodics-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --variant=periodics - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )periodics-images,?($|\s.*) - agent: kubernetes always_run: false branches: