From bffe21e3681f54184c4dcf1f54bdac58cb889815 Mon Sep 17 00:00:00 2001 From: Radim Hrazdil Date: Tue, 23 Mar 2021 10:51:44 +0100 Subject: [PATCH] Consolidate parallel and sequential lanes Run the e2e handler test lane only once, configured to use default 50% of worker nodes to process NNCPs concurrently. For that reason, setting number of nodes to 5 so that 2 nodes run concurrently (4/2 == 2) Signed-off-by: Radim Hrazdil --- automation/check-patch.e2e-k8s.sh | 7 +------ test/e2e/handler/nnce_conditions_test.go | 4 ++-- test/e2e/handler/nncp_parallel_test.go | 4 ++-- test/e2e/handler/webhook_test.go | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/automation/check-patch.e2e-k8s.sh b/automation/check-patch.e2e-k8s.sh index eec08672a..b8c383da3 100755 --- a/automation/check-patch.e2e-k8s.sh +++ b/automation/check-patch.e2e-k8s.sh @@ -16,7 +16,7 @@ teardown() { } main() { - export KUBEVIRT_NUM_NODES=3 # 1 master, 2 workers + export KUBEVIRT_NUM_NODES=5 # 1 master, 4 workers source automation/check-patch.setup.sh cd ${TMP_PROJECT_PATH} @@ -32,11 +32,6 @@ main() { make cluster-sync export E2E_TEST_SUITE_ARGS="--junit-output=$ARTIFACTS/junit.functest.xml" - if [ "$NMSTATE_PARALLEL_ROLLOUT" == "true" ]; then - E2E_TEST_SUITE_ARGS="${E2E_TEST_SUITE_ARGS} -ginkgo.skip='user-guide|nns|sequential'" - else - E2E_TEST_SUITE_ARGS="${E2E_TEST_SUITE_ARGS} -ginkgo.skip='parallel'" - fi make E2E_TEST_TIMEOUT=1h E2E_TEST_ARGS="-noColor" test-e2e-handler } diff --git a/test/e2e/handler/nnce_conditions_test.go b/test/e2e/handler/nnce_conditions_test.go index 01ea4f028..094c01658 100644 --- a/test/e2e/handler/nnce_conditions_test.go +++ b/test/e2e/handler/nnce_conditions_test.go @@ -162,7 +162,7 @@ var _ = Describe("[rfe_id:3503][crit:medium][vendor:cnv-qe@redhat.com][level:com resetDesiredStateForNodes() }) - It("[test_id:3795][parallel] should have Failing ConditionType set to true", func() { + It("[test_id:3795] should have Failing ConditionType set to true", func() { for _, node := range nodes { By(fmt.Sprintf("Check %s failing state is reached", node)) enactmentConditionsStatusEventually(node).Should( @@ -195,7 +195,7 @@ var _ = Describe("[rfe_id:3503][crit:medium][vendor:cnv-qe@redhat.com][level:com wg.Wait() }) - It("[test_id:3795][sequential] should have one Failing the rest Aborted ConditionType set to true", func() { + It("[test_id:3795] should have one Failing the rest Aborted ConditionType set to true", func() { checkEnactmentCounts := func(policy string) { failingConditions := 0 abortedConditions := 0 diff --git a/test/e2e/handler/nncp_parallel_test.go b/test/e2e/handler/nncp_parallel_test.go index 079ce8a92..351686277 100644 --- a/test/e2e/handler/nncp_parallel_test.go +++ b/test/e2e/handler/nncp_parallel_test.go @@ -51,13 +51,13 @@ var _ = Describe("NNCP with maxUnavailable", func() { By("Reset desired state at all nodes") resetDesiredStateForNodes() }) - It("[parallel] should be progressing on multiple nodes", func() { + It("should be progressing on multiple nodes", func() { Eventually(func() int { return enactmentsInProgress(TestPolicy) }, duration, interval).Should(BeNumerically("==", maxUnavailableNodes())) waitForAvailablePolicy(TestPolicy) }) - It("[parallel] should never exceed maxUnavailable nodes", func() { + It("should never exceed maxUnavailable nodes", func() { Consistently(func() int { return enactmentsInProgress(TestPolicy) }, duration, interval).Should(BeNumerically("<=", maxUnavailableNodes())) diff --git a/test/e2e/handler/webhook_test.go b/test/e2e/handler/webhook_test.go index 1176f21bf..d83bd9312 100644 --- a/test/e2e/handler/webhook_test.go +++ b/test/e2e/handler/webhook_test.go @@ -68,7 +68,7 @@ var _ = Describe("Validation Admission Webhook", func() { updateDesiredStateAndWait(linuxBrAbsent(bridge1)) resetDesiredStateForNodes() }) - It("Should deny updating sequentially rolled out policy when it's in progress", func() { + It("Should deny updating rolled out policy when it's in progress", func() { By(fmt.Sprintf("Updating the policy %s", TestPolicy)) err := retry.RetryOnConflict(retry.DefaultRetry, func() error { return setDesiredStateWithPolicyAndNodeSelector(TestPolicy, linuxBrUpNoPorts(bridge1), map[string]string{})