fix: Add secret to Molecule GH Actions matrix

* And update matrix of supported platforms within `vars/main.yml`
nginxinc · Nov 20, 2024 · d743972 · d743972
1 parent cc6d48a
commit d743972
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -44,6 +44,7 @@ jobs:
       AMPLIFY_PASSWORD: ${{ secrets.AMPLIFY_PASSWORD }}
       NGINX_CRT: ${{ secrets.NGINX_CRT }}
       NGINX_KEY: ${{ secrets.NGINX_KEY }}
+      NGINX_JWT: ${{ secrets.NGINX_JWT }}
       ONE_API_TOKEN: ${{ secrets.ONE_API_TOKEN }}
       ONE_TENANT: ${{ secrets.ONE_TENANT }}
     strategy:

diff --git a/vars/main.yml b/vars/main.yml
@@ -59,7 +59,7 @@ nginx_supported_distributions:
     architectures: [x86_64]
   ubuntu:
     name: Ubuntu
-    versions: [20.04, 22.04, 23.10, 24.04]
+    versions: [20.04, 22.04, 24.04, 24.10]
     architectures: "{{ ['x86_64', 'aarch64', 's390x'] if ((ansible_facts['distribution_version'] is version('20.04', '==')) or (ansible_facts['distribution_version'] is version('22.04', '=='))) else ['x86_64', 'aarch64'] }}"
 
 # Supported NGINX Plus distributions
@@ -71,7 +71,7 @@ nginx_plus_supported_distributions:
     architectures: [x86_64, aarch64]
   alpine:
     name: Alpine Linux
-    versions: [3.16, 3.17, 3.18, 3.19]
+    versions: [3.17, 3.18, 3.19, 3.20]
     architectures: [x86_64, aarch64]
   amazon:
     name: Amazon Linux
@@ -83,7 +83,7 @@ nginx_plus_supported_distributions:
     architectures: [x86_64, aarch64]
   freebsd:
     name: FreeBSD
-    versions: [12, 13, 14]
+    versions: [13, 14]
     architectures: [x86_64]
   oraclelinux:
     name: Oracle Linux
@@ -92,7 +92,7 @@ nginx_plus_supported_distributions:
   redhat:
     name: Red Hat Enterprise Linux
     versions: [8, 9]
-    architectures: "{{ ['x86_64', 'aarch64', 's390x'] if (ansible_facts['distribution_major_version'] is version('8', '>=')) else ['x86_64', 'aarch64'] }}"
+    architectures: [x86_64, aarch64]
   rocky:
     name: Rocky Linux
     versions: [8, 9]