From 978d7c108abd82fd45a16b2975587256e384009d Mon Sep 17 00:00:00 2001 From: huangmingxia Date: Sun, 14 Dec 2025 20:51:27 -0500 Subject: [PATCH] HIVE-3029: Update test versions for presubmits and periodics - Presubmits now test against OCP 4.20 - Periodics now test against OCP 4.21 --- .../openshift/hive/openshift-hive-master.yaml | 8 +++---- .../hive/openshift-hive-master__periodic.yaml | 10 ++++---- .../hive/openshift-hive-master-periodics.yaml | 8 +++---- .../openshift-hive-master-postsubmits.yaml | 4 ++-- .../openshift-hive-master-presubmits.yaml | 24 +++++++++---------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ci-operator/config/openshift/hive/openshift-hive-master.yaml b/ci-operator/config/openshift/hive/openshift-hive-master.yaml index 6470a0ccad7e7..3ca0588f62d7d 100644 --- a/ci-operator/config/openshift/hive/openshift-hive-master.yaml +++ b/ci-operator/config/openshift/hive/openshift-hive-master.yaml @@ -34,12 +34,12 @@ releases: candidate: product: ocp stream: nightly - version: "4.19" + version: "4.20" latest: candidate: product: ocp stream: nightly - version: "4.19" + version: "4.20" resources: '*': requests: @@ -97,7 +97,7 @@ tests: owner: openshift-ci product: ocp timeout: 1h0m0s - version: "4.19" + version: "4.20" skip_if_only_changed: ^(?:docs|\.tekton)/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: test: @@ -144,7 +144,7 @@ tests: owner: openshift-ci product: ocp timeout: 1h0m0s - version: "4.19" + version: "4.20" skip_if_only_changed: ^(?:docs|\.tekton)/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: test: diff --git a/ci-operator/config/openshift/hive/openshift-hive-master__periodic.yaml b/ci-operator/config/openshift/hive/openshift-hive-master__periodic.yaml index a82cca0311069..58c599c9637d0 100644 --- a/ci-operator/config/openshift/hive/openshift-hive-master__periodic.yaml +++ b/ci-operator/config/openshift/hive/openshift-hive-master__periodic.yaml @@ -3,12 +3,12 @@ build_root: image_stream_tag: name: release namespace: openshift - tag: rhel-9-release-golang-1.24-openshift-4.20 + tag: rhel-9-release-golang-1.24-openshift-4.21 images: - dockerfile_literal: | FROM ubi9-minimal RUN rm -rf /etc/yum.repos.d/* - RUN curl http://base-4-20-rhel9.ocp.svc > /etc/yum.repos.d/base-4-20-rhel9.repo + RUN curl http://base-4-21-rhel9.ocp.svc > /etc/yum.repos.d/base-4-21-rhel9.repo to: ubi9-minimal-entitled - build_args: - name: DNF @@ -21,7 +21,7 @@ releases: candidate: product: ocp stream: nightly - version: "4.20" + version: "4.21" resources: '*': requests: @@ -42,7 +42,7 @@ tests: owner: openshift-ci product: ocp timeout: 1h0m0s - version: "4.19" + version: "4.21" cron: 5 4 * * 1 steps: test: @@ -89,7 +89,7 @@ tests: owner: openshift-ci product: ocp timeout: 1h0m0s - version: "4.19" + version: "4.21" cron: 5 4 * * 2 steps: test: diff --git a/ci-operator/jobs/openshift/hive/openshift-hive-master-periodics.yaml b/ci-operator/jobs/openshift/hive/openshift-hive-master-periodics.yaml index 960fb3acb6c29..20ef3e0f12246 100644 --- a/ci-operator/jobs/openshift/hive/openshift-hive-master-periodics.yaml +++ b/ci-operator/jobs/openshift/hive/openshift-hive-master-periodics.yaml @@ -14,7 +14,7 @@ periodics: ci-operator.openshift.io/cloud-cluster-profile: azure4 ci-operator.openshift.io/variant: periodic ci.openshift.io/generator: prowgen - job-release: "4.20" + job-release: "4.21" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-openshift-hive-master-periodic-e2e-azure-weekly spec: @@ -89,7 +89,7 @@ periodics: ci-operator.openshift.io/cloud-cluster-profile: gcp ci-operator.openshift.io/variant: periodic ci.openshift.io/generator: prowgen - job-release: "4.20" + job-release: "4.21" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-openshift-hive-master-periodic-e2e-gcp-weekly spec: @@ -162,7 +162,7 @@ periodics: labels: ci-operator.openshift.io/variant: periodic ci.openshift.io/generator: prowgen - job-release: "4.20" + job-release: "4.21" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-openshift-hive-master-periodic-e2e-pool-weekly spec: @@ -232,7 +232,7 @@ periodics: labels: ci-operator.openshift.io/variant: periodic ci.openshift.io/generator: prowgen - job-release: "4.20" + job-release: "4.21" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-openshift-hive-master-periodic-e2e-weekly spec: diff --git a/ci-operator/jobs/openshift/hive/openshift-hive-master-postsubmits.yaml b/ci-operator/jobs/openshift/hive/openshift-hive-master-postsubmits.yaml index 2908f33fb2ae3..f2ed48a8f2237 100644 --- a/ci-operator/jobs/openshift/hive/openshift-hive-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/hive/openshift-hive-master-postsubmits.yaml @@ -11,7 +11,7 @@ postsubmits: labels: ci-operator.openshift.io/is-promotion: "true" ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.20" max_concurrency: 1 name: branch-ci-openshift-hive-master-images spec: @@ -71,7 +71,7 @@ postsubmits: skip_cloning: true labels: ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.20" max_concurrency: 1 name: branch-ci-openshift-hive-master-publish-coverage spec: diff --git a/ci-operator/jobs/openshift/hive/openshift-hive-master-presubmits.yaml b/ci-operator/jobs/openshift/hive/openshift-hive-master-presubmits.yaml index 2d5d500706e1a..b7de4572a6232 100644 --- a/ci-operator/jobs/openshift/hive/openshift-hive-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/hive/openshift-hive-master-presubmits.yaml @@ -12,7 +12,7 @@ presubmits: skip_cloning: true labels: ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-hive-master-coverage rerun_command: /test coverage @@ -76,7 +76,7 @@ presubmits: skip_cloning: true labels: ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-hive-master-e2e rerun_command: /test e2e @@ -149,7 +149,7 @@ presubmits: ci-operator.openshift.io/cloud: azure4 ci-operator.openshift.io/cloud-cluster-profile: azure4 ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-hive-master-e2e-azure rerun_command: /test e2e-azure @@ -225,7 +225,7 @@ presubmits: ci-operator.openshift.io/cloud: gcp ci-operator.openshift.io/cloud-cluster-profile: gcp ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-hive-master-e2e-gcp rerun_command: /test e2e-gcp @@ -301,7 +301,7 @@ presubmits: ci-operator.openshift.io/cloud: openstack-vexxhost ci-operator.openshift.io/cloud-cluster-profile: openstack-vexxhost ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-hive-master-e2e-openstack rerun_command: /test e2e-openstack @@ -375,7 +375,7 @@ presubmits: skip_cloning: true labels: ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-hive-master-e2e-pool rerun_command: /test e2e-pool @@ -448,7 +448,7 @@ presubmits: ci-operator.openshift.io/cloud: vsphere ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-hive-master-e2e-vsphere rerun_command: /test e2e-vsphere @@ -522,7 +522,7 @@ presubmits: skip_cloning: true labels: ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-hive-master-images rerun_command: /test images @@ -580,7 +580,7 @@ presubmits: labels: ci-operator.openshift.io/variant: periodic ci.openshift.io/generator: prowgen - job-release: "4.20" + job-release: "4.21" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-hive-master-periodic-images rerun_command: /test periodic-images @@ -637,7 +637,7 @@ presubmits: skip_cloning: true labels: ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-hive-master-security rerun_command: /test security @@ -701,7 +701,7 @@ presubmits: skip_cloning: true labels: ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-hive-master-unit rerun_command: /test unit @@ -758,7 +758,7 @@ presubmits: skip_cloning: true labels: ci.openshift.io/generator: prowgen - job-release: "4.19" + job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-hive-master-verify rerun_command: /test verify