Merge pull request openshift#58878 from openshift-bot/auto-config-brancher

openshift-merge-bot[bot] · web-flow · commit b5bb7205cb07 · 2024-11-15T16:30:33.000Z
Automate config brancher by auto-config-brancher job at Fri, 15 Nov 2024 16:04:54 UTC
diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-main.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-main.yaml
@@ -116,7 +116,9 @@ tests:
       OCP_IMAGE_N1: release:n1minor
       OCP_IMAGE_N2: release:n2minor
     env:
+      AUTH_THROUGH_CERTS: "true"
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
+      TECH_PREVIEW_NO_UPGRADE: "true"
     workflow: hypershift-azure-aks-e2e
 - as: e2e-aws
   skip_if_only_changed: (^(\.tekton|docs|examples|enhancements|contrib)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.17.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.17.yaml
@@ -67,7 +67,9 @@ tests:
   steps:
     cluster_profile: hypershift
     env:
+      AUTH_THROUGH_CERTS: "true"
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
+      TECH_PREVIEW_NO_UPGRADE: "true"
     workflow: hypershift-azure-aks-e2e
 - as: e2e-aws
   skip_if_only_changed: (^(\.tekton|docs|examples|enhancements|contrib)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.18.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.18.yaml
@@ -109,7 +109,9 @@ tests:
       OCP_IMAGE_N1: release:n1minor
       OCP_IMAGE_N2: release:n2minor
     env:
+      AUTH_THROUGH_CERTS: "true"
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
+      TECH_PREVIEW_NO_UPGRADE: "true"
     workflow: hypershift-azure-aks-e2e
 - as: e2e-aws
   skip_if_only_changed: (^(\.tekton|docs|examples|enhancements|contrib)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19.yaml b/ci-operator/config/openshift-priv/hypershift/openshift-priv-hypershift-release-4.19.yaml
@@ -108,7 +108,9 @@ tests:
       OCP_IMAGE_N1: release:n1minor
       OCP_IMAGE_N2: release:n2minor
     env:
+      AUTH_THROUGH_CERTS: "true"
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
+      TECH_PREVIEW_NO_UPGRADE: "true"
     workflow: hypershift-azure-aks-e2e
 - as: e2e-aws
   skip_if_only_changed: (^(\.tekton|docs|examples|enhancements|contrib)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-master.yaml b/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-master.yaml
@@ -3,6 +3,10 @@ base_images:
     name: 4.18-priv
     namespace: ocp-private
     tag: cli
+  hypershift-operator:
+    name: hypershift-operator
+    namespace: hypershift
+    tag: latest
   ocp_4.18_base-rhel9:
     name: 4.18-priv
     namespace: ocp-private
diff --git a/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.15.yaml b/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.15.yaml
@@ -3,6 +3,10 @@ base_images:
     name: 4.15-priv
     namespace: ocp-private
     tag: cli
+  hypershift-operator:
+    name: hypershift-operator
+    namespace: hypershift
+    tag: latest
   ocp_4.15_base:
     name: 4.15-priv
     namespace: ocp-private
diff --git a/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.16.yaml b/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.16.yaml
@@ -3,6 +3,10 @@ base_images:
     name: 4.16-priv
     namespace: ocp-private
     tag: cli
+  hypershift-operator:
+    name: hypershift-operator
+    namespace: hypershift
+    tag: latest
   ocp_4.16_base-rhel9:
     name: 4.16-priv
     namespace: ocp-private
diff --git a/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.17.yaml b/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.17.yaml
@@ -3,6 +3,10 @@ base_images:
     name: 4.17-priv
     namespace: ocp-private
     tag: cli
+  hypershift-operator:
+    name: hypershift-operator
+    namespace: hypershift
+    tag: latest
   ocp_4.17_base-rhel9:
     name: 4.17-priv
     namespace: ocp-private
diff --git a/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.18.yaml b/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.18.yaml
@@ -3,6 +3,10 @@ base_images:
     name: 4.18-priv
     namespace: ocp-private
     tag: cli
+  hypershift-operator:
+    name: hypershift-operator
+    namespace: hypershift
+    tag: latest
   ocp_4.18_base-rhel9:
     name: 4.18-priv
     namespace: ocp-private
diff --git a/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.19.yaml b/ci-operator/config/openshift-priv/kubevirt-csi-driver/openshift-priv-kubevirt-csi-driver-release-4.19.yaml
@@ -3,6 +3,10 @@ base_images:
     name: 4.19-priv
     namespace: ocp-private
     tag: cli
+  hypershift-operator:
+    name: hypershift-operator
+    namespace: hypershift
+    tag: latest
   ocp_4.18_base-rhel9:
     name: 4.19-priv
     namespace: ocp-private
diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yaml
@@ -107,7 +107,9 @@ tests:
       OCP_IMAGE_N1: release:n1minor
       OCP_IMAGE_N2: release:n2minor
     env:
+      AUTH_THROUGH_CERTS: "true"
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
+      TECH_PREVIEW_NO_UPGRADE: "true"
     workflow: hypershift-azure-aks-e2e
 - as: e2e-aws
   skip_if_only_changed: (^(\.tekton|docs|examples|enhancements|contrib)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)
diff --git a/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__opp-ocp4.18-interop-vsphere.yaml b/ci-operator/config/stolostron/policy-collection/stolostron-policy-collection-main__opp-ocp4.18-interop-vsphere.yaml
@@ -7,10 +7,6 @@ base_images:
     name: "2.12"
     namespace: acm-qe
     tag: observability-core-automation
-  ocs-ci-tests:
-    name: ocs-ci-container
-    namespace: ci
-    tag: stable
   upi-installer:
     name: "4.18"
     namespace: ocp
diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.15.38-x86-64-for-4.15.0-0-to-4.16.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.15.38-x86-64-for-4.15.0-0-to-4.16.0-0_clusterimageset.yaml
@@ -3,7 +3,6 @@ kind: ClusterImageSet
 metadata:
   annotations:
     version_lower: 4.15.0-0
-    version_stream: 4-stable
     version_upper: 4.16.0-0
   creationTimestamp: null
   name: ocp-release-4.15.38-x86-64-for-4.15.0-0-to-4.16.0-0
diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.5-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.5-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml
@@ -3,6 +3,7 @@ kind: ClusterImageSet
 metadata:
   annotations:
     version_lower: 4.17.0-0
+    version_stream: 4-stable
     version_upper: 4.18.0-0
   creationTimestamp: null
   name: ocp-release-4.17.5-x86-64-for-4.17.0-0-to-4.18.0-0
