Make all E2E tests ordered

Signed-off-by: Derek Nola <derek.nola@suse.com>
This commit is contained in:
Derek Nola
2022-09-06 12:56:37 -07:00
parent c1be599d32
commit d51da881c8
7 changed files with 8 additions and 43 deletions

View File

@@ -34,40 +34,4 @@ 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

View File

@@ -32,7 +32,7 @@ var (
agentNodeNames []string
)
var _ = Describe("Verify CRI-Dockerd", func() {
var _ = Describe("Verify CRI-Dockerd", Ordered, func() {
Context("Cluster :", func() {
It("Starts up with no issues", func() {
var err error

View File

@@ -70,7 +70,7 @@ var (
agentNodeNames []string
)
var _ = Describe("Verify DualStack Configuration", func() {
var _ = Describe("Verify DualStack Configuration", Ordered, func() {
It("Starts up with no issues", func() {
var err error

View File

@@ -31,7 +31,7 @@ var (
serverNodeNames []string
)
var _ = Describe("Verify Secrets Encryption Rotation", func() {
var _ = Describe("Verify Secrets Encryption Rotation", Ordered, func() {
Context("Cluster :", func() {
It("Starts up with no issues", func() {
var err error

View File

@@ -70,7 +70,7 @@ var (
agentNodeNames []string
)
var _ = Describe("Verify Create", func() {
var _ = Describe("Verify Create", Ordered, func() {
Context("Cluster :", func() {
It("Starts up with no issues", func() {
var err error

View File

@@ -37,7 +37,7 @@ var (
agentNodeNames []string
)
var _ = Describe("Verify Upgrade", func() {
var _ = Describe("Verify Upgrade", Ordered, func() {
Context("Cluster :", func() {
It("Starts up with no issues", func() {
var err error

View File

@@ -19,6 +19,7 @@ var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system")
var serverCount = flag.Int("serverCount", 3, "number of server nodes")
var agentCount = flag.Int("agentCount", 2, "number of agent nodes")
var hardened = flag.Bool("hardened", false, "true or false")
var alwaysKill = flag.Bool("alwaysKill", false, "alaways destroy VMs even on test failure")
// Environment Variables Info:
// E2E_EXTERNAL_DB: mysql, postgres, etcd (default: etcd)
@@ -36,7 +37,7 @@ var (
agentNodeNames []string
)
var _ = Describe("Verify Create", func() {
var _ = Describe("Verify Create", Ordered, func() {
Context("Cluster :", func() {
It("Starts up with no issues", func() {
var err error
@@ -269,7 +270,7 @@ var _ = AfterEach(func() {
})
var _ = AfterSuite(func() {
if failed {
if failed && !*alwaysKill {
fmt.Println("FAILED!")
} else {
Expect(e2e.DestroyCluster()).To(Succeed())