Fix context_dirs / add build_arg for scos (#51432)

openshift · Apr 29, 2024 · f423da7 · f423da7
1 parent cbed72c
commit f423da7
Show file tree

Hide file tree

Showing 163 changed files with 960 additions and 258 deletions.
diff --git a/...onfig/openshift/agent-installer-utils/openshift-agent-installer-utils-main__okd-scos.yaml b/...onfig/openshift/agent-installer-utils/openshift-agent-installer-utils-main__okd-scos.yaml
@@ -13,12 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- context_dir: images
-  dockerfile_path: Dockerfile.ocp
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: images/Dockerfile.ocp
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: agent-installer-utils
 promotion:

diff --git a/ci-operator/config/openshift/api/openshift-api-master__okd-scos.yaml b/ci-operator/config/openshift/api/openshift-api-master__okd-scos.yaml
@@ -13,11 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- dockerfile_path: Dockerfile.rhel8
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: Dockerfile.rhel8
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: cluster-config-api
 promotion:

diff --git a/...openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-master__okd-scos.yaml b/...openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-master__okd-scos.yaml
@@ -13,11 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- dockerfile_path: Dockerfile.openshift
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: Dockerfile.openshift
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: apiserver-network-proxy
 promotion:

diff --git a/...enshift/assisted-installer-agent/openshift-assisted-installer-agent-master__okd-scos.yaml b/...enshift/assisted-installer-agent/openshift-assisted-installer-agent-master__okd-scos.yaml
@@ -13,12 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- context_dir: .
-  dockerfile_path: Dockerfile.ocp
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: ./Dockerfile.ocp
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15
   to: agent-installer-node-agent
 promotion:

diff --git a/...or/config/openshift/assisted-installer/openshift-assisted-installer-master__okd-scos.yaml b/...or/config/openshift/assisted-installer/openshift-assisted-installer-master__okd-scos.yaml
@@ -13,12 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- context_dir: .
-  dockerfile_path: Dockerfile.assisted-installer.ocp
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: ./Dockerfile.assisted-installer.ocp
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: agent-installer-orchestrator
 promotion:

diff --git a/...erator/config/openshift/assisted-service/openshift-assisted-service-master__okd-scos.yaml b/...erator/config/openshift/assisted-service/openshift-assisted-service-master__okd-scos.yaml
@@ -17,15 +17,19 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- context_dir: .
-  dockerfile_path: Dockerfile.assisted-service.ocp
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: ./Dockerfile.assisted-service.ocp
   from: origin_scos-4.16_base-stream8
   inputs:
     ocp_builder_rhel-8-golang-1.20-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15
     origin_scos-4.16_cli:
       as:
+      - oc-image
       - registry.ci.openshift.org/ocp/4.15:cli
   to: agent-installer-api-server
 promotion:

diff --git a/...or/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-master__okd-scos.yaml b/...or/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-master__okd-scos.yaml
@@ -13,11 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- dockerfile_path: Dockerfile.openshift.rhel7
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: Dockerfile.openshift.rhel7
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: aws-ebs-csi-driver
 promotion:

diff --git a/...enshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-master__okd-scos.yaml b/...enshift/aws-pod-identity-webhook/openshift-aws-pod-identity-webhook-master__okd-scos.yaml
@@ -13,11 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- dockerfile_path: Dockerfile.rhel7
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: Dockerfile.rhel7
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: aws-pod-identity-webhook
 promotion:

diff --git a/...fig/openshift/azure-disk-csi-driver/openshift-azure-disk-csi-driver-master__okd-scos.yaml b/...fig/openshift/azure-disk-csi-driver/openshift-azure-disk-csi-driver-master__okd-scos.yaml
@@ -13,11 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- dockerfile_path: Dockerfile.openshift.rhel7
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: Dockerfile.openshift.rhel7
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: azure-disk-csi-driver
 promotion:

diff --git a/...fig/openshift/azure-file-csi-driver/openshift-azure-file-csi-driver-master__okd-scos.yaml b/...fig/openshift/azure-file-csi-driver/openshift-azure-file-csi-driver-master__okd-scos.yaml
@@ -13,11 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- dockerfile_path: Dockerfile.openshift
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: Dockerfile.openshift
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: azure-file-csi-driver
 promotion:

diff --git a/...g/openshift/azure-workload-identity/openshift-azure-workload-identity-main__okd-scos.yaml b/...g/openshift/azure-workload-identity/openshift-azure-workload-identity-main__okd-scos.yaml
@@ -13,11 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- dockerfile_path: Dockerfile.rhel7
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: Dockerfile.rhel7
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: azure-workload-identity-webhook
 promotion:

diff --git a/...or/config/openshift/baremetal-operator/openshift-baremetal-operator-master__okd-scos.yaml b/...or/config/openshift/baremetal-operator/openshift-baremetal-operator-master__okd-scos.yaml
@@ -13,11 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- dockerfile_path: Dockerfile.ocp
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: Dockerfile.ocp
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: baremetal-operator
 promotion:

diff --git a/...onfig/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master__okd-scos.yaml b/...onfig/openshift/baremetal-runtimecfg/openshift-baremetal-runtimecfg-master__okd-scos.yaml
@@ -13,11 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- dockerfile_path: Dockerfile.openshift
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: Dockerfile.openshift
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: baremetal-runtimecfg
 promotion:

diff --git a/ci-operator/config/openshift/bond-cni/openshift-bond-cni-master__okd-scos.yaml b/ci-operator/config/openshift/bond-cni/openshift-bond-cni-master__okd-scos.yaml
@@ -17,14 +17,19 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- dockerfile_path: Dockerfile.openshift
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: Dockerfile.openshift
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-8-golang-1.21-openshift-4.16:
       as:
+      - rhel8
       - 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:
+      - rhel9
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: network-interface-bond-cni
 promotion:

diff --git a/ci-operator/config/openshift/builder/openshift-builder-master__okd-scos.yaml b/ci-operator/config/openshift/builder/openshift-builder-master__okd-scos.yaml
@@ -13,11 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- dockerfile_path: Dockerfile.rhel8
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: Dockerfile.rhel8
   from: ocp_builder_stream9
   inputs:
     ocp_builder_rhel-8-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: docker-builder
 promotion:

diff --git a/...network-config-controller/openshift-cloud-network-config-controller-master__okd-scos.yaml b/...network-config-controller/openshift-cloud-network-config-controller-master__okd-scos.yaml
@@ -13,11 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- dockerfile_path: Dockerfile
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: Dockerfile
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: cloud-network-config-controller
 promotion:

diff --git a/...cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-master__okd-scos.yaml b/...cloud-provider-alibaba-cloud/openshift-cloud-provider-alibaba-cloud-master__okd-scos.yaml
@@ -13,12 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- context_dir: openshift-hack/images
-  dockerfile_path: Dockerfile.openshift
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: openshift-hack/images/Dockerfile.openshift
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: alibaba-cloud-controller-manager
 promotion:

diff --git a/...or/config/openshift/cloud-provider-aws/openshift-cloud-provider-aws-master__okd-scos.yaml b/...or/config/openshift/cloud-provider-aws/openshift-cloud-provider-aws-master__okd-scos.yaml
@@ -13,11 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- dockerfile_path: Dockerfile.openshift
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: Dockerfile.openshift
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: aws-cloud-controller-manager
 promotion:

diff --git a/...onfig/openshift/cloud-provider-azure/openshift-cloud-provider-azure-master__okd-scos.yaml b/...onfig/openshift/cloud-provider-azure/openshift-cloud-provider-azure-master__okd-scos.yaml
@@ -13,20 +13,26 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- context_dir: openshift-hack/images
-  dockerfile_path: cloud-controller-manager-openshift.Dockerfile
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: openshift-hack/images/cloud-controller-manager-openshift.Dockerfile
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: azure-cloud-controller-manager
-- context_dir: openshift-hack/images
-  dockerfile_path: cloud-node-manager-openshift.Dockerfile
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: openshift-hack/images/cloud-node-manager-openshift.Dockerfile
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: azure-cloud-node-manager
 promotion:

diff --git a/...or/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-master__okd-scos.yaml b/...or/config/openshift/cloud-provider-gcp/openshift-cloud-provider-gcp-master__okd-scos.yaml
@@ -13,12 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- context_dir: openshift-hack/images
-  dockerfile_path: Dockerfile.openshift
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: openshift-hack/images/Dockerfile.openshift
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: gcp-cloud-controller-manager
 promotion:

diff --git a/...or/config/openshift/cloud-provider-ibm/openshift-cloud-provider-ibm-master__okd-scos.yaml b/...or/config/openshift/cloud-provider-ibm/openshift-cloud-provider-ibm-master__okd-scos.yaml
@@ -13,12 +13,15 @@ build_root:
     namespace: ocp
     tag: rhel-8-golang-1.21-openshift-4.16
 images:
-- context_dir: openshift-hack/images
-  dockerfile_path: Dockerfile.openshift
+- build_args:
+  - name: TAGS
+    value: scos
+  dockerfile_path: openshift-hack/images/Dockerfile.openshift
   from: origin_scos-4.16_base-stream9
   inputs:
     ocp_builder_rhel-9-golang-1.21-openshift-4.16:
       as:
+      - ccm-builder
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: ibm-cloud-controller-manager
 promotion: