chore: modify AgentBaker test

Azure · Jul 31, 2024 · 1d8dd5d · 1d8dd5d
1 parent 38ef4cd
commit 1d8dd5d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/validate-windows-binary-signature.yaml b/.github/workflows/validate-windows-binary-signature.yaml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   check-files-for-ws2019:
-    name: Check Windows Files and Images
+    name: Check for Windows 2019
     runs-on: windows-2019
     steps:
       - name: Check out repository code
@@ -22,7 +22,7 @@ jobs:
         run: |
           ./vhdbuilder/packer/test/windows-files-check.ps1 2019-containerd
   check-files-for-ws2022:
-    name: Check Windows Files and Images
+    name: Check for Windows 2022
     runs-on: windows-2022
     steps:
       - name: Check out repository code

diff --git a/.pipelines/e2e-windows.yaml b/.pipelines/e2e-windows.yaml
@@ -34,7 +34,7 @@ parameters:
 - name: test2022containerdgen2
   displayName: Test 2022 containerd Gen 2
   type: boolean
-  default: True
+  default: False
 - name: test2022containerdgen2gpugrid
   displayName: Test 2022 containerd Gen 2 GPU Grid
   type: boolean
@@ -50,7 +50,7 @@ parameters:
 - name: test23H2gen2
   displayName: Test 23H2 Gen 2
   type: boolean
-  default: False
+  default: True
 - name: windowsGen2VMSize
   type: string
   default: Standard_D2s_v3

diff --git a/.pipelines/templates/e2e-windows-template.yaml b/.pipelines/templates/e2e-windows-template.yaml
@@ -24,6 +24,8 @@ jobs:
     - bash: |
         az login --identity
         az account set -s $(AZURE_E2E_SUBSCRIPTION_ID)
+        az extension add --name aks-preview
+        az --version
       displayName: az login
     - bash: bash .pipelines/scripts/setup_go.sh
       displayName: setup go
@@ -53,7 +55,8 @@ jobs:
           export WINDOWS_PACKAGE_VERSION=$KUBERNETES_VERSION
         fi
         export K8S_VERSION=${WINDOWS_PACKAGE_VERSION//./}
-        export WINDOWS_E2E_STORAGE_CONTAINER=${{ parameters.storageAccount }}-$K8S_VERSION
+        declare -l WINDOWS_E2E_STORAGE_CONTAINER=${{ parameters.storageAccount }}-$K8S_VERSION
+        export WINDOWS_E2E_STORAGE_CONTAINER
         mkdir -p $WINDOWS_E2E_IMAGE
         cp -r e2e/windows/* $WINDOWS_E2E_IMAGE
         go version

diff --git a/e2e/windows/e2e-create-windows-nodepool.sh b/e2e/windows/e2e-create-windows-nodepool.sh
@@ -6,7 +6,7 @@ source e2e-helper.sh
 
 log "Starting to create windows nodepool"
 
-E2E_RESOURCE_GROUP_NAME="$AZURE_E2E_RESOURCE_GROUP_NAME-$WINDOWS_E2E_IMAGE$WINDOWS_GPU_DRIVER_SUFFIX-$K8S_VERSION"
+declare -l E2E_RESOURCE_GROUP_NAME="$AZURE_E2E_RESOURCE_GROUP_NAME-$WINDOWS_E2E_IMAGE$WINDOWS_GPU_DRIVER_SUFFIX-$K8S_VERSION"
 
 out=$(az aks nodepool list --cluster-name $AZURE_E2E_CLUSTER_NAME -g $E2E_RESOURCE_GROUP_NAME | jq '.[].name')
 

diff --git a/e2e/windows/e2e-helper.sh b/e2e/windows/e2e-helper.sh
@@ -64,7 +64,7 @@ create_storage_container() {
 
 upload_linux_file_to_storage_account() {
     local retval=0
-    E2E_RESOURCE_GROUP_NAME="$AZURE_E2E_RESOURCE_GROUP_NAME-$WINDOWS_E2E_IMAGE$WINDOWS_GPU_DRIVER_SUFFIX-$K8S_VERSION"
+    declare -l E2E_RESOURCE_GROUP_NAME="$AZURE_E2E_RESOURCE_GROUP_NAME-$WINDOWS_E2E_IMAGE$WINDOWS_GPU_DRIVER_SUFFIX-$K8S_VERSION"
     E2E_MC_RESOURCE_GROUP_NAME="MC_${E2E_RESOURCE_GROUP_NAME}_${AZURE_E2E_CLUSTER_NAME}_$AZURE_BUILD_LOCATION"
     MC_VMSS_NAME=$(az vmss list -g $E2E_MC_RESOURCE_GROUP_NAME --query "[?contains(name, 'nodepool')]" -ojson | jq -r '.[0].name')
     VMSS_INSTANCE_ID="$(az vmss list-instances --name $MC_VMSS_NAME -g $E2E_MC_RESOURCE_GROUP_NAME | jq -r '.[0].instanceId')"

diff --git a/e2e/windows/e2e-scenario.sh b/e2e/windows/e2e-scenario.sh
@@ -59,7 +59,7 @@ collect-logs() {
     fi
 }
 
-E2E_RESOURCE_GROUP_NAME="$AZURE_E2E_RESOURCE_GROUP_NAME-$WINDOWS_E2E_IMAGE$WINDOWS_GPU_DRIVER_SUFFIX-$K8S_VERSION"
+declare -l E2E_RESOURCE_GROUP_NAME="$AZURE_E2E_RESOURCE_GROUP_NAME-$WINDOWS_E2E_IMAGE$WINDOWS_GPU_DRIVER_SUFFIX-$K8S_VERSION"
 
 DEPLOYMENT_VMSS_NAME="$(mktemp -u winXXXXX | tr '[:upper:]' '[:lower:]')"
 export DEPLOYMENT_VMSS_NAME

diff --git a/e2e/windows/e2e-starter.sh b/e2e/windows/e2e-starter.sh
@@ -8,7 +8,7 @@ log "Starting e2e tests"
 
 # Create a resource group for the cluster
 log "Creating resource group"
-E2E_RESOURCE_GROUP_NAME="$AZURE_E2E_RESOURCE_GROUP_NAME-$WINDOWS_E2E_IMAGE$WINDOWS_GPU_DRIVER_SUFFIX-$K8S_VERSION"
+declare -l E2E_RESOURCE_GROUP_NAME="$AZURE_E2E_RESOURCE_GROUP_NAME-$WINDOWS_E2E_IMAGE$WINDOWS_GPU_DRIVER_SUFFIX-$K8S_VERSION"
 
 rgStartTime=$(date +%s)
 az group create -l $AZURE_BUILD_LOCATION -n $E2E_RESOURCE_GROUP_NAME --subscription $AZURE_E2E_SUBSCRIPTION_ID -ojson