Merge branch 'master' into imageBump/202501.12.0

Azure · Jan 14, 2025 · 28ced2a · 28ced2a
2 parents 49d39a7 + 632c07d
commit 28ced2a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.pipelines/templates/.builder-release-template.yaml b/.pipelines/templates/.builder-release-template.yaml
@@ -158,6 +158,7 @@ steps:
       SYSTEM_COLLECTIONURI: $(System.CollectionUri)
       SYSTEM_TEAMPROJECT: $(System.TeamProject)
       BUILD_RUN_NUMBER: $(Build.BuildNumber)
+      VHD_ARTIFACT_NAME: ${{ parameters.artifactName }}
 
   - task: PublishPipelineArtifact@0
     condition: always()

diff --git a/vhdbuilder/packer/test-scan-and-cleanup.sh b/vhdbuilder/packer/test-scan-and-cleanup.sh
@@ -13,6 +13,7 @@ required_env_vars=(
   "AZURE_MSI_RESOURCE_STRING"
   "UMSI_CLIENT_ID"
   "BUILD_RUN_NUMBER"
+  "VHD_ARTIFACT_NAME"
 )
 
 for v in "${required_env_vars[@]}"; do

diff --git a/vhdbuilder/packer/trivy-scan.sh b/vhdbuilder/packer/trivy-scan.sh
@@ -18,7 +18,7 @@ ARCHITECTURE=${4}
 SIG_CONTAINER_NAME=${5}
 STORAGE_ACCOUNT_NAME=${6}
 ENABLE_TRUSTED_LAUNCH=${7}
-VHD_NAME=${8}
+VHD_ARTIFACT_NAME=${8}
 SKU_NAME=${9}
 KUSTO_ENDPOINT=${10}
 KUSTO_DATABASE=${11}
@@ -144,7 +144,7 @@ retrycmd_if_failure 10 30 600 ./trivy --scanners vuln rootfs -f json --db-reposi
 if [[ -f ${TRIVY_REPORT_ROOTFS_JSON_PATH} ]]; then
     ./vuln-to-kusto-vhd scan-report \
         --vhd-buildrunnumber=${BUILD_RUN_NUMBER} \
-        --vhd-vhdname="${VHD_NAME}" \
+        --vhd-vhdname="${VHD_ARTIFACT_NAME}" \
         --vhd-ossku="${OS_SKU}" \
         --vhd-osversion="${OS_VERSION}" \
         --vhd-skuname="${SKU_NAME}" \
@@ -172,7 +172,7 @@ for CONTAINER_IMAGE in $IMAGE_LIST; do
     if [[ -f ${TRIVY_REPORT_IMAGE_JSON_PATH} ]]; then
         ./vuln-to-kusto-vhd scan-report \
             --vhd-buildrunnumber=${BUILD_RUN_NUMBER} \
-            --vhd-vhdname="${VHD_NAME}" \
+            --vhd-vhdname="${VHD_ARTIFACT_NAME}" \
             --vhd-ossku="${OS_SKU}" \
             --vhd-osversion="${OS_VERSION}" \
             --vhd-skuname="${SKU_NAME}" \

diff --git a/vhdbuilder/packer/vhd-scanning.sh b/vhdbuilder/packer/vhd-scanning.sh
@@ -99,7 +99,7 @@ az vm run-command invoke \
         "SIG_CONTAINER_NAME"=${SIG_CONTAINER_NAME} \
         "STORAGE_ACCOUNT_NAME"=${STORAGE_ACCOUNT_NAME} \
         "ENABLE_TRUSTED_LAUNCH"=${ENABLE_TRUSTED_LAUNCH} \
-        "VHD_NAME"=${VHD_NAME} \
+        "VHD_ARTIFACT_NAME"=${VHD_ARTIFACT_NAME} \
         "SKU_NAME"=${SKU_NAME} \
         "KUSTO_ENDPOINT"=${KUSTO_ENDPOINT} \
         "KUSTO_DATABASE"=${KUSTO_DATABASE} \