Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Release-1.29] July Test Backports #10508

Merged
merged 2 commits into from
Jul 15, 2024
Merged

[Release-1.29] July Test Backports #10508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e9179b
Move test-compat to GHA (#10414)
dereknola Jul 9, 2024
34d85b4
For E2E upgrade test, automatically determine the channel to use (#10…
dereknola Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,13 @@ steps:
if [ "$DRONE_BUILD_EVENT" = "pull_request" ]; then
cd ../upgradecluster
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
fi
- docker stop registry && docker rm registry
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/e2e.yaml
View file
Open in desktop
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
View file
Open in desktop
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