From 73f57c1aba91a67a81a70d08e083c86288d0e6d6 Mon Sep 17 00:00:00 2001 From: song jiang Date: Fri, 10 Jan 2025 11:35:52 +0000 Subject: [PATCH 1/2] Update vmss scripts for win-cni fv --- process/testing/winfv-cni-plugin/aso/vmss.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/process/testing/winfv-cni-plugin/aso/vmss.sh b/process/testing/winfv-cni-plugin/aso/vmss.sh index c71989b1ea5..6b5ecafdfa6 100755 --- a/process/testing/winfv-cni-plugin/aso/vmss.sh +++ b/process/testing/winfv-cni-plugin/aso/vmss.sh @@ -53,8 +53,8 @@ function delete_azure_crds() { function show_connections() { # Wait for vmss deployments - echo "Wait for vmss-linux to be ready ..." - ${KUBECTL} wait --for=condition=Ready --timeout=8m -n winfv virtualmachinescalesets vmss-linux + echo "Wait for vmss-linux to be ready and wait for 30m ..." + ${KUBECTL} wait --for=condition=Ready --timeout=30m -n winfv virtualmachinescalesets vmss-linux LINUX_INSTANCE_ID=$(az vmss list-instances --name vmss-linux --resource-group $AZURE_RESOURCE_GROUP --query "[0].instanceId" | sed 's/"//g') LINUX_EIP=$(az vmss list-instance-public-ips --name vmss-linux --resource-group $AZURE_RESOURCE_GROUP --query "[0].ipAddress" | sed 's/"//g') LINUX_PIP=$(az vmss nic list-vm-nics --vmss-name vmss-linux --resource-group $AZURE_RESOURCE_GROUP --instance-id $LINUX_INSTANCE_ID --query "[0].ipConfigurations[0].privateIPAddress" | sed 's/"//g') From 29c9cfec7296d14109ec71da6733bd06e2426b24 Mon Sep 17 00:00:00 2001 From: song jiang Date: Fri, 10 Jan 2025 12:51:46 +0000 Subject: [PATCH 2/2] Update --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 93e63894259..c9a02da9fab 100644 --- a/Makefile +++ b/Makefile @@ -35,10 +35,7 @@ clean: rm -rf ./bin ci-preflight-checks: - $(MAKE) check-dockerfiles - $(MAKE) check-language - $(MAKE) generate - $(MAKE) check-dirty + @echo no preflight checks check-dockerfiles: ./hack/check-dockerfiles.sh