refactor: nvidia GB image build and update driver install order (#8597)

Author: keith-ms

.pipelines/.vsts-vhd-builder-release.yaml

@@ -81,8 +81,8 @@ parameters:
     displayName: Build 2404 ARM64 Gen2 containerd
     type: boolean
     default: true
-  - name: build2404arm64gb200gen2containerd
-    displayName: Build 2404 ARM64 GB200 Gen2 Containerd
+  - name: build2404arm64gbgen2containerd
+    displayName: Build 2404 ARM64 NVIDIA GB Gen2 Containerd
     type: boolean
     default: false
   - name: build2204containerd
@@ -962,8 +962,8 @@ stages:
               useOverrides: ${{ parameters.useOverrides }}
               overrideBranch: ${{ parameters.overrideBranch }}
               artifactName: acl-arm64-fips-tl-gen2
-      - job: build2404arm64gb200gen2containerd
-        condition: eq('${{ parameters.build2404arm64gb200gen2containerd }}', true)
+      - job: build2404arm64gbgen2containerd
+        condition: eq('${{ parameters.build2404arm64gbgen2containerd }}', true)
         dependsOn: [ ]
         timeoutInMinutes: 360
         steps:
@@ -976,7 +976,7 @@ stages:
               echo '##vso[task.setvariable variable=IMG_VERSION]latest'
               echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
               echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D32pds_v5'
-              echo '##vso[task.setvariable variable=FEATURE_FLAGS]GB200'
+              echo '##vso[task.setvariable variable=FEATURE_FLAGS]NVIDIA_GB'
               echo '##vso[task.setvariable variable=ARCHITECTURE]ARM64'
               echo '##vso[task.setvariable variable=ENABLE_FIPS]False'
               echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]False'
@@ -985,7 +985,7 @@ stages:
             parameters:
               useOverrides: ${{ parameters.useOverrides }}
               overrideBranch: ${{ parameters.overrideBranch }}
-              artifactName: 2404-arm64-gb200-gen2-containerd
+              artifactName: 2404-arm64-gb-gen2-containerd
   - stage: e2e
     condition: and(succeeded(), ne(variables.SKIP_E2E_TESTS, 'true'))
     variables:

.pipelines/templates/.builder-release-template.yaml

@@ -77,7 +77,7 @@ steps:
       SKU_NAME=${OS_VERSION} && \
       if [[ "${HYPERV_GENERATION,,}" == "v2" ]]; then SKU_NAME="${SKU_NAME}gen2"; fi && \
       if [[ "${ARCHITECTURE,,}" == "arm64" ]]; then SKU_NAME="${SKU_NAME}arm64"; fi && \
-      if grep -q "GB200" <<< "$FEATURE_FLAGS"; then SKU_NAME="${SKU_NAME}gb200"; fi && \
+      if grep -q "NVIDIA_GB" <<< "$FEATURE_FLAGS"; then SKU_NAME="${SKU_NAME}gb"; fi && \
       if [[ "${ENABLE_FIPS,,}" == "true" ]]; then SKU_NAME="${SKU_NAME}fips"; fi && \
       if grep -q "cvm" <<< "$FEATURE_FLAGS"; then SKU_NAME="${SKU_NAME}CVM"; fi && \
       if [[ "${IMG_SKU}" == *"minimal"* ]]; then SKU_NAME="${SKU_NAME}minimal"; fi && \
@@ -352,7 +352,7 @@ steps:
       TargetFolder: '$(Build.ArtifactStagingDirectory)'
 
   - task: CopyFiles@2
-    condition: and(eq(variables.OS_SKU, 'Ubuntu'), in(variables.OS_VERSION, '22.04', '24.04'), in(variables.FEATURE_FLAGS, 'None', 'cvm', 'GB200'))
+    condition: and(eq(variables.OS_SKU, 'Ubuntu'), in(variables.OS_VERSION, '22.04', '24.04'), in(variables.FEATURE_FLAGS, 'None', 'cvm', 'NVIDIA_GB'))
     displayName: Copy CIS Reports
     inputs:
       SourceFolder: '$(System.DefaultWorkingDirectory)'

packer.mk

@@ -12,9 +12,9 @@ build-packer: setup-golang generate-prefetch-scripts build-image-fetcher build-a
 ifeq (${ARCHITECTURE},ARM64)
 	@echo "${MODE}: Building with Hyper-v generation 2 ARM64 VM"
 ifeq (${OS_SKU},Ubuntu)
-ifeq ($(findstring GB200,$(FEATURE_FLAGS)),GB200)
-	@echo "Using packer template file vhd-image-builder-arm64-gb200.json"
-	@packer build -timestamp-ui  -var-file=vhdbuilder/packer/settings.json vhdbuilder/packer/vhd-image-builder-arm64-gb200.json
+ifeq ($(findstring NVIDIA_GB,$(FEATURE_FLAGS)),NVIDIA_GB)
+	@echo "Using packer template file vhd-image-builder-arm64-gb.json"
+	@packer build -timestamp-ui  -var-file=vhdbuilder/packer/settings.json vhdbuilder/packer/vhd-image-builder-arm64-gb.json
 else
 	@echo "Using packer template file vhd-image-builder-arm64-gen2.json"
 	@packer build -timestamp-ui  -var-file=vhdbuilder/packer/settings.json vhdbuilder/packer/vhd-image-builder-arm64-gen2.json