mirror of
https://github.com/k3s-io/k3s.git
synced 2024-06-07 19:41:36 +00:00
Replaced deprecated Ginkgo reporting
Signed-off-by: Derek Nola <derek.nola@suse.com>
This commit is contained in:
parent
a43c948e01
commit
14e606b2ef
36
scripts/test
36
scripts/test
@ -34,4 +34,40 @@ echo "Did test-run-lazypull $?"
|
|||||||
E2E_OUTPUT=$artifacts test-run-sonobuoy serial
|
E2E_OUTPUT=$artifacts test-run-sonobuoy serial
|
||||||
echo "Did 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
|
exit 0
|
||||||
|
@ -201,7 +201,7 @@ var _ = Describe("Verify DualStack Configuration", Ordered, func() {
|
|||||||
|
|
||||||
var failed bool
|
var failed bool
|
||||||
var _ = AfterEach(func() {
|
var _ = AfterEach(func() {
|
||||||
failed = failed || CurrentGinkgoTestDescription().Failed
|
failed = failed || CurrentSpecReport().Failed()
|
||||||
})
|
})
|
||||||
|
|
||||||
var _ = AfterSuite(func() {
|
var _ = AfterSuite(func() {
|
||||||
|
@ -221,7 +221,7 @@ var _ = Describe("Verify Create", Ordered, func() {
|
|||||||
|
|
||||||
var failed = false
|
var failed = false
|
||||||
var _ = AfterEach(func() {
|
var _ = AfterEach(func() {
|
||||||
failed = failed || CurrentGinkgoTestDescription().Failed
|
failed = failed || CurrentSpecReport().Failed()
|
||||||
})
|
})
|
||||||
|
|
||||||
var _ = AfterSuite(func() {
|
var _ = AfterSuite(func() {
|
||||||
|
@ -375,7 +375,7 @@ var _ = Describe("Verify Upgrade", Ordered, func() {
|
|||||||
|
|
||||||
var failed = false
|
var failed = false
|
||||||
var _ = AfterEach(func() {
|
var _ = AfterEach(func() {
|
||||||
failed = failed || CurrentGinkgoTestDescription().Failed
|
failed = failed || CurrentSpecReport().Failed()
|
||||||
})
|
})
|
||||||
|
|
||||||
var _ = AfterSuite(func() {
|
var _ = AfterSuite(func() {
|
||||||
|
Loading…
Reference in New Issue
Block a user