Hypershift: Update conformance jobs for branchcut

ci-operator/config/openshift/hypershift/openshift-hypershift-main.yaml

@@ -69,7 +69,7 @@ releases:
       product: ocp
       relative: 1
       stream: ci
-      version: "4.11"
+      version: "4.12"
   latest:
     integration:
       include_built_images: true

ci-operator/config/openshift/hypershift/openshift-hypershift-main__periodics.yaml

@@ -33,18 +33,18 @@ releases:
     candidate:
       product: ocp
       stream: ci
-      version: "4.11"
+      version: "4.12"
   hosted-ocp-previous:
     candidate:
       product: ocp
       relative: 1
       stream: ci
-      version: "4.11"
+      version: "4.12"
   latest:
     candidate:
       product: ocp
       stream: ci
-      version: "4.11"
+      version: "4.12"
 resources:
   '*':
     limits:

ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.10__periodics.yaml → ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.11__periodics.yaml

@@ -1,6 +1,6 @@
 base_images:
   base:
-    name: "4.10"
+    name: "4.11"
     namespace: ocp
     tag: base
   ocp_builder_rhel-8-golang-1.17-openshift-4.10:
@@ -36,12 +36,12 @@ releases:
     candidate:
       product: ocp
       stream: ci
-      version: "4.10"
+      version: "4.11"
   latest:
     candidate:
       product: ocp
       stream: ci
-      version: "4.10"
+      version: "4.11"
 resources:
   '*':
     limits:
@@ -56,7 +56,7 @@ tests:
   steps:
     workflow: hypershift-aws-conformance
 zz_generated_metadata:
-  branch: release-4.10
+  branch: release-4.11
   org: openshift
   repo: hypershift
   variant: periodics

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.11"
+    job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-hypershift-main-periodics-aws-conformance
   reporter_config:
@@ -71,7 +71,7 @@ periodics:
   labels:
     ci-operator.openshift.io/variant: periodics
     ci.openshift.io/generator: prowgen
-    job-release: "4.11"
+    job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-hypershift-main-periodics-e2e-aws-periodic
   reporter_config:
@@ -140,7 +140,7 @@ periodics:
   labels:
     ci-operator.openshift.io/variant: periodics
     ci.openshift.io/generator: prowgen
-    job-release: "4.11"
+    job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-hypershift-main-periodics-e2e-aws-periodic-conformance-serial
   spec:
@@ -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.11"
+    job-release: "4.12"
     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.11"
+    job-release: "4.12"
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
   name: periodic-ci-openshift-hypershift-main-periodics-e2e-conformance-proxy
   spec:

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.11"
+      job-release: "4.12"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     name: pull-ci-openshift-hypershift-main-periodics-images
     rerun_command: /test periodics-images

ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.10-presubmits.yaml

@@ -362,56 +362,6 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
-  - agent: kubernetes
-    always_run: true
-    branches:
-    - ^release-4\.10$
-    - ^release-4\.10-
-    cluster: build04
-    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:

ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.10-periodics.yaml → ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.11-periodics.yaml

@@ -1,18 +1,18 @@
 periodics:
 - agent: kubernetes
-  cluster: build04
+  cluster: build01
   cron: 0 */6 * * *
   decorate: true
   extra_refs:
-  - base_ref: release-4.10
+  - base_ref: release-4.11
     org: openshift
     repo: hypershift
   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-release-4.10-periodics-aws-conformance
+  name: periodic-ci-openshift-hypershift-release-4.11-periodics-aws-conformance
   reporter_config:
     slack:
       channel: '#team-hypershift'

ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.11-presubmits.yaml

@@ -570,6 +570,56 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^release-4\.11$
+    - ^release-4\.11-
+    cluster: build04
+    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: