Use action to handle testing

WyriHaximusNet · Feb 12, 2025 · f29db8d · f29db8d
1 parent d8d0db1
commit f29db8d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   supported-platform-matrix:
     name: Supported processor platforms
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       platform: ${{ steps.supported-platform-matrix.outputs.platform }}
     steps:
@@ -17,7 +17,7 @@ jobs:
         uses: WyriHaximus/github-action-oci-image-supported-platforms@main
   lint-dockerfile:
     name: Lint Dockerfile
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Lint Dockerfile
@@ -34,7 +34,7 @@ jobs:
     needs:
       - supported-platform-matrix
       - lint-dockerfile
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Prepare
         run: |
@@ -66,7 +66,7 @@ jobs:
     needs:
       - supported-platform-matrix
       - build-docker-image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Prepare
         run: |
@@ -89,7 +89,7 @@ jobs:
       fail-fast: false
       matrix:
         platform: ${{ fromJson(needs.supported-platform-matrix.outputs.platform) }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Prepare
         run: |
@@ -104,15 +104,18 @@ jobs:
           path: /tmp/docker-image
       - run: docker load --input /tmp/docker-image/docker_image-${{ env.PLATFORM_PAIR }}.tar
       - run: docker image ls -a
-      - run: ./tests.sh "${DOCKER_IMAGE}:${{ env.PLATFORM_PAIR }}"
+      - uses: WyriHaximus/github-action-testinfra@main
+        with:
+          image: ${{ env.DOCKER_IMAGE }}:${{ env.PLATFORM_PAIR }}
+          flags: --platform="${{ matrix.platform }}"
   push-image:
     if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main'
     name: Push
     needs:
       - supported-platform-matrix
       - scan-vulnerability
       - tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     services:
       registry:
         image: registry:2

diff --git a/Dockerfile b/Dockerfile
@@ -9,17 +9,21 @@ RUN (echo 'DPkg::Post-Invoke {"/bin/rm -f /var/cache/apt/archives/*.deb || true"
     apt-get update &&\
     apt-get upgrade -y &&\
     apt-get install -y curl wget make git unzip gnupg software-properties-common jq &&\
+
     ## TerraForm
     (wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor |  tee /usr/share/keyrings/hashicorp-archive-keyring.gpg > /dev/null) &&\
     gpg --no-default-keyring --keyring /usr/share/keyrings/hashicorp-archive-keyring.gpg --fingerprint &&\
     (echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/hashicorp.list) &&\
     apt-get update &&\
     apt-get install -y terraform &&\
+
     ## AWS CLI
     curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "/tmp/awscliv2.zip" &&\
     unzip /tmp/awscliv2.zip &&\
     ./aws/install &&\
     rm /tmp/* -Rf &&\
+
+    ## Helm
     curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 &&\
     chmod 700 get_helm.sh &&\
     ./get_helm.sh &&\