Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced deprecated Ginkgo reporting

Browse Source 
Signed-off-by: Derek Nola <derek.nola@suse.com>
This commit is contained in:
Derek Nola 2022-09-13 14:09:28 -07:00
parent a43c948e01
commit 14e606b2ef
4 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/test
View File

@ -34,4 +34,40 @@ echo "Did test-run-lazypull $?"
E2E_OUTPUT=$artifacts test-run-sonobuoy serial
echo "Did test-run-sonobuoy serial $?"
# ---
if [ "$DRONE_BUILD_EVENT" = 'tag' ]; then
E2E_OUTPUT=$artifacts test-run-sonobuoy parallel
echo "Did test-run-sonobuoy parallel $?"
early-exit 'Skipping remaining tests on tag.'
fi
# ---
test-run-sonobuoy etcd serial
echo "Did test-run-sonobuoy-etcd serial $?"
test-run-sonobuoy mysql serial
echo "Did test-run-sonobuoy-mysqk serial $?"
test-run-sonobuoy postgres serial
echo "Did test-run-sonobuoy-postgres serial $?"
# Wait until all serial tests have finished
delay=15
(
set +x
while [ $(count-running-tests) -ge 1 ]; do
sleep $delay
done
)
E2E_OUTPUT=$artifacts test-run-sonobuoy parallel
echo "Did test-run-sonobuoy parallel $?"
test-run-sonobuoy etcd parallel
echo "Did test-run-sonobuoy-etcd parallel $?"
test-run-sonobuoy mysql parallel
echo "Did test-run-sonobuoy-mysql parallel $?"
test-run-sonobuoy postgres parallel
echo "Did test-run-sonobuoy-postgres parallel $?"
exit 0

2
tests/e2e/dualstack/dualstack_test.go
View File

@ -201,7 +201,7 @@ var _ = Describe("Verify DualStack Configuration", Ordered, func() {
var failed bool
var _ = AfterEach(func() {
failed = failed || CurrentGinkgoTestDescription().Failed
failed = failed || CurrentSpecReport().Failed()
})
var _ = AfterSuite(func() {

2
tests/e2e/splitserver/splitserver_test.go
View File

@ -221,7 +221,7 @@ var _ = Describe("Verify Create", Ordered, func() {
var failed = false
var _ = AfterEach(func() {
failed = failed || CurrentGinkgoTestDescription().Failed
failed = failed || CurrentSpecReport().Failed()
})
var _ = AfterSuite(func() {

2
tests/e2e/upgradecluster/upgradecluster_test.go
View File

@ -375,7 +375,7 @@ var _ = Describe("Verify Upgrade", Ordered, func() {
var failed = false
var _ = AfterEach(func() {
failed = failed || CurrentGinkgoTestDescription().Failed
failed = failed || CurrentSpecReport().Failed()
})
var _ = AfterSuite(func() {