Swap docker to e2e workflow

Signed-off-by: Derek Nola <derek.nola@suse.com>
dereknola · Mar 7, 2024 · 2be6bc6 · 2be6bc6
1 parent e30f760
commit 2be6bc6
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -26,8 +26,8 @@ permissions:
 jobs:
   build:
     uses: ./.github/workflows/build-k3s.yaml
-  test:
-    name: "E2E Test"
+  e2e:
+    name: "E2E Tests"
     needs: build
     runs-on: ubuntu-latest
     timeout-minutes: 40
@@ -64,7 +64,7 @@ jobs:
           name: k3s
           path: ./dist/artifacts
 
-      - name: Run E2E Tests
+      - name: Run ${{ matrix.etest }} Test
         env:
           E2E_GOCOVER: "true"
         run: | 
@@ -83,4 +83,29 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: tests/e2e/${{ matrix.etest }}/coverage.out
           flags: e2etests # optional
-          verbose: true # optional (default = false)
+          verbose: true # optional (default = false)
+  docker:
+    needs: build
+    name: Docker Tests
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        dtest: [basics, bootstraptoken, cacerts, compat, hardened, lazypull, upgrade]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+    - name: "Download k3s binary"
+      uses: actions/download-artifact@v4
+      with:
+        name: k3s
+        path: ./dist/artifacts
+    - name: Run ${{ matrix.dtest }} Test
+      run: | 
+        chmod +x ./dist/artifacts/k3s
+        . ./tests/docker/test-helpers
+        . ./tests/docker/test-run-${{ matrix.dtest }}
+        echo "Did test-run-${{ matrix.dtest }} pass $?"
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -71,29 +71,4 @@ jobs:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./${{ matrix.itest }}.out
         flags: inttests # optional
-        verbose: true # optional (default = false)
-  dtest:
-    needs: build
-    name: Docker Tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    strategy:
-      fail-fast: false
-      matrix:
-        dtest: [basics, bootstraptoken, cacerts, compat, hardened, lazypull, upgrade]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 1
-    - name: "Download k3s binary"
-      uses: actions/download-artifact@v4
-      with:
-        name: k3s
-        path: ./dist/artifacts
-    - name: Run Docker Test
-      run: | 
-        chmod +x ./dist/artifacts/k3s
-        . ./tests/docker/test-helpers
-        . ./tests/docker/test-run-${{ matrix.itest }}
-        echo "Did test-run-${{ matrix.itest }} pass $?"
+        verbose: true # optional (default = false)