DNM: Run the e2e regression at mutiple nodes in parallel to check sta…

…bility Signed-off-by: Quique Llorente <[email protected]>
nmstate · Sep 27, 2019 · fc08e47 · fc08e47
1 parent d8692bb
commit fc08e47
Show file tree

Hide file tree

Showing 20 changed files with 34 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ ifdef UNIT_TEST_EXTRA_ARGS
 	UNIT_TEST_ARGS += $(UNIT_TEST_ARGS)
 endif
 
-E2E_TEST_ARGS ?= -test.v -test.timeout=20m -ginkgo.v -ginkgo.slowSpecThreshold=60
+E2E_TEST_ARGS ?= -test.v -test.timeout=40m -ginkgo.v -ginkgo.slowSpecThreshold=60
 ifdef E2E_TEST_FOCUS
 	E2E_TEST_ARGS +=  -ginkgo.focus $(E2E_TEST_FOCUS)
 endif

diff --git a/automation/check-patch.k8s-1.14.6-1.mounts b/automation/check-patch.k8s-1.14.6-1.mounts
@@ -0,0 +1 @@
+check-patch.mounts
diff --git a/automation/check-patch.k8s-1.14.6-1.packages b/automation/check-patch.k8s-1.14.6-1.packages
@@ -0,0 +1 @@
+check-patch.packages
diff --git a/automation/check-patch.k8s-1.14.6-1.sh b/automation/check-patch.k8s-1.14.6-1.sh
@@ -0,0 +1 @@
+check-patch.sh
diff --git a/automation/check-patch.k8s-1.14.6-2.mounts b/automation/check-patch.k8s-1.14.6-2.mounts
@@ -0,0 +1 @@
+check-patch.mounts
diff --git a/automation/check-patch.k8s-1.14.6-2.packages b/automation/check-patch.k8s-1.14.6-2.packages
@@ -0,0 +1 @@
+check-patch.packages
diff --git a/automation/check-patch.k8s-1.14.6-2.sh b/automation/check-patch.k8s-1.14.6-2.sh
@@ -0,0 +1 @@
+check-patch.sh
diff --git a/automation/check-patch.k8s-1.14.6-3.mounts b/automation/check-patch.k8s-1.14.6-3.mounts
@@ -0,0 +1 @@
+check-patch.mounts
diff --git a/automation/check-patch.k8s-1.14.6-3.packages b/automation/check-patch.k8s-1.14.6-3.packages
@@ -0,0 +1 @@
+check-patch.packages
diff --git a/automation/check-patch.k8s-1.14.6-3.sh b/automation/check-patch.k8s-1.14.6-3.sh
@@ -0,0 +1 @@
+check-patch.sh
diff --git a/automation/check-patch.k8s-1.14.6-4.mounts b/automation/check-patch.k8s-1.14.6-4.mounts
@@ -0,0 +1 @@
+check-patch.mounts
diff --git a/automation/check-patch.k8s-1.14.6-4.packages b/automation/check-patch.k8s-1.14.6-4.packages
@@ -0,0 +1 @@
+check-patch.packages
diff --git a/automation/check-patch.k8s-1.14.6-4.sh b/automation/check-patch.k8s-1.14.6-4.sh
@@ -0,0 +1 @@
+check-patch.sh
diff --git a/automation/check-patch.k8s-1.14.6-5.mounts b/automation/check-patch.k8s-1.14.6-5.mounts
@@ -0,0 +1 @@
+check-patch.mounts
diff --git a/automation/check-patch.k8s-1.14.6-5.packages b/automation/check-patch.k8s-1.14.6-5.packages
@@ -0,0 +1 @@
+check-patch.packages
diff --git a/automation/check-patch.k8s-1.14.6-5.sh b/automation/check-patch.k8s-1.14.6-5.sh
@@ -0,0 +1 @@
+check-patch.sh
diff --git a/automation/test.sh b/automation/test.sh
@@ -8,7 +8,7 @@ teardown() {
     make cluster-down
 }
 
-export KUBEVIRT_PROVIDER=$TARGET
+export KUBEVIRT_PROVIDER=$(echo $TARGET| sed "s/6-.*/6/")
 
 # Make sure that the VM is properly shut down on exit
 trap teardown EXIT SIGINT SIGTERM SIGSTOP

diff --git a/stdci.yaml b/stdci.yaml
@@ -1,5 +1,10 @@
 sub-stages:
   - k8s-1.14.6
+  - k8s-1.14.6-1
+  - k8s-1.14.6-2
+  - k8s-1.14.6-3
+  - k8s-1.14.6-4
+  - k8s-1.14.6-5
   - os-3.11.0
 
 runtime_requirements:

diff --git a/test/e2e/default_bridged_network_test.go b/test/e2e/default_bridged_network_test.go
@@ -20,7 +20,7 @@ import (
 	nmstatev1alpha1 "github.com/nmstate/kubernetes-nmstate/pkg/apis/nmstate/v1alpha1"
 )
 
-var _ = Describe("NodeNetworkConfigurationPolicy default bridged network", func() {
+var _ = PDescribe("NodeNetworkConfigurationPolicy default bridged network", func() {
 	createBridgeOnTheDefaultInterface := nmstatev1alpha1.State(`interfaces:
   - name: brext
     type: linux-bridge
@@ -142,7 +142,9 @@ func dhcpFlag(node string, name string) bool {
 func nodeReadyConditionStatus(nodeName string) (corev1.ConditionStatus, error) {
 	key := types.NamespacedName{Name: nodeName}
 	node := corev1.Node{}
-	err := framework.Global.Client.Get(context.TODO(), key, &node)
+	oneSecondTimeoutCtx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+	defer cancel()
+	err := framework.Global.Client.Get(oneSecondTimeoutCtx, key, &node)
 	if err != nil {
 		return "", err
 	}
@@ -157,8 +159,8 @@ func nodeReadyConditionStatus(nodeName string) (corev1.ConditionStatus, error) {
 func waitForNodesReady() {
 	time.Sleep(5 * time.Second)
 	for _, node := range nodes {
-		Eventually(func() (corev1.ConditionStatus, error) {
+		EventuallyWithOffset(1, func() (corev1.ConditionStatus, error) {
 			return nodeReadyConditionStatus(node)
-		}, 60*time.Second, 1*time.Second).Should(Equal(corev1.ConditionTrue))
+		}, 30*time.Minute, 10*time.Second).Should(Equal(corev1.ConditionTrue))
 	}
 }
diff --git a/test/e2e/nns_conditions_test.go b/test/e2e/nns_conditions_test.go
@@ -56,6 +56,12 @@ var _ = Describe("NodeNetworkStateCondition", func() {
 		BeforeEach(func() {
 			updateDesiredState(invalidConfig)
 		})
+		AfterEach(func() {
+			updateDesiredState(br1Absent)
+			for _, node := range nodes {
+				interfacesNameForNode(node).ShouldNot(ContainElement("br1"))
+			}
+		})
 		It("should have Failing ConditionType set to true", func() {
 			for _, node := range nodes {
 				checkCondition(node, nmstatev1alpha1.NodeNetworkStateConditionFailing).Should(