github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Release-1.29] July Test Backports (#10508) 

* Move test-compat to GHA (#10414)

Signed-off-by: Derek Nola <derek.nola@suse.com>

* For E2E upgrade test, automatically determine the channel to use (#10461)

Signed-off-by: Derek Nola <derek.nola@suse.com>
pull/10540/head
Derek Nola 2024-07-15 10:45:45 -07:00 committed by GitHub
parent 3f2e9e2cb9
commit 25dae66203
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.drone.yml
View File

@ -639,7 +639,13 @@ steps:
if [ "$DRONE_BUILD_EVENT" = "pull_request" ]; then if [ "$DRONE_BUILD_EVENT" = "pull_request" ]; then
cd ../upgradecluster cd ../upgradecluster
vagrant destroy -f vagrant destroy -f
go test -v -timeout=45m ./upgradecluster_test.go -ci -local # Convert release-1.XX branch to v1.XX channel
if [ "$DRONE_BRANCH" = "master" ]; then
UPGRADE_CHANNEL="latest"
else
UPGRADE_CHANNEL=$(echo $DRONE_BRANCH | sed 's/release-/v/')
fi
E2E_RELEASE_CHANNEL=$UPGRADE_CHANNEL go test -v -timeout=45m ./upgradecluster_test.go -ci -local
cp ./coverage.out /tmp/artifacts/upgrade-coverage.out cp ./coverage.out /tmp/artifacts/upgrade-coverage.out
fi fi
- docker stop registry && docker rm registry - docker stop registry && docker rm registry

5
.github/workflows/e2e.yaml vendored
View File

@ -7,6 +7,7 @@ on:
- "install.sh" - "install.sh"
- "tests/**" - "tests/**"
- "!tests/e2e**" - "!tests/e2e**"
- "!tests/docker**"
- ".github/**" - ".github/**"
- "!.github/workflows/e2e.yaml" - "!.github/workflows/e2e.yaml"
pull_request: pull_request:
@ -16,6 +17,7 @@ on:
- "install.sh" - "install.sh"
- "tests/**" - "tests/**"
- "!tests/e2e**" - "!tests/e2e**"
- "!tests/docker**"
- ".github/**" - ".github/**"
- "!.github/workflows/e2e.yaml" - "!.github/workflows/e2e.yaml"
workflow_dispatch: {} workflow_dispatch: {}
@ -97,7 +99,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
dtest: [basics, bootstraptoken, cacerts, lazypull, upgrade] dtest: [basics, bootstraptoken, cacerts, compat, lazypull, upgrade]
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -113,6 +115,7 @@ jobs:
- name: Run ${{ matrix.dtest }} Test - name: Run ${{ matrix.dtest }} Test
run: | run: |
chmod +x ./dist/artifacts/k3s chmod +x ./dist/artifacts/k3s
. ./scripts/version.sh
. ./tests/docker/test-helpers . ./tests/docker/test-helpers
. ./tests/docker/test-run-${{ matrix.dtest }} . ./tests/docker/test-run-${{ matrix.dtest }}
echo "Did test-run-${{ matrix.dtest }} pass $?" echo "Did test-run-${{ matrix.dtest }} pass $?"

6
scripts/test
View File

@ -29,6 +29,9 @@ if [ "$ARCH" != 'amd64' ]; then
. ./tests/docker/test-run-cacerts . ./tests/docker/test-run-cacerts
echo "Did test-run-cacerts $?" echo "Did test-run-cacerts $?"
. ./tests/docker/test-run-compat
echo "Did test-run-compat $?"
. ./tests/docker/test-run-bootstraptoken . ./tests/docker/test-run-bootstraptoken
echo "Did test-run-bootstraptoken $?" echo "Did test-run-bootstraptoken $?"
@ -39,8 +42,7 @@ if [ "$ARCH" != 'amd64' ]; then
echo "Did test-run-lazypull $?" echo "Did test-run-lazypull $?"
fi fi
. ./tests/docker/test-run-compat
echo "Did test-run-compat $?"
. ./tests/docker/test-run-hardened . ./tests/docker/test-run-hardened
echo "Did test-run-hardened $?" echo "Did test-run-hardened $?"