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

Automate config brancher by auto-config-brancher job at Mon, 06 May 2024 00:04:51 UTC
openshift · May 6, 2024 · c18b5c0 · c18b5c0
2 parents bd6894d + faaa12a
commit c18b5c0
Show file tree

Hide file tree

Showing 20 changed files with 345 additions and 78 deletions.
diff --git a/ci-operator/config/openshift-priv/images/openshift-priv-images-master.yaml b/ci-operator/config/openshift-priv/images/openshift-priv-images-master.yaml
@@ -3,10 +3,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.14_base:
-    name: 4.14-priv
-    namespace: ocp-private
-    tag: base
   ocp_4.15_base:
     name: 4.15-priv
     namespace: ocp-private
@@ -52,6 +48,9 @@ images:
     ocp_4.15_base:
       as:
       - registry.ci.openshift.org/ocp/4.15:base
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: egress-http-proxy
 - context_dir: egress/dns-proxy
   inputs:
@@ -64,9 +63,9 @@ images:
   to: egress-dns-proxy
 - context_dir: ipfailover/keepalived
   inputs:
-    ocp_4.14_base:
+    ocp_4.16_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.14:base
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: keepalived-ipfailover
 promotion:
   to:

diff --git a/ci-operator/config/openshift-priv/images/openshift-priv-images-release-4.16.yaml b/ci-operator/config/openshift-priv/images/openshift-priv-images-release-4.16.yaml
@@ -3,10 +3,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.14_base:
-    name: 4.14-priv
-    namespace: ocp-private
-    tag: base
   ocp_4.15_base:
     name: 4.15-priv
     namespace: ocp-private
@@ -52,6 +48,9 @@ images:
     ocp_4.15_base:
       as:
       - registry.ci.openshift.org/ocp/4.15:base
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: egress-http-proxy
 - context_dir: egress/dns-proxy
   inputs:
@@ -64,9 +63,9 @@ images:
   to: egress-dns-proxy
 - context_dir: ipfailover/keepalived
   inputs:
-    ocp_4.14_base:
+    ocp_4.16_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.14:base
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: keepalived-ipfailover
 promotion:
   to:

diff --git a/ci-operator/config/openshift-priv/images/openshift-priv-images-release-4.17.yaml b/ci-operator/config/openshift-priv/images/openshift-priv-images-release-4.17.yaml
@@ -3,10 +3,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.14_base:
-    name: 4.14-priv
-    namespace: ocp-private
-    tag: base
   ocp_4.15_base:
     name: 4.15-priv
     namespace: ocp-private
@@ -52,6 +48,9 @@ images:
     ocp_4.15_base:
       as:
       - registry.ci.openshift.org/ocp/4.15:base
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: egress-http-proxy
 - context_dir: egress/dns-proxy
   inputs:
@@ -64,9 +63,9 @@ images:
   to: egress-dns-proxy
 - context_dir: ipfailover/keepalived
   inputs:
-    ocp_4.14_base:
+    ocp_4.16_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.14:base
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: keepalived-ipfailover
 promotion:
   to:

diff --git a/ci-operator/config/openshift-priv/oc/openshift-priv-oc-master.yaml b/ci-operator/config/openshift-priv/oc/openshift-priv-oc-master.yaml
@@ -7,10 +7,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.16_base:
-    name: 4.16-priv
-    namespace: ocp-private
-    tag: base
   ocp_4.16_base-rhel9:
     name: 4.16-priv
     namespace: ocp-private
@@ -34,9 +30,6 @@ canonical_go_repository: github.com/openshift/oc
 images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   inputs:
-    ocp_4.16_base:
-      as:
-      - registry.ci.openshift.org/ocp/4.16:base
     ocp_4.16_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.16:base-rhel9

diff --git a/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.16.yaml b/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.16.yaml
@@ -7,10 +7,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.16_base:
-    name: 4.16-priv
-    namespace: ocp-private
-    tag: base
   ocp_4.16_base-rhel9:
     name: 4.16-priv
     namespace: ocp-private
@@ -34,9 +30,6 @@ canonical_go_repository: github.com/openshift/oc
 images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   inputs:
-    ocp_4.16_base:
-      as:
-      - registry.ci.openshift.org/ocp/4.16:base
     ocp_4.16_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.16:base-rhel9

diff --git a/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.17.yaml b/ci-operator/config/openshift-priv/oc/openshift-priv-oc-release-4.17.yaml
@@ -7,10 +7,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.16_base:
-    name: 4.17-priv
-    namespace: ocp-private
-    tag: base
   ocp_4.16_base-rhel9:
     name: 4.17-priv
     namespace: ocp-private
@@ -34,9 +30,6 @@ canonical_go_repository: github.com/openshift/oc
 images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   inputs:
-    ocp_4.16_base:
-      as:
-      - registry.ci.openshift.org/ocp/4.16:base
     ocp_4.16_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.16:base-rhel9

diff --git a/...indows-machine-config-operator/openshift-priv-windows-machine-config-operator-master.yaml b/...indows-machine-config-operator/openshift-priv-windows-machine-config-operator-master.yaml
@@ -96,6 +96,17 @@ tests:
     test:
     - ref: windows-e2e-operator-test
     workflow: ipi-aws-ovn-hybrid
+- always_run: false
+  as: vsphere-disconnected-e2e-operator
+  optional: true
+  steps:
+    cluster_profile: vsphere-dis-2
+    leases:
+    - env: VSPHERE_BASTION_LEASED_RESOURCE
+      resource_type: vsphere-connected-2-quota-slice
+    test:
+    - ref: windows-e2e-operator-test
+    workflow: windows-e2e-operator-test-vsphere-disconnected
 - always_run: false
   as: azure-e2e-operator
   steps:

diff --git a/...-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.16.yaml b/...-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.16.yaml
@@ -97,6 +97,17 @@ tests:
     test:
     - ref: windows-e2e-operator-test
     workflow: ipi-aws-ovn-hybrid
+- always_run: false
+  as: vsphere-disconnected-e2e-operator
+  optional: true
+  steps:
+    cluster_profile: vsphere-dis-2
+    leases:
+    - env: VSPHERE_BASTION_LEASED_RESOURCE
+      resource_type: vsphere-connected-2-quota-slice
+    test:
+    - ref: windows-e2e-operator-test
+    workflow: windows-e2e-operator-test-vsphere-disconnected
 - always_run: false
   as: azure-e2e-operator
   steps:

diff --git a/...-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.17.yaml b/...-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.17.yaml
@@ -96,6 +96,17 @@ tests:
     test:
     - ref: windows-e2e-operator-test
     workflow: ipi-aws-ovn-hybrid
+- always_run: false
+  as: vsphere-disconnected-e2e-operator
+  optional: true
+  steps:
+    cluster_profile: vsphere-dis-2
+    leases:
+    - env: VSPHERE_BASTION_LEASED_RESOURCE
+      resource_type: vsphere-connected-2-quota-slice
+    test:
+    - ref: windows-e2e-operator-test
+    workflow: windows-e2e-operator-test-vsphere-disconnected
 - always_run: false
   as: azure-e2e-operator
   steps:

diff --git a/ci-operator/config/openshift/images/openshift-images-master.yaml b/ci-operator/config/openshift/images/openshift-images-master.yaml
@@ -3,10 +3,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.14_base:
-    name: "4.14"
-    namespace: ocp
-    tag: base
   ocp_4.15_base:
     name: "4.15"
     namespace: ocp
@@ -51,6 +47,9 @@ images:
     ocp_4.15_base:
       as:
       - registry.ci.openshift.org/ocp/4.15:base
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: egress-http-proxy
 - context_dir: egress/dns-proxy
   inputs:
@@ -63,9 +62,9 @@ images:
   to: egress-dns-proxy
 - context_dir: ipfailover/keepalived
   inputs:
-    ocp_4.14_base:
+    ocp_4.16_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.14:base
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: keepalived-ipfailover
 promotion:
   to:

diff --git a/ci-operator/config/openshift/images/openshift-images-release-4.16.yaml b/ci-operator/config/openshift/images/openshift-images-release-4.16.yaml
@@ -3,10 +3,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.14_base:
-    name: "4.14"
-    namespace: ocp
-    tag: base
   ocp_4.15_base:
     name: "4.15"
     namespace: ocp
@@ -51,6 +47,9 @@ images:
     ocp_4.15_base:
       as:
       - registry.ci.openshift.org/ocp/4.15:base
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: egress-http-proxy
 - context_dir: egress/dns-proxy
   inputs:
@@ -63,9 +62,9 @@ images:
   to: egress-dns-proxy
 - context_dir: ipfailover/keepalived
   inputs:
-    ocp_4.14_base:
+    ocp_4.16_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.14:base
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: keepalived-ipfailover
 promotion:
   to:

diff --git a/ci-operator/config/openshift/images/openshift-images-release-4.17.yaml b/ci-operator/config/openshift/images/openshift-images-release-4.17.yaml
@@ -3,10 +3,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.14_base:
-    name: "4.14"
-    namespace: ocp
-    tag: base
   ocp_4.15_base:
     name: "4.15"
     namespace: ocp
@@ -51,6 +47,9 @@ images:
     ocp_4.15_base:
       as:
       - registry.ci.openshift.org/ocp/4.15:base
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: egress-http-proxy
 - context_dir: egress/dns-proxy
   inputs:
@@ -63,9 +62,9 @@ images:
   to: egress-dns-proxy
 - context_dir: ipfailover/keepalived
   inputs:
-    ocp_4.14_base:
+    ocp_4.16_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.14:base
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: keepalived-ipfailover
 promotion:
   to:

diff --git a/ci-operator/config/openshift/lvm-operator/openshift-lvm-operator-main.yaml b/ci-operator/config/openshift/lvm-operator/openshift-lvm-operator-main.yaml
@@ -7,6 +7,10 @@ base_images:
     name: "4.16"
     namespace: ocp
     tag: must-gather
+  ocp_4.16_base-rhel9:
+    name: "4.16"
+    namespace: ocp
+    tag: base-rhel9
   ubi_minimal:
     name: ubi-minimal
     namespace: ocp
@@ -46,6 +50,10 @@ images:
       - root:current
   to: lvms-pre-commit
 - dockerfile_path: Dockerfile
+  inputs:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
   to: lvm-operator
 - context_dir: must-gather/
   dockerfile_path: Dockerfile

diff --git a/ci-operator/config/openshift/oc/openshift-oc-master.yaml b/ci-operator/config/openshift/oc/openshift-oc-master.yaml
@@ -7,10 +7,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.16_base:
-    name: "4.16"
-    namespace: ocp
-    tag: base
   ocp_4.16_base-rhel9:
     name: "4.16"
     namespace: ocp
@@ -33,9 +29,6 @@ build_root:
 images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   inputs:
-    ocp_4.16_base:
-      as:
-      - registry.ci.openshift.org/ocp/4.16:base
     ocp_4.16_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.16:base-rhel9

diff --git a/ci-operator/config/openshift/oc/openshift-oc-master__okd-scos.yaml b/ci-operator/config/openshift/oc/openshift-oc-master__okd-scos.yaml
@@ -11,6 +11,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-9-golang-1.20-openshift-4.16
+  ocp_builder_rhel-9-golang-1.21-openshift-4.16:
+    name: builder
+    namespace: ocp
+    tag: rhel-9-golang-1.21-openshift-4.16
   origin_scos-4.16_base-stream8:
     name: scos-4.16
     namespace: origin
@@ -30,6 +34,9 @@ images:
     ocp_builder_rhel-8-golang-1.21-openshift-4.16:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
+    ocp_builder_rhel-9-golang-1.21-openshift-4.16:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: cli
 - build_args:
   - name: TAGS

diff --git a/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml b/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml
@@ -7,10 +7,6 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.16_base:
-    name: "4.16"
-    namespace: ocp
-    tag: base
   ocp_4.16_base-rhel9:
     name: "4.16"
     namespace: ocp
@@ -33,9 +29,6 @@ build_root:
 images:
 - dockerfile_path: images/cli/Dockerfile.rhel
   inputs:
-    ocp_4.16_base:
-      as:
-      - registry.ci.openshift.org/ocp/4.16:base
     ocp_4.16_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.16:base-rhel9