Merge pull request #8743 from song-jiang/song-fix-win-fv

projectcalico · Apr 23, 2024 · ca49a0c · ca49a0c
2 parents ae18e51 + e343799
commit ca49a0c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/cni-plugin/.semaphore/run-win-fv.sh b/cni-plugin/.semaphore/run-win-fv.sh
@@ -59,6 +59,13 @@ for log_file in /home/semaphore/fv.log/*.log; do
     cat ${log_file} | iconv -f UTF-16 -t UTF-8 | sed 's/\r$//g' | grep --line-buffered --perl ${log_regexps} -B 2 -A 15 | sed 's/.*/'"${prefix}"' &/g'
 done;
 
+# Search for the file indicates that the Windows node has completed the FV process
+if [ ! -f /home/semaphore/report/done-marker ];
+then
+    echo "Windows node failed to complete the FV process."
+    exit 1
+fi
+
 # Search for error code file
 if [ -f /home/semaphore/report/error-codes ];
 then

diff --git a/process/testing/winfv/cloudformation-windows-server.json b/process/testing/winfv/cloudformation-windows-server.json
@@ -223,12 +223,7 @@
                 "waitAfterCompletion": "forever"
               },
               "1-install-bgp4" : {
-                "command" : "powershell.exe -Command \"Start-Sleep 20; Install-RemoteAccess -ErrorAction Ignore -VpnType RoutingOnly\"",
-                "test" : "findstr calico-bgp c:\\k\\backend",
-                "waitAfterCompletion": "0"
-              },
-              "1-install-bgp5" : {
-                "command" : "powershell.exe -Command \"Start-Sleep 20; Install-RemoteAccess -ErrorAction Ignore -VpnType RoutingOnly\"",
+                "command" : "powershell.exe -Command \"Start-Sleep 60; Install-RemoteAccess -ErrorAction Ignore -VpnType RoutingOnly\"",
                 "test" : "findstr calico-bgp c:\\k\\backend",
                 "waitAfterCompletion": "0"
               },

diff --git a/process/testing/winfv/setup-fv.sh b/process/testing/winfv/setup-fv.sh
@@ -424,7 +424,7 @@ function setup_fv() {
   setup_kubeadm_cluster
   #create etcd manually with http protocol
   LOCAL_IP_ENV=${LINUX_PIP}
-  ETCD_CONTAINER=quay.io/coreos/etcd:v3.3.7
+  ETCD_CONTAINER=quay.io/coreos/etcd:v3.4.6
   ${MASTER_CONNECT_COMMAND} docker run --detach -p 2389:2389 --name calico-etcd ${ETCD_CONTAINER}  etcd --advertise-client-urls "http://${LOCAL_IP_ENV}:2389,http://127.0.0.1:2389,http://${LOCAL_IP_ENV}:8001,http://127.0.0.1:8001" --listen-client-urls "http://0.0.0.0:2389,http://0.0.0.0:8001"
 
   echo