Use fastest combinations

- amd64: locally - arm64: remote VM - s390x: remote VM - ppc64le: builder on remote, collector image locally
stackrox · Mar 14, 2024 · fba6f21 · fba6f21
1 parent a3dcd90
commit fba6f21
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/collector-builder.yml b/.github/workflows/collector-builder.yml
@@ -101,6 +101,7 @@ jobs:
           collector_git_ref: ${{ github.ref }}
           collector_git_sha: ${{ github.sha }}
           collector_builder_tag: ${{ env.COLLECTOR_BUILDER_TAG }}
+          clone_repository: false
           EOF
 
       - name: Build images
@@ -183,6 +184,7 @@ jobs:
           collector_git_ref: ${{ github.ref }}
           collector_git_sha: ${{ github.sha }}
           collector_builder_tag: ${{ env.COLLECTOR_BUILDER_TAG }}
+          clone_repository: true
           EOF
 
       - name: Build images

diff --git a/.github/workflows/collector-slim.yml b/.github/workflows/collector-slim.yml
@@ -35,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [amd64]
+        arch: [ppc64le, amd64]
 
     env:
       PLATFORM: linux/${{ matrix.arch }}
@@ -66,6 +66,7 @@ jobs:
           rhacs_eng_image: ${{ env.RHACS_ENG_IMAGE }}
           collector_image: ${{ inputs.collector-image }}
           collector_tag: ${{ inputs.collector-tag }}
+          clone_repository: false
           EOF
 
       - name: Build images
@@ -86,7 +87,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [ppc64le, s390x, arm64]
+        arch: [s390x, arm64]
 
     env:
       PLATFORM: linux/${{ matrix.arch }}
@@ -139,6 +140,7 @@ jobs:
           rhacs_eng_image: ${{ env.RHACS_ENG_IMAGE }}
           collector_image: ${{ inputs.collector-image }}
           collector_tag: ${{ inputs.collector-tag }}
+          clone_repository: true
           EOF
 
       - name: Build ${{ matrix.arch }} image

diff --git a/ansible/ci-build-builder.yml b/ansible/ci-build-builder.yml
@@ -18,7 +18,7 @@
         version: "{{ collector_git_sha }}"
         refspec: "+{{ collector_git_ref | replace('refs/', '') }}"
         recursive: true
-      when: arch != "amd64"
+      when: clone_repository
 
     - name: Build the collector builder image
       community.general.make:

diff --git a/ansible/ci-build-collector.yml b/ansible/ci-build-collector.yml
@@ -20,7 +20,7 @@
         version: "{{ collector_git_sha }}"
         refspec: "+{{ collector_git_ref | replace('refs/', '') }}"
         recursive: true
-      when: arch != "amd64"
+      when: clone_repository
 
     - name: Run the builder image
       community.general.make: