-
Notifications
You must be signed in to change notification settings - Fork 275
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Release-1.28] Backport missing E2E PRs (#7206)
* Refactor run_tests.sh script (#6280) * Improve run_tests script Signed-off-by: Manuel Buil <[email protected]> * Upgrade tests to ubuntu2310 and use nodeOS var Signed-off-by: Manuel Buil <[email protected]> --------- Signed-off-by: Manuel Buil <[email protected]> * Update vagrant OS boxes Signed-off-by: Derek Nola <[email protected]> * Add cleanup to e2e tests in vagrant env (#6961) Signed-off-by: ShylajaDevadiga <[email protected]> * Remove dereknola debug action Signed-off-by: Derek Nola <[email protected]> --------- Signed-off-by: Manuel Buil <[email protected]> Signed-off-by: Derek Nola <[email protected]> Signed-off-by: ShylajaDevadiga <[email protected]> Co-authored-by: Manuel Buil <[email protected]> Co-authored-by: Shylaja Devadiga <[email protected]>
- Loading branch information
3 people
authored
Nov 7, 2024
1 parent
2699795
commit 41898fa
Showing
29 changed files
with
109 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -109,13 +109,6 @@ jobs: | |
| - name: On Failure, Dump Server Logs | ||
| if: ${{ failure() }} | ||
| run: cat ./tests/integration/${{ matrix.itest }}/r2log.txt | ||
| - name: On Failure, Launch Debug Session | ||
| uses: dereknola/[email protected] | ||
| if: ${{ failure() }} | ||
| with: | ||
| ## If no one connects after 5 minutes, shut down server. | ||
| wait-timeout-minutes: 5 | ||
| limit-access-to-actor: true | ||
|
|
||
| e2e: | ||
| name: "E2E Tests" | ||
|
|
@@ -168,11 +161,4 @@ jobs: | |
| - name: Run ${{ matrix.etest }} Test | ||
| run: | | ||
| cd tests/e2e/${{ matrix.etest }} | ||
| go test -v -timeout=45m ./${{ matrix.etest}}_test.go -ci -local | ||
| - name: On Failure, Launch Debug Session | ||
| uses: dereknola/[email protected] | ||
| if: ${{ failure() }} | ||
| with: | ||
| ## If no one connects after 5 minutes, shut down server. | ||
| wait-timeout-minutes: 5 | ||
| limit-access-to-actor: true | ||
| go test -v -timeout=45m ./${{ matrix.etest}}_test.go -ci -local | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,81 @@ | ||
| #!/bin/bash | ||
| nodeOS=${1:-"generic/ubuntu2004"} | ||
| servercount=${2:-3} | ||
| agentcount=${3:-1} | ||
| db=${4:-"etcd"} | ||
| hardened=${5:-""} | ||
| rke2_version=${rke2_version} | ||
| rke2_channel=${rke2_channel:-"commit"} | ||
|
|
||
| E2E_EXTERNAL_DB=$db && export E2E_EXTERNAL_DB | ||
| E2E_REGISTRY=true && export E2E_REGISTRY | ||
|
|
||
| cd | ||
| cd rke2 && git pull --rebase origin master | ||
| /usr/local/go/bin/go mod tidy | ||
| # Usage: ./run_tests.sh | ||
| # This script runs all the rke2 e2e tests and generates a report with the log | ||
| # The generated log is placed in createreport/rke2_${OS}.log | ||
| # | ||
| # This script must be run inside the rke2 directory where the tests exist | ||
| # | ||
| # Example: | ||
| # To run the script with default settings: | ||
| # ./run_tests.sh | ||
| # | ||
| set -x | ||
|
|
||
| cd tests/e2e | ||
| # tests to run | ||
| tests=("ciliumnokp" "dnscache" "dualstack" "mixedos" "mixedosbgp" "multus" "secretsencryption" "splitserver" "upgradecluster" "validatecluster") | ||
| nodeOS=${1:-"bento/ubuntu-24.04"} | ||
| OS=$(echo "$nodeOS"|cut -d'/' -f2) | ||
| echo "$OS" | ||
|
|
||
| E2E_REGISTRY=true && export E2E_REGISTRY | ||
| cd rke2 | ||
| git pull --rebase origin master | ||
| /usr/local/go/bin/go mod tidy | ||
| cd tests/e2e | ||
| # create directory to store reports if it does not exists | ||
| if [ ! -d createreport ] | ||
| then | ||
| mkdir createreport | ||
| fi | ||
|
|
||
| count=0 | ||
| run_tests(){ | ||
| count=$(( count + 1 )) | ||
| vagrant global-status | awk '/running/'|cut -c1-7| xargs -r -d '\n' -n 1 -- vagrant destroy -f | ||
| cleanup() { | ||
| for net in $(virsh net-list --all | tail -n +2 | tr -s ' ' | cut -d ' ' -f2 | grep -v default); do | ||
| virsh net-destroy "$net" | ||
| virsh net-undefine "$net" | ||
| done | ||
|
|
||
| E2E_RELEASE_VERSION=$rke2_version && export E2E_RELEASE_VERSION | ||
| E2E_RELEASE_CHANNEL=$rke2_channel && export E2E_RELEASE_CHANNEL | ||
| for domain in $(virsh list --all | tail -n +2 | tr -s ' ' | cut -d ' ' -f3); do | ||
| virsh destroy "$domain" | ||
| virsh undefine "$domain" --remove-all-storage | ||
| done | ||
|
|
||
| for vm in `vagrant global-status |tr -s ' '|tail +3 |grep "/" |cut -d ' ' -f5`; do | ||
| cd $vm | ||
| vagrant destroy -f | ||
| cd .. | ||
| done | ||
| } | ||
|
|
||
| echo 'RUNNING CLUSTER UPGRADE TEST' | ||
| E2E_REGISTRY=true /usr/local/go/bin/go test -v ./upgradecluster/upgradecluster_test.go -nodeOS="$nodeOS" -serverCount=$((servercount)) -agentCount=$((agentcount)) -timeout=1h -json -ci |tee createreport/rke2_"$OS".log | ||
|
|
||
| echo 'RUNNING DUALSTACK VALIDATION TEST' | ||
| E2E_HARDENED="$hardened" /usr/local/go/bin/go test -v dualstack/dualstack_test.go -nodeOS="$nodeOS" -serverCount=1 -agentCount=1 -timeout=30m -json -ci |tee -a createreport/rke2_"$OS".log | ||
| # Remove VMs which are in invalid state | ||
| vagrant global-status --prune | ||
|
|
||
| count=0 | ||
| run_tests(){ | ||
|
|
||
| echo 'RUNNING CLUSTER VALIDATION TEST' | ||
| E2E_REGISTRY=true E2E_HARDENED="$hardened" /usr/local/go/bin/go test -v validatecluster/validatecluster_test.go -nodeOS="$nodeOS" -serverCount=$((servercount)) -agentCount=$((agentcount)) -timeout=30m -json -ci |tee -a createreport/rke2_"$OS".log | ||
| count=$(( count + 1 )) | ||
| rm createreport/rke2_${OS}.log 2>/dev/null | ||
|
|
||
| echo 'RUNNING MIXEDOS TEST' | ||
| /usr/local/go/bin/go test -v mixedos/mixedos_test.go -nodeOS="$nodeOS" -serverCount=$((servercount)) -timeout=1h -json -ci |tee -a createreport/rke2_"$OS".log | ||
| for i in ${!tests[@]}; do | ||
| pushd ${tests[$i]} | ||
| vagrant destroy -f | ||
|
|
||
| echo 'RUNNING SPLIT SERVER VALIDATION TEST' | ||
| E2E_HARDENED="$hardened" /usr/local/go/bin/go test -v splitserver/splitserver_test.go -nodeOS="$nodeOS" -timeout=30m -json -ci |tee -a createreport/rke2_"$OS".log | ||
| echo "RUNNING ${tests[$i]} TEST" | ||
| /usr/local/go/bin/go test -v ${tests[$i]}_test.go -timeout=2h -nodeOS="$nodeOS" -json -ci |tee -a ../createreport/rke2_${OS}.log | ||
|
|
||
| popd | ||
| done | ||
| } | ||
|
|
||
| ls createreport/rke2_"$OS".log 2>/dev/null && rm createreport/rke2_"$OS".log | ||
| ls createreport/rke2_${OS}.log 2>/dev/null && rm createreport/rke2_${OS}.log | ||
| cleanup | ||
| run_tests | ||
|
|
||
| # re-run test if first run fails and keep record of repeatedly failed test to debug | ||
| while [ -f createreport/rke2_"$OS".log ] && grep -w ":fail" createreport/rke2_"$OS".log && [ $count -le 2 ] | ||
| while [ -f createreport/rke2_${OS}.log ] && grep -w " FAIL:" createreport/rke2_${OS}.log && [ $count -le 2 ] | ||
| do | ||
| cp createreport/rke2_"$OS".log createreport/rke2_"$OS"_"$count".log | ||
| cp createreport/rke2_${OS}.log createreport/rke2_${OS}_${count}.log | ||
| run_tests | ||
| done | ||
|
|
||
| # Generate report and upload to s3 bucket | ||
| cd createreport && /usr/local/go/bin/go run -v report-template-bindata.go generate_report.go -f rke2_"OS".log | ||
| cd createreport && /usr/local/go/bin/go run -v report-template-bindata.go generate_report.go -f rke2_${OS}.log |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.