Add ARM tests for all distros

Kong · Jan 23, 2024 · d1d17ba · d1d17ba
1 parent de86d46
commit d1d17ba
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 22 deletions.
diff --git a/tools/install-tester/config/jobs.yaml b/tools/install-tester/config/jobs.yaml
@@ -1,29 +1,23 @@
 - match:
-    version: "3\\..*"
-    package:
-      - oss
-      - enterprise
-  distros:
-    - amazon-linux
-  arch:
-    - linux/amd64
-  outputs:
-    oss: "{{ version }}"
-    enterprise: "Kong Enterprise {{ version }}"
-
-- match:
-    version: "3\\..*"
+    version: "3\\.[2-99]\\.*"
     package:
       - enterprise
   distros:
     - amazon-linux
+    - ubuntu
+    - debian
+    - rhel
+  skip:
+    - 3.2.x/debian/enterprise/package
+    - 3.2.x/debian/enterprise/repository
+    - 3.3.x/debian/enterprise/package
+    - 3.3.x/debian/enterprise/repository
+    - 3.2.x/rhel/enterprise/package
+    - 3.2.x/rhel/enterprise/repository
+    - 3.3.x/rhel/enterprise/package
+    - 3.3.x/rhel/enterprise/repository
   arch:
     - linux/arm64
-  skip:
-    - 3.0.x/amazon-linux/enterprise/package
-    - 3.0.x/amazon-linux/enterprise/repository
-    - 3.1.x/amazon-linux/enterprise/package
-    - 3.1.x/amazon-linux/enterprise/repository
   outputs:
     enterprise: "Kong Enterprise {{ version }}"
 
@@ -33,6 +27,7 @@
       - oss
       - enterprise
   distros:
+    - amazon-linux
     - ubuntu
     - rhel
     - debian

diff --git a/tools/install-tester/config/setup.yaml b/tools/install-tester/config/setup.yaml
@@ -15,9 +15,9 @@ debian:
     - usermod -aG sudo tester
     - "echo 'ALL            ALL = (ALL) NOPASSWD: ALL' > /etc/sudoers.d/tester"
 rhel:
-  image: "registry.access.redhat.com/ubi7/ubi-init:latest"
+  image: "registry.access.redhat.com/ubi9/ubi-init:latest"
   setup:
-    - yum install -y curl gpg sudo
+    - yum install -y gpg sudo
     - useradd tester -m -p password
     - "echo 'ALL            ALL = (ALL) NOPASSWD: ALL' > /etc/sudoers.d/tester"
 amazon-linux:

diff --git a/tools/install-tester/index.js b/tools/install-tester/index.js
@@ -120,7 +120,7 @@ async function runSingleJob(distro, job, arch, installOption, conditions) {
     // Create a file to re-run the command in one + debug
     fs.writeFileSync(
       `./output/${job.version}-${distro}-${installOption.package}-${installOption.type}.txt`,
-      `docker run --platform linux/amd64 -it ${
+      `docker run --platform ${arch} -it ${
         jobConfig.image
       } bash -c "${jobConfig.commands
         .replace(/"/g, '\\"')