Merge pull request #370 from Azure/gpu_gen2

support and test Gen2 images

Author: xpillons

examples/image/pipeline.yml

@@ -28,6 +28,7 @@ variables:
 # Uncomment and set values below, or leave commented and thru pipeline variables
   # azhpc.variables.location: westeurope
   # azhpc.variables.image_name: foo
+  azhpc.variables_matrix: examples/image/test_matrix.json
 
 # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 

examples/image/test_matrix.json

@@ -0,0 +1,10 @@
+{
+    "Gen1":
+    {
+        "azhpc.variables.hpc_image": "OpenLogic:CentOS-HPC:7.7:latest"
+    },
+    "Gen2":
+    {
+        "azhpc.variables.image": "OpenLogic:CentOS-HPC:7_7-gen2:latest"
+    }
+}

examples/nvidia/pipeline.yml

@@ -29,9 +29,9 @@ variables:
 
 # Add the variables needed in your configuration file
 # Uncomment and set values below, or leave commented and thru pipeline variables
-  # azhpc.variables.location: eastus
+  azhpc.variables.location: southcentralus
   #azhpc.variables.vm_type: Standard_NC12s_v3
-  
+  azhpc.variables_matrix: examples/nvidia/test_matrix.json
 # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 jobs:

examples/nvidia/test_matrix.json

@@ -0,0 +1,12 @@
+{
+    "Gen1":
+    {
+        "azhpc.variables.vm_type": "Standard_NV12s_v3",
+        "azhpc.variables.image": "OpenLogic:CentOS:7.7:latest"
+    },
+    "Gen2":
+    {
+        "azhpc.variables.vm_type": "Standard_ND40rs_v2",
+        "azhpc.variables.image": "OpenLogic:CentOS:7_7-gen2:latest"
+    }
+}

scripts/create_image.sh

@@ -3,13 +3,24 @@ rg=$1
 vm_name=$2
 image_name=$3
 image_rg=$4
-hyperv=${5-v1}
+#hyperv=${5-v1}
 
 # Create the Image
 echo "Deallocate $vm_name"
 az vm deallocate -g $rg -n $vm_name
 echo "Generalize $vm_name"
 az vm generalize -g $rg -n $vm_name
+
+# Retrieve the hyperv generation of the image used to create the VM as it needs to be specified when capturing the VM
+imgref=$(az vm show --name $vm_name -g $rg --query "storageProfile.imageReference")
+echo $imgref
+offer=$(echo $imgref | jq -r '.offer')
+publisher=$(echo $imgref | jq -r '.publisher')
+sku=$(echo $imgref | jq -r '.sku')
+version=$(echo $imgref | jq -r '.version')
+hyperv=$(az vm image show --urn $publisher:$offer:$sku:$version --query "hyperVgeneration" -o tsv)
+echo "hyper-v generation is $hyperv"
+
 echo "Create Image $image_name from VM $vm_name"
 if [ "$rg" == "$image_rg" ]; then
     az image create -g $rg -n $image_name --source $vm_name --hyper-v-generation $hyperv --output table