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

Automate config brancher by auto-config-brancher job at Thu, 09 May 2024 04:04:54 UTC
openshift · May 9, 2024 · dedd954 · dedd954
2 parents b5a7193 + 5855c4b
commit dedd954
Show file tree

Hide file tree

Showing 9 changed files with 174 additions and 3 deletions.
diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml
@@ -126,7 +126,26 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: libvirt-installer
-- dockerfile_path: images/installer/Dockerfile.upi.ci.rhel8
+- dockerfile_path: images/installer/Dockerfile.upi.ci
+  inputs:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
+    ocp_4.16_cli:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:cli
+    ocp_4.16_installer-etcd-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-etcd-artifacts
+    ocp_4.16_installer-kube-apiserver-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-kube-apiserver-artifacts
+    ocp_4.16_installer-terraform-providers:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-terraform-providers
+    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: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
   inputs:

diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.16.yaml
@@ -126,7 +126,26 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: libvirt-installer
-- dockerfile_path: images/installer/Dockerfile.upi.ci.rhel8
+- dockerfile_path: images/installer/Dockerfile.upi.ci
+  inputs:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
+    ocp_4.16_cli:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:cli
+    ocp_4.16_installer-etcd-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-etcd-artifacts
+    ocp_4.16_installer-kube-apiserver-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-kube-apiserver-artifacts
+    ocp_4.16_installer-terraform-providers:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-terraform-providers
+    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: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
   inputs:

diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.17.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.17.yaml
@@ -126,7 +126,26 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: libvirt-installer
-- dockerfile_path: images/installer/Dockerfile.upi.ci.rhel8
+- dockerfile_path: images/installer/Dockerfile.upi.ci
+  inputs:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
+    ocp_4.16_cli:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:cli
+    ocp_4.16_installer-etcd-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-etcd-artifacts
+    ocp_4.16_installer-kube-apiserver-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-kube-apiserver-artifacts
+    ocp_4.16_installer-terraform-providers:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-terraform-providers
+    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: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
   inputs:

diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
@@ -126,6 +126,25 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: libvirt-installer
 - dockerfile_path: images/installer/Dockerfile.upi.ci
+  inputs:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
+    ocp_4.16_cli:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:cli
+    ocp_4.16_installer-etcd-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-etcd-artifacts
+    ocp_4.16_installer-kube-apiserver-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-kube-apiserver-artifacts
+    ocp_4.16_installer-terraform-providers:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-terraform-providers
+    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: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
   inputs:

diff --git a/ci-operator/config/openshift/installer/openshift-installer-master__okd.yaml b/ci-operator/config/openshift/installer/openshift-installer-master__okd.yaml
@@ -105,6 +105,25 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/installer/Dockerfile.upi.ci
+  inputs:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
+    ocp_4.16_cli:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:cli
+    ocp_4.16_installer-etcd-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-etcd-artifacts
+    ocp_4.16_installer-kube-apiserver-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-kube-apiserver-artifacts
+    ocp_4.16_installer-terraform-providers:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-terraform-providers
+    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: upi-installer
 - build_args:
   - name: TAGS

diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml
@@ -126,6 +126,25 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: libvirt-installer
 - dockerfile_path: images/installer/Dockerfile.upi.ci
+  inputs:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
+    ocp_4.16_cli:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:cli
+    ocp_4.16_installer-etcd-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-etcd-artifacts
+    ocp_4.16_installer-kube-apiserver-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-kube-apiserver-artifacts
+    ocp_4.16_installer-terraform-providers:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-terraform-providers
+    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: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
   inputs:

diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.16__okd.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.16__okd.yaml
@@ -105,6 +105,25 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/installer/Dockerfile.upi.ci
+  inputs:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
+    ocp_4.16_cli:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:cli
+    ocp_4.16_installer-etcd-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-etcd-artifacts
+    ocp_4.16_installer-kube-apiserver-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-kube-apiserver-artifacts
+    ocp_4.16_installer-terraform-providers:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-terraform-providers
+    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: upi-installer
 - build_args:
   - name: TAGS

diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml
@@ -126,6 +126,25 @@ images:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: libvirt-installer
 - dockerfile_path: images/installer/Dockerfile.upi.ci
+  inputs:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
+    ocp_4.16_cli:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:cli
+    ocp_4.16_installer-etcd-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-etcd-artifacts
+    ocp_4.16_installer-kube-apiserver-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-kube-apiserver-artifacts
+    ocp_4.16_installer-terraform-providers:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-terraform-providers
+    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: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
   inputs:

diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.17__okd.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.17__okd.yaml
@@ -105,6 +105,25 @@ images:
   - name: TAGS
     value: fcos
   dockerfile_path: images/installer/Dockerfile.upi.ci
+  inputs:
+    ocp_4.16_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:base-rhel9
+    ocp_4.16_cli:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:cli
+    ocp_4.16_installer-etcd-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-etcd-artifacts
+    ocp_4.16_installer-kube-apiserver-artifacts:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-kube-apiserver-artifacts
+    ocp_4.16_installer-terraform-providers:
+      as:
+      - registry.ci.openshift.org/ocp/4.16:installer-terraform-providers
+    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: upi-installer
 - build_args:
   - name: TAGS