Skip to content

Commit

Permalink
Resolving Jenkins e2e issue
Browse files Browse the repository at this point in the history
Signed-off-by: Tushar Tathgur <[email protected]>
  • Loading branch information
Tushar Tathgur authored and Tushar Tathgur committed Jul 11, 2023
1 parent 2ad63d0 commit e305fdd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ci/jenkins/test-vmc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion test/e2e/fixture.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit e305fdd

Please sign in to comment.