diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index f024c34dbd58..85a1ccc2e64e 100644 --- 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) \ No newline at end of file + 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 $?" \ No newline at end of file diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 87b5703e85d3..2cde5fc0a9c1 100644 --- 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 $?" \ No newline at end of file + verbose: true # optional (default = false) \ No newline at end of file