Limit build platforms to linux/amd64 and linux/arm64/v8

Signed-off-by: Pedro Algarvio <[email protected]>
saltstack · Nov 24, 2023 · 74ee941 · 74ee941
1 parent 797f100
commit 74ee941
Show file tree

Hide file tree

Showing 32 changed files with 35 additions and 51 deletions.
diff --git a/.github/workflows/.container.template.j2 b/.github/workflows/.container.template.j2
@@ -66,7 +66,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}<%- if multiarch %> --multiarch --exclude-platforms=<{ exclude_platforms }><%- endif %>
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}<%- if multiarch %> --multiarch<%- endif %>
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/almalinux-containers.yml b/.github/workflows/almalinux-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/amazonlinux-containers.yml b/.github/workflows/amazonlinux-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/archlinux-containers.yml b/.github/workflows/archlinux-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/busybox-containers.yml b/.github/workflows/busybox-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/centos-containers.yml b/.github/workflows/centos-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/centos-stream-containers.yml b/.github/workflows/centos-stream-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/consul-containers.yml b/.github/workflows/consul-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/debian-containers.yml b/.github/workflows/debian-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le,linux/ppc64le,linux/arm/v5
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/etcd-v2-containers.yml b/.github/workflows/etcd-v2-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/etcd-v3-containers.yml b/.github/workflows/etcd-v3-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/fedora-containers.yml b/.github/workflows/fedora-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/mariadb-containers.yml b/.github/workflows/mariadb-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/mysql-server-containers.yml b/.github/workflows/mysql-server-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/openldap-minion-containers.yml b/.github/workflows/openldap-minion-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/opensuse-containers.yml b/.github/workflows/opensuse-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/packaging-containers.yml b/.github/workflows/packaging-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le,linux/386,linux/arm/v5,linux/arm/v7
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/percona-containers.yml b/.github/workflows/percona-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/photon-containers.yml b/.github/workflows/photon-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le,linux/ppc64le,linux/arm/v5
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/python-containers.yml b/.github/workflows/python-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/rabbitmq-containers.yml b/.github/workflows/rabbitmq-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/redis-containers.yml b/.github/workflows/redis-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/salt-containers.yml b/.github/workflows/salt-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/salt-gitfs-http-containers.yml b/.github/workflows/salt-gitfs-http-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/ssh-minion-containers.yml b/.github/workflows/ssh-minion-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/tinyproxy-containers.yml b/.github/workflows/tinyproxy-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/ubuntu-containers.yml b/.github/workflows/ubuntu-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/vault-containers.yml b/.github/workflows/vault-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/virt-minion-containers.yml b/.github/workflows/virt-minion-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/zookeeper-containers.yml b/.github/workflows/zookeeper-containers.yml
@@ -62,7 +62,7 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch --exclude-platforms=linux/s390x,linux/mips64le
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
 
   mirror-image:
     runs-on: ubuntu-latest

diff --git a/containers.yml b/containers.yml
@@ -38,10 +38,6 @@ custom:
       - debian-11
       - debian-12
       - centosstream-9
-    exclude_platforms:
-      - linux/386
-      - linux/arm/v5
-      - linux/arm/v7
 # <---- Custom Containers ---------------------------------------------------------------------------------
 
 # ----- Mirrored Containers ------------------------------------------------------------------------------>
@@ -192,9 +188,6 @@ mirrors:
     commands:
       - apt update
       - apt upgrade -y
-    exclude_platforms:
-      - linux/ppc64le
-      - linux/arm/v5
 
   Fedora:
     container: fedora
@@ -222,9 +215,6 @@ mirrors:
       - tdnf update -y
       - tdnf upgrade -y
       - tdnf install -y rpm shadow
-    exclude_platforms:
-      - linux/ppc64le
-      - linux/arm/v5
 
   Ubuntu:
     container: ubuntu

diff --git a/tasks/containers.py b/tasks/containers.py
@@ -136,11 +136,6 @@ def generate(ctx, ghcr_org="saltstack/salt-ci-containers"):
         )
         workflow_tpl = utils.REPO_ROOT / ".github" / "workflows" / ".container.template.j2"
         template = env.from_string(workflow_tpl.read_text())
-        exclude_platforms = [
-            "linux/s390x",
-            "linux/mips64le",
-        ]
-        exclude_platforms.extend(details.get("exclude_platforms") or [])
         cron_hour = cron_hour_range.pop()
         if not cron_hour_range:
             cron_hour_range = list(range(0, 24))
@@ -151,7 +146,6 @@ def generate(ctx, ghcr_org="saltstack/salt-ci-containers"):
             "is_mirror": is_mirror,
             "workflow_file_name": workflow_file_name,
             "multiarch": details.get("multiarch", True),
-            "exclude_platforms": ",".join(exclude_platforms),
             "cron_hour": cron_hour,
         }
         workflows_dir = utils.REPO_ROOT / ".github" / "workflows"
@@ -173,17 +167,17 @@ def generate(ctx, ghcr_org="saltstack/salt-ci-containers"):
 
 
 @task
-def matrix(ctx, image, from_workflow=False, multiarch=False, exclude_platforms=None):
+def matrix(ctx, image, from_workflow=False, multiarch=False, build_platforms=None):
     """
     Generate the container mirrors.
     """
     ctx.cd(utils.REPO_ROOT)
     mirrors_path = utils.REPO_ROOT / image
 
-    if exclude_platforms is None:
-        excludes = []
+    if build_platforms is None:
+        build_platforms = ["linux/amd64", "linux/arm64/v8"]
     else:
-        excludes = exclude_platforms.split(",")
+        build_platforms = build_platforms.split(",")
 
     for name, details in _get_containers():
         if details["path"] == image:
@@ -208,7 +202,7 @@ def matrix(ctx, image, from_workflow=False, multiarch=False, exclude_platforms=N
                 platform = "{os}/{architecture}".format(**entry["platform"])
                 if "variant" in entry["platform"]:
                     platform += f"/{entry['platform']['variant']}"
-                if platform in excludes:
+                if platform not in build_platforms:
                     continue
                 output.append(
                     {