Skip to content

Commit

Permalink
Move test-compat to GHA (k3s-io#10414)
Browse files Browse the repository at this point in the history
Signed-off-by: Derek Nola <[email protected]>
  • Loading branch information
dereknola committed Jul 12, 2024
1 parent b4b156d commit 2e9179b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- "install.sh"
- "tests/**"
- "!tests/e2e**"
- "!tests/docker**"
- ".github/**"
- "!.github/workflows/e2e.yaml"
pull_request:
Expand All @@ -16,6 +17,7 @@ on:
- "install.sh"
- "tests/**"
- "!tests/e2e**"
- "!tests/docker**"
- ".github/**"
- "!.github/workflows/e2e.yaml"
workflow_dispatch: {}
Expand Down Expand Up @@ -97,7 +99,7 @@ jobs:
strategy:
fail-fast: false
matrix:
dtest: [basics, bootstraptoken, cacerts, lazypull, upgrade]
dtest: [basics, bootstraptoken, cacerts, compat, lazypull, upgrade]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -113,6 +115,7 @@ jobs:
- name: Run ${{ matrix.dtest }} Test
run: |
chmod +x ./dist/artifacts/k3s
. ./scripts/version.sh
. ./tests/docker/test-helpers
. ./tests/docker/test-run-${{ matrix.dtest }}
echo "Did test-run-${{ matrix.dtest }} pass $?"
6 changes: 4 additions & 2 deletions scripts/test
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ if [ "$ARCH" != 'amd64' ]; then
. ./tests/docker/test-run-cacerts
echo "Did test-run-cacerts $?"

. ./tests/docker/test-run-compat
echo "Did test-run-compat $?"

. ./tests/docker/test-run-bootstraptoken
echo "Did test-run-bootstraptoken $?"

Expand All @@ -39,8 +42,7 @@ if [ "$ARCH" != 'amd64' ]; then
echo "Did test-run-lazypull $?"
fi

. ./tests/docker/test-run-compat
echo "Did test-run-compat $?"


. ./tests/docker/test-run-hardened
echo "Did test-run-hardened $?"
Expand Down

0 comments on commit 2e9179b

Please sign in to comment.