From e305fdd0fee78d1f8a731159d6ce8159c42b6970 Mon Sep 17 00:00:00 2001 From: Tushar Tathgur Date: Tue, 11 Jul 2023 09:32:39 -0700 Subject: [PATCH] Resolving Jenkins e2e issue Signed-off-by: Tushar Tathgur --- ci/jenkins/test-vmc.sh | 2 +- test/e2e/fixture.go | 9 ++++++++- test/e2e/framework.go | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ci/jenkins/test-vmc.sh b/ci/jenkins/test-vmc.sh index 51871073..07ef7a6a 100644 --- a/ci/jenkins/test-vmc.sh +++ b/ci/jenkins/test-vmc.sh @@ -313,7 +313,7 @@ function deliver_antrea { antrea_yml="antrea.yml" # Enable verbose log for troubleshooting. sed -i "s/--v=0/--v=4/g" $GIT_CHECKOUT_DIR/build/yamls/$antrea_yml - perl -i -p0e 's/ # feature, you need to set "enable" to true, and ensure that the FlowExporter\n # feature gate is also enabled.\n enable: false/ # feature, you need to set "enable" to true, and ensure that the FlowExporter\n # feature gate is also enabled.\n enable: true/' $TMP_DIR/antrea.yml + perl -i -p0e 's/ # feature, you need to set "enable" to true, and ensure that the FlowExporter\n # feature gate is also enabled.\n enable: false/ # feature, you need to set "enable" to true, and ensure that the FlowExporter\n # feature gate is also enabled.\n enable: true/' $GIT_CHECKOUT_DIR/build/yamls/antrea.yml sed -i -e "s/flowPollInterval: \"5s\"/flowPollInterval: \"1s\"/g" $GIT_CHECKOUT_DIR/build/yamls/$antrea_yml sed -i -e "s/activeFlowExportTimeout: \"5s\"/activeFlowExportTimeout: \"2s\"/g" $GIT_CHECKOUT_DIR/build/yamls/$antrea_yml sed -i -e "s/idleFlowExportTimeout: \"15s\"/idleFlowExportTimeout: \"1s\"/g" $GIT_CHECKOUT_DIR/build/yamls/$antrea_yml diff --git a/test/e2e/fixture.go b/test/e2e/fixture.go index 67397176..f56c2ac4 100644 --- a/test/e2e/fixture.go +++ b/test/e2e/fixture.go @@ -288,7 +288,14 @@ func setupTestForFlowVisibility(tb testing.TB, config FlowVisibiltiySetUpConfig) if err != nil { return testData, v4Enabled, v6Enabled, err } - + _, _, _, err = testData.provider.RunCommandOnNode(controlPlaneNodeName(), "kubectl taint nodes --all node-role.kubernetes.io/master:NoSchedule-") + if err != nil { + fmt.Printf("Error: %v", err) + } + _, _, _, err = testData.provider.RunCommandOnNode(controlPlaneNodeName(), "kubectl taint nodes --all node.cluster.x-k8s.io/uninitialized-") + if err != nil { + fmt.Printf("Error: %v", err) + } tb.Logf("Applying flow visibility YAML") chSvcIP, err := testData.deployFlowVisibility(config) if err != nil { diff --git a/test/e2e/framework.go b/test/e2e/framework.go index 3a3a3d7d..559eb3b9 100644 --- a/test/e2e/framework.go +++ b/test/e2e/framework.go @@ -736,7 +736,7 @@ func (data *TestData) PodWaitFor(timeout time.Duration, name, namespace string, }) if err != nil { if err == wait.ErrWaitTimeout && pod != nil { - return nil, fmt.Errorf("timed out waiting for the condition, Pod.Status: %s", pod.Status.String()) + return nil, fmt.Errorf("timed out waiting for the condition, Pod name:%s, Pod.Status: %s", name, pod.Status.String()) } return nil, err }