Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DNM: Default again? #189

Closed
wants to merge 4 commits into from
Closed

DNM: Default again? #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f02313c
DNM: Run the e2e regression at mutiple nodes in parallel to check sta…
qinqon Sep 26, 2019
2dadbb9
fix linux bridge cleanup
phoracek Sep 27, 2019
7c79079
DNM: enable default again
phoracek Sep 27, 2019
9bd7ea2
Merge branch 'master' into default_again_question_mark
phoracek Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-1.mounts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.mounts
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-1.packages
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.packages
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.sh
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-2.mounts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.mounts
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-2.packages
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.packages
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.sh
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-3.mounts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.mounts
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-3.packages
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.packages
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.sh
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-4.mounts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.mounts
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-4.packages
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.packages
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-4.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.sh
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-5.mounts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.mounts
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-5.packages
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.packages
1 change: 1 addition & 0 deletions automation/check-patch.k8s-1.14.6-5.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check-patch.sh
2 changes: 1 addition & 1 deletion automation/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ RUN sudo dnf install -y nmstate iproute && \
# TODO: Delete this line after we update nmstate to include the change
# https://github.com/nmstate/nmstate/commit/a4baaff50fef84d6d326977ff647bece1e917a26
RUN sed -i "s/run(timeout=20/run(timeout=60/g" /usr/lib/python3.7/site-packages/libnmstate/netapplier.py
# TODO: Delete this line after nmstate fixes https://github.com/nmstate/nmstate/issues/516
RUN sed -i "s/nmclient.NM.DeviceType.OVS_INTERFACE,/nmclient.NM.DeviceType.OVS_INTERFACE, nmclient.NM.DeviceType.BRIDGE,/" /usr/lib/python3.7/site-packages/libnmstate/nm/applier.py

# Cannot change the binary to nmstate-handler since the name
# is taken from the directory name [1]
Expand Down
5 changes: 5 additions & 0 deletions stdci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
8 changes: 5 additions & 3 deletions test/e2e/default_bridged_network_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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))
}
}
6 changes: 6 additions & 0 deletions test/e2e/nns_conditions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ func vlansCardinality(node string, connection string) AsyncAssertion {
func bridgeDescription(node string, bridgeName string) AsyncAssertion {
return Eventually(func() (string, error) {
return run(node, "sudo", "ip", "-d", "link", "show", "type", "bridge", bridgeName)
}, ReadTimeout, ReadTimeout)
}, ReadTimeout, ReadInterval)
}

func conditionsToYaml(conditions []nmstatev1alpha1.NodeNetworkStateCondition) string {
Expand Down