MGMT-18332: Prepare assisted-installer CI configuration for testing n…

…ew test Dockerfile (openshift#54090)
ptalgulk01 · Jul 10, 2024 · bec9e9c · bec9e9c
1 parent f738b23
commit bec9e9c
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 94 deletions.
diff --git a/...erator/config/openshift/assisted-installer/openshift-assisted-installer-master__edge.yaml b/...erator/config/openshift/assisted-installer/openshift-assisted-installer-master__edge.yaml
@@ -65,10 +65,7 @@ images:
       - registry.ci.openshift.org/openshift/release:golang-1.20
   to: assisted-installer-controller
 - dockerfile_path: Dockerfile.assisted-installer-build
-  inputs:
-    openshift_release_golang-1.20:
-      as:
-      - registry.ci.openshift.org/openshift/release:golang-1.20
+  from: coreos-centos-stream9
   to: assisted-installer-build
 promotion:
   to:

diff --git a/...or/config/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.10.yaml b/...or/config/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.10.yaml
@@ -53,10 +53,7 @@ images:
       - registry.ci.openshift.org/openshift/release:golang-1.20
   to: assisted-installer-controller
 - dockerfile_path: Dockerfile.assisted-installer-build
-  inputs:
-    openshift_release_golang-1.20:
-      as:
-      - registry.ci.openshift.org/openshift/release:golang-1.20
+  from: coreos-centos-stream9
   to: assisted-installer-build
 promotion:
   to:

diff --git a/...or/config/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.11.yaml b/...or/config/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.11.yaml
@@ -53,10 +53,7 @@ images:
       - registry.ci.openshift.org/openshift/release:golang-1.20
   to: assisted-installer-controller
 - dockerfile_path: Dockerfile.assisted-installer-build
-  inputs:
-    openshift_release_golang-1.20:
-      as:
-      - registry.ci.openshift.org/openshift/release:golang-1.20
+  from: coreos-centos-stream9
   to: assisted-installer-build
 promotion:
   to:

diff --git a/...tor/config/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.8.yaml b/...tor/config/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.8.yaml
@@ -23,6 +23,10 @@ base_images:
     name: stream8
     namespace: coreos
     tag: "8"
+  coreos-centos-stream9:
+    name: stream9
+    namespace: coreos
+    tag: "9"
   dev-scripts:
     name: test
     namespace: ocp-kni
@@ -32,8 +36,7 @@ base_images:
     namespace: openshift
     tag: golang-1.19
 build_root:
-  project_image:
-    dockerfile_path: Dockerfile.assisted-installer-build
+  from_repository: true
 images:
 - dockerfile_path: Dockerfile.assisted-installer
   from: coreos-centos-stream8
@@ -49,6 +52,9 @@ images:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.19
   to: assisted-installer-controller
+- dockerfile_path: Dockerfile.image-installer-build
+  from: coreos-centos-stream9
+  to: assisted-installer-build
 promotion:
   to:
   - name: ocm-2.8
@@ -64,9 +70,6 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-test_binary_build_commands: |
-  go mod vendor
-  mkdir /.cache && chmod 775 -R /.cache ${GOPATH}
 tests:
 - as: mirror-nightly-image
   cron: '@daily'
@@ -114,19 +117,22 @@ tests:
     export GOPROXY=https://proxy.golang.org
     make lint
   container:
-    from: test-bin
+    clone: true
+    from: assisted-installer-build
   skip_if_only_changed: ^docs/|^\.github/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$
 - as: format-check
   commands: make format-check
   container:
-    from: test-bin
+    clone: true
+    from: assisted-installer-build
   skip_if_only_changed: ^docs/|^\.github/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$
 - as: unit-test
   commands: |
     export CODECOV_TOKEN=$(cat /tmp/secret/codecov-token)
     make REPORTS=${ARTIFACT_DIR} unit-test
   container:
-    from: test-bin
+    clone: true
+    from: assisted-installer-build
   secret:
     mount_path: /tmp/secret
     name: assisted-installer-codecov-token
@@ -136,7 +142,8 @@ tests:
     export CODECOV_TOKEN=$(cat /tmp/secret/codecov-token)
     make REPORTS=${ARTIFACT_DIR} unit-test
   container:
-    from: test-bin
+    clone: true
+    from: assisted-installer-build
   postsubmit: true
   secret:
     mount_path: /tmp/secret

diff --git a/...onfig/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.8__mce.yaml b/...onfig/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.8__mce.yaml
@@ -8,8 +8,7 @@ base_images:
     namespace: openshift
     tag: golang-1.19
 build_root:
-  project_image:
-    dockerfile_path: Dockerfile.assisted-installer-build
+  from_repository: true
 images:
 - dockerfile_path: Dockerfile.assisted-installer
   from: coreos-centos-stream8

diff --git a/...tor/config/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.9.yaml b/...tor/config/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.9.yaml
@@ -23,6 +23,10 @@ base_images:
     name: stream8
     namespace: coreos
     tag: "8"
+  coreos-centos-stream9:
+    name: stream9
+    namespace: coreos
+    tag: "9"
   dev-scripts:
     name: test
     namespace: ocp-kni
@@ -32,8 +36,7 @@ base_images:
     namespace: openshift
     tag: golang-1.19
 build_root:
-  project_image:
-    dockerfile_path: Dockerfile.assisted-installer-build
+  from_repository: true
 images:
 - dockerfile_path: Dockerfile.assisted-installer
   from: coreos-centos-stream8
@@ -49,6 +52,9 @@ images:
       as:
       - registry.ci.openshift.org/openshift/release:golang-1.19
   to: assisted-installer-controller
+- dockerfile_path: Dockerfile.image-installer-build
+  from: coreos-centos-stream9
+  to: assisted-installer-build
 promotion:
   to:
   - name: ocm-2.9
@@ -64,9 +70,6 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-test_binary_build_commands: |
-  go mod vendor
-  mkdir /.cache && chmod 775 -R /.cache ${GOPATH}
 tests:
 - as: mirror-nightly-image
   cron: '@daily'
@@ -114,19 +117,22 @@ tests:
     export GOPROXY=https://proxy.golang.org
     make lint
   container:
-    from: test-bin
+    clone: true
+    from: assisted-installer-build
   skip_if_only_changed: ^docs/|^\.github/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$
 - as: format-check
   commands: make format-check
   container:
-    from: test-bin
+    clone: true
+    from: assisted-installer-build
   skip_if_only_changed: ^docs/|^\.github/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$
 - as: unit-test
   commands: |
     export CODECOV_TOKEN=$(cat /tmp/secret/codecov-token)
     make REPORTS=${ARTIFACT_DIR} unit-test
   container:
-    from: test-bin
+    clone: true
+    from: assisted-installer-build
   secret:
     mount_path: /tmp/secret
     name: assisted-installer-codecov-token
@@ -136,7 +142,8 @@ tests:
     export CODECOV_TOKEN=$(cat /tmp/secret/codecov-token)
     make REPORTS=${ARTIFACT_DIR} unit-test
   container:
-    from: test-bin
+    clone: true
+    from: assisted-installer-build
   postsubmit: true
   secret:
     mount_path: /tmp/secret

diff --git a/...onfig/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.9__mce.yaml b/...onfig/openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.9__mce.yaml
@@ -8,8 +8,7 @@ base_images:
     namespace: openshift
     tag: golang-1.19
 build_root:
-  project_image:
-    dockerfile_path: Dockerfile.assisted-installer-build
+  from_repository: true
 images:
 - dockerfile_path: Dockerfile.assisted-installer
   from: coreos-centos-stream8

diff --git a/.../openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.8-periodics.yaml b/.../openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.8-periodics.yaml
@@ -3,8 +3,6 @@ periodics:
   cluster: build02
   cron: 53 3 * * *
   decorate: true
-  decoration_config:
-    skip_cloning: true
   extra_refs:
   - base_ref: release-ocm-2.8
     org: openshift
@@ -64,8 +62,6 @@ periodics:
   cluster: build02
   cron: 14 0 * * *
   decorate: true
-  decoration_config:
-    skip_cloning: true
   extra_refs:
   - base_ref: release-ocm-2.8
     org: openshift

diff --git a/...penshift/assisted-installer/openshift-assisted-installer-release-ocm-2.8-postsubmits.yaml b/...penshift/assisted-installer/openshift-assisted-installer-release-ocm-2.8-postsubmits.yaml
@@ -6,8 +6,6 @@ postsubmits:
     - ^release-ocm-2\.8$
     cluster: build02
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci.openshift.io/generator: prowgen
@@ -67,8 +65,6 @@ postsubmits:
     - ^release-ocm-2\.8$
     cluster: build02
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/is-promotion: "true"
       ci-operator.openshift.io/variant: mce
@@ -129,8 +125,6 @@ postsubmits:
     - ^release-ocm-2\.8$
     cluster: build02
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/variant: mce
       ci.openshift.io/generator: prowgen
@@ -189,8 +183,6 @@ postsubmits:
     - ^release-ocm-2\.8$
     cluster: build02
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/variant: mce
       ci.openshift.io/generator: prowgen
@@ -249,8 +241,6 @@ postsubmits:
     - ^release-ocm-2\.8$
     cluster: build02
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       job-release: "4.13"
@@ -308,8 +298,6 @@ postsubmits:
     - ^release-ocm-2\.8$
     cluster: build02
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       job-release: "4.13"
@@ -367,8 +355,6 @@ postsubmits:
     - ^release-ocm-2\.8$
     cluster: build02
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       job-release: "4.13"

diff --git a/...openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.8-presubmits.yaml b/...openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.8-presubmits.yaml
@@ -8,8 +8,6 @@ presubmits:
     cluster: build02
     context: ci/prow/e2e-ai-operator-ztp
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/cloud: packet-edge
       ci-operator.openshift.io/cloud-cluster-profile: packet-assisted
@@ -90,8 +88,6 @@ presubmits:
     cluster: build02
     context: ci/prow/format-check
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       job-release: "4.13"
@@ -147,8 +143,6 @@ presubmits:
     cluster: build02
     context: ci/prow/images
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       job-release: "4.13"
@@ -203,8 +197,6 @@ presubmits:
     cluster: build02
     context: ci/prow/lint
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       job-release: "4.13"
@@ -260,8 +252,6 @@ presubmits:
     cluster: build02
     context: ci/prow/mce-images
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci-operator.openshift.io/variant: mce
       ci.openshift.io/generator: prowgen
@@ -317,8 +307,6 @@ presubmits:
     cluster: build02
     context: ci/prow/unit-test
     decorate: true
-    decoration_config:
-      skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       job-release: "4.13"

diff --git a/.../openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.9-periodics.yaml b/.../openshift/assisted-installer/openshift-assisted-installer-release-ocm-2.9-periodics.yaml
@@ -3,8 +3,6 @@ periodics:
   cluster: build02
   cron: 46 2 * * *
   decorate: true
-  decoration_config:
-    skip_cloning: true
   extra_refs:
   - base_ref: release-ocm-2.9
     org: openshift
@@ -64,8 +62,6 @@ periodics:
   cluster: build02
   cron: 19 23 * * *
   decorate: true
-  decoration_config:
-    skip_cloning: true
   extra_refs:
   - base_ref: release-ocm-2.9
     org: openshift