refactor base image generation on main CI flow (#5187)

nginxinc · Feb 29, 2024 · 2c30dc3 · 2c30dc3
1 parent ddaea41
commit 2c30dc3
Show file tree

Hide file tree

Showing 4 changed files with 188 additions and 84 deletions.
diff --git a/.github/data/matrix-regression.json b/.github/data/matrix-regression.json
@@ -3,11 +3,15 @@
   "images": [
     {
       "label": "regression",
-      "image": "debian"
+      "image": "debian",
+      "type": "oss",
+      "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
     },
     {
       "label": "regression",
-      "image": "debian-plus"
+      "image": "debian-plus",
+      "type": "plus",
+      "platforms": "linux/arm64, linux/amd64"
     }
   ]
 }
diff --git a/.github/data/matrix-smoke.json b/.github/data/matrix-smoke.json
@@ -3,122 +3,176 @@
     {
       "label": "ingresses 1/2",
       "image": "debian",
-      "marker": "'ingresses and not annotations and not basic_auth and not hsts and not watch_namespace and not wildcard_tls'"
+      "type": "oss",
+      "marker": "'ingresses and not annotations and not basic_auth and not hsts and not watch_namespace and not wildcard_tls'",
+      "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
     },
     {
       "label": "ingresses 2/2",
       "image": "debian",
-      "marker": "'annotations or basic_auth or hsts or watch_namespace or wildcard_tls'"
+      "type": "oss",
+      "marker": "'annotations or basic_auth or hsts or watch_namespace or wildcard_tls'",
+      "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
     },
     {
       "label": "VSR",
       "image": "alpine",
-      "marker": "vsr"
+      "type": "oss",
+      "marker": "vsr",
+      "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
     },
     {
       "label": "policies 1/2",
       "image": "alpine",
-      "marker": "'policies and not policies_rl and not policies_ac and not policies_jwt and not policies_mtls'"
+      "type": "oss",
+      "marker": "'policies and not policies_rl and not policies_ac and not policies_jwt and not policies_mtls'",
+      "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
     },
     {
       "label": "policies 2/2",
       "image": "alpine",
-      "marker": "'policies_rl or policies_ac or policies_jwt or policies_mtls'"
+      "type": "oss",
+      "marker": "'policies_rl or policies_ac or policies_jwt or policies_mtls'",
+      "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
     },
     {
       "label": "VS 1/3",
       "image": "debian",
-      "marker": "'vs and not vs_ipv6 and not vs_rewrite and not vs_responses and not vs_grpc and not vs_redirects and not vs_externalname and not vs_externaldns and not vs_certmanager'"
+      "type": "oss",
+      "marker": "'vs and not vs_ipv6 and not vs_rewrite and not vs_responses and not vs_grpc and not vs_redirects and not vs_externalname and not vs_externaldns and not vs_certmanager'",
+      "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
     },
     {
       "label": "VS 2/3",
       "image": "debian",
-      "marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns'"
+      "type": "oss",
+      "marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns'",
+      "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
     },
     {
       "label": "VS 3/3",
       "image": "debian",
-      "marker": "'vs_responses or vs_ipv6 or vs_rewrite or vs_certmanager'"
+      "type": "oss",
+      "marker": "'vs_responses or vs_ipv6 or vs_rewrite or vs_certmanager'",
+      "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
     },
     {
       "label": "TS",
       "image": "ubi",
-      "marker": "ts"
+      "type": "oss",
+      "marker": "ts",
+      "platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
     },
     {
       "label": "VS 1/3",
       "image": "debian-plus",
-      "marker": "'vs and not vs_ipv6 and not vs_rewrite and not vs_responses and not vs_grpc and not vs_redirects and not vs_externalname and not vs_externaldns and not vs_certmanager'"
+      "type": "plus",
+      "marker": "'vs and not vs_ipv6 and not vs_rewrite and not vs_responses and not vs_grpc and not vs_redirects and not vs_externalname and not vs_externaldns and not vs_certmanager'",
+      "platforms": "linux/arm64, linux/amd64"
     },
     {
       "label": "VS 2/3",
       "image": "debian-plus",
-      "marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns'"
+      "type": "plus",
+      "marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns'",
+      "platforms": "linux/arm64, linux/amd64"
     },
     {
       "label": "VS 3/3",
       "image": "debian-plus",
-      "marker": "'vs_responses or vs_ipv6 or vs_rewrite or vs_certmanager'"
+      "type": "plus",
+      "marker": "'vs_responses or vs_ipv6 or vs_rewrite or vs_certmanager'",
+      "platforms": "linux/arm64, linux/amd64"
     },
     {
       "label": "TS",
       "image": "debian-plus",
-      "marker": "ts"
+      "type": "plus",
+      "marker": "ts",
+      "platforms": "linux/arm64, linux/amd64"
     },
     {
       "label": "ingresses 1/2",
       "image": "alpine-plus",
-      "marker": "'ingresses and not annotations and not basic_auth and not hsts and not watch_namespace and not wildcard_tls'"
+      "type": "plus",
+      "marker": "'ingresses and not annotations and not basic_auth and not hsts and not watch_namespace and not wildcard_tls'",
+      "platforms": "linux/arm64, linux/amd64"
     },
     {
       "label": "ingresses 2/2",
       "image": "alpine-plus",
-      "marker": "'annotations or basic_auth or hsts or watch_namespace or wildcard_tls'"
+      "type": "plus",
+      "marker": "'annotations or basic_auth or hsts or watch_namespace or wildcard_tls'",
+      "platforms": "linux/arm64, linux/amd64"
     },
     {
       "label": "VSR",
       "image": "alpine-plus",
-      "marker": "vsr"
+      "type": "plus",
+      "marker": "vsr",
+      "platforms": "linux/arm64, linux/amd64"
     },
     {
       "label": "policies 1/2",
       "image": "ubi-plus",
-      "marker": "'policies and not policies_ac and not policies_jwt and not policies_mtls'"
+      "type": "plus",
+      "marker": "'policies and not policies_ac and not policies_jwt and not policies_mtls'",
+      "platforms": "linux/arm64, linux/amd64, linux/s390x"
     },
     {
       "label": "policies 2/2",
       "image": "ubi-plus",
-      "marker": "'policies_ac or policies_jwt or policies_mtls'"
+      "type": "plus",
+      "marker": "'policies_ac or policies_jwt or policies_mtls'",
+      "platforms": "linux/arm64, linux/amd64, linux/s390x"
     },
     {
       "label": "AP_WAF 1/4",
       "image": "ubi-9-plus-nap",
-      "marker": "appprotect_waf_policies_allow"
+      "type": "plus",
+      "nap_modules": "waf",
+      "marker": "appprotect_waf_policies_allow",
+      "platforms": "linux/amd64"
     },
     {
       "label": "AP_WAF 2/4",
       "image": "alpine-plus-nap-fips",
-      "marker": "'appprotect_waf_policies and not appprotect_waf_policies_allow'"
+      "type": "plus",
+      "nap_modules": "waf",
+      "marker": "'appprotect_waf_policies and not appprotect_waf_policies_allow'",
+      "platforms": "linux/amd64"
     },
     {
       "label": "AP_WAF 3/4",
       "image": "debian-plus-nap",
-      "marker": "appprotect_waf_policies_grpc"
+      "type": "plus",
+      "nap_modules": "waf",
+      "marker": "appprotect_waf_policies_grpc",
+      "platforms": "linux/amd64"
     },
     {
       "label": "AP_WAF 4/4",
       "image": "debian-plus-nap",
-      "marker": "'appprotect_watch or appprotect_batch or appprotect_integration'"
+      "type": "plus",
+      "nap_modules": "waf",
+      "marker": "'appprotect_watch or appprotect_batch or appprotect_integration'",
+      "platforms": "linux/amd64"
     },
     {
       "label": "AP_DOS",
       "image": "debian-plus-nap",
-      "marker": "'dos and not dos_learning'"
+      "type": "plus",
+      "nap_modules": "dos",
+      "marker": "'dos and not dos_learning'",
+      "platforms": "linux/amd64"
     },
     {
       "label": "AP_DOS_Learning",
       "image": "ubi-8-plus-nap",
-      "marker": "dos_learning"
+      "type": "plus",
+      "nap_modules": "dos",
+      "marker": "dos_learning",
+      "platforms": "linux/amd64"
     }
   ],
   "k8s": []

diff --git a/.github/workflows/build-base-images.yml b/.github/workflows/build-base-images.yml
@@ -127,7 +127,7 @@ jobs:
       - name: Setup QEMU
         uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
         with:
-          platforms: arm,arm64,ppc64le,s390x
+          platforms: arm64,s390x
 
       - name: Authenticate to Google Cloud
         id: auth
@@ -204,11 +204,6 @@ jobs:
       - name: Docker Buildx
         uses: docker/setup-buildx-action@0d103c3126aa41d772a8362f6aa67afac040f80c # v3.1.0
 
-      - name: Setup QEMU
-        uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
-        with:
-          platforms: arm,arm64,ppc64le,s390x
-
       - name: Authenticate to Google Cloud
         id: auth
         uses: google-github-actions/auth@55bd3a7c6e2ae7cf1877fd1ccb9d54c0503c457c # v2.1.2