Integrate Autopilot tests into the shared smoke tests

Downloading the k0s release was the only difference. Add an optional input for that. Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
twz123 · Jun 27, 2024 · 399723b · 399723b
1 parent 5a83ff7
commit 399723b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 47 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -219,55 +219,13 @@ jobs:
       matrix:
         version: ${{fromJson(needs.prepare.outputs.autopilot-matrix)}}
 
-    name: "Autopilot tests :: ${{ matrix.version }}"
+    name: "Autopilot test :: ${{ matrix.version }}"
     needs: [prepare, build-k0s]
-    runs-on: ubuntu-22.04
-
-    env:
-      K0S_VERSION: ${{ matrix.version }}
-
-    steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-
-      - name: Reclaim runner disk space
-        run: .github/workflows/reclaim-runner-disk-space.bash
-
-      - name: Prepare build environment
-        run: .github/workflows/prepare-build-env.sh
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - name: Download compiled executable
-        uses: actions/download-artifact@v4
-        with:
-          name: k0s-linux-amd64
 
-      - name: Download latest release
-        run: |
-          curl -L -o "k0s-$K0S_VERSION" "https://github.com/k0sproject/k0s/releases/download/$K0S_VERSION/k0s-$K0S_VERSION-amd64"
-          chmod +x "k0s-$K0S_VERSION"
-
-      - name: k0s sysinfo
-        run: |
-          chmod +x k0s
-          ./k0s sysinfo
-
-      - name: Run inttest
-        run: |
-          make -C inttest check-ap-ha3x3 K0S_UPDATE_FROM_BIN="../k0s-$K0S_VERSION"
-
-      - name: Collect k0s logs and support bundle
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: autopilot-tests-${{ matrix.version }}-files
-          path: |
-            /tmp/*.log
-            /tmp/support-bundle.tar.gz
+    uses: ./.github/workflows/smoketest.yaml
+    with:
+      name: ap-ha3x3
+      k0s-reference-version: ${{ matrix.version }}
 
   smoketest-arm:
     name: Smoke test on armv7/arm64

diff --git a/.github/workflows/smoketest.yaml b/.github/workflows/smoketest.yaml
@@ -10,6 +10,11 @@ on:
         type: string
         required: true
         description: The integration test name to be executed.
+      k0s-reference-version:
+        type: string
+        description: |
+          The k0s release version to be used as a reference.
+          Mostly used for Autopilot upgrade checks.
 
 permissions:
   contents: read
@@ -57,9 +62,21 @@ jobs:
         with:
           name: airgap-image-bundle-linux-amd64
 
+      - name: Download k0s reference release
+        id: download-k0s-reference-release
+        if: inputs.k0s-reference-version != ''
+        env:
+          K0S_VERSION: ${{ inputs.k0s-reference-version }}
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSLo "k0s-$K0S_VERSION" --retry 5 --retry-all-errors "https://github.com/k0sproject/k0s/releases/download/$K0S_VERSION/k0s-$K0S_VERSION-amd64"
+          chmod +x "k0s-$K0S_VERSION"
+          k0sRealPath="$(realpath "k0s-$K0S_VERSION")"
+          echo "path=$k0sRealPath" >>$GITHUB_OUTPUT
+
       - name: Run inttest
         env:
           SMOKETEST_NAME: check-${{ inputs.name }}
+          K0S_UPDATE_FROM_PATH: ${{ steps.download-k0s-reference-release.outputs.path }}
         run: make -C inttest "$SMOKETEST_NAME"
 
       - name: Collect k0s logs, support bundle and conformance test results