From bc40a45879d9b721093443c64c3fdf8b1e0be557 Mon Sep 17 00:00:00 2001 From: Naman Agarwal Date: Sat, 28 Oct 2023 11:24:31 +0530 Subject: [PATCH] Revert CI changes in #5440 Signed-off-by: Naman Agarwal --- ci/jenkins/test.sh | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/ci/jenkins/test.sh b/ci/jenkins/test.sh index d3c852b1337..e2626c2f503 100755 --- a/ci/jenkins/test.sh +++ b/ci/jenkins/test.sh @@ -152,12 +152,7 @@ export NO_PULL E2ETEST_PATH=${WORKDIR}/kubernetes/_output/dockerized/bin/linux/amd64/e2e.test function export_govc_env_var { - env_govc="${WORKDIR}/govc.env" - if [ -f "$env_govc" ]; then - source "$env_govc" - else - export GOVC_URL=$GOVC_URL - fi + export GOVC_URL=$GOVC_URL export GOVC_USERNAME=$GOVC_USERNAME export GOVC_PASSWORD=$GOVC_PASSWORD export GOVC_INSECURE=1 @@ -327,11 +322,7 @@ function prepare_env { function revert_snapshot_windows { WIN_NAME=$1 echo "==== Reverting Windows VM ${WIN_NAME} =====" - if [[ $WIN_NAME == *"jumper"* ]]; then - govc snapshot.revert -vm ${WIN_NAME} win-initial - else - govc snapshot.revert -vm ${WIN_NAME} pristine-win-initial - fi + govc snapshot.revert -vm ${WIN_NAME} win-initial # If Windows VM fails to power on correctly in time, retry several times. winVMIPs="" for i in `seq 10`; do @@ -525,12 +516,14 @@ function build_and_deliver_antrea_windows_and_linux_docker_images { function build_and_deliver_antrea_windows_and_linux_containerd_images { echo "====== Cleanup Antrea Installation Before Delivering Antrea Windows and Antrea Linux containerd Images =====" clean_antrea - kubectl delete -f ${WORKDIR}/antrea-windows-containerd-with-ovs.yml --ignore-not-found=true || true + kubectl delete -f ${WORKDIR}/antrea-windows-containerd.yml --ignore-not-found=true || true kubectl delete -f ${WORKDIR}/kube-proxy-windows-containerd.yml --ignore-not-found=true || true kubectl delete daemonset antrea-agent -n kube-system --ignore-not-found=true || true kubectl delete -f ${WORKDIR}/antrea.yml --ignore-not-found=true || true prepare_env + ${CLEAN_STALE_IMAGES_CONTAINERD} + ${PRINT_CONTAINERD_STATUS} chmod -R g-w build/images/ovs chmod -R g-w build/images/base # Clean docker image to save disk space. @@ -538,11 +531,11 @@ function build_and_deliver_antrea_windows_and_linux_containerd_images { ${PRINT_DOCKER_STATUS} export_govc_env_var # Enable verbose log for troubleshooting. - sed -i "s/--v=0/--v=4/g" build/yamls/antrea.yml build/yamls/antrea-windows-containerd-with-ovs.yml + sed -i "s/--v=0/--v=4/g" build/yamls/antrea.yml build/yamls/antrea-windows-containerd.yml echo "====== Updating yaml files to enable proxyAll ======" KUBE_API_SERVER=$(kubectl --kubeconfig=$KubeConfigFile config view -o jsonpath='{.clusters[0].cluster.server}') - sed -i "s|.*kubeAPIServerOverride: \"\"| kubeAPIServerOverride: \"${KUBE_API_SERVER}\"|g" build/yamls/antrea.yml build/yamls/antrea-windows-containerd-with-ovs.yml + sed -i "s|.*kubeAPIServerOverride: \"\"| kubeAPIServerOverride: \"${KUBE_API_SERVER}\"|g" build/yamls/antrea.yml build/yamls/antrea-windows-containerd.yml cp -f build/yamls/*.yml $WORKDIR set +e @@ -1155,7 +1148,7 @@ fi trap clean_antrea EXIT if [[ ${TESTCASE} =~ "windows" ]]; then if [[ ${TESTCASE} =~ "containerd" ]]; then - WINDOWS_YAML_SUFFIX="windows-containerd-with-ovs" + WINDOWS_YAML_SUFFIX="windows-containerd" build_and_deliver_antrea_windows_and_linux_containerd_images if [[ ${TESTCASE} =~ "e2e" ]]; then run_e2e_windows