From d6f7dbe71a4129723d37e537b1da6235995bf7fd Mon Sep 17 00:00:00 2001
From: jason1028kr <jason1028kr@gmail.com>
Date: Mon, 24 Feb 2025 21:33:36 -0800
Subject: [PATCH] Revert "test: set environment"

This reverts commit c7ec9defd062dff5ad457ff71b725db8dcc5dc75.
---
 .../templates/.builder-release-template.yaml  | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.pipelines/templates/.builder-release-template.yaml b/.pipelines/templates/.builder-release-template.yaml
index 72a0f802b82..bf422d5ad2f 100644
--- a/.pipelines/templates/.builder-release-template.yaml
+++ b/.pipelines/templates/.builder-release-template.yaml
@@ -81,24 +81,24 @@ steps:
       echo "Set SKU_NAME to $SKU_NAME"
     displayName: Set SKU Name
   
-  # - bash: make -f packer.mk run-packer
-  #   displayName: Build VHD
-  #   retryCountOnTaskFailure: 3
-  #   env:
-  #     OS_TYPE: Linux
-  #     GIT_VERSION: $(Build.SourceVersion)
-  #     BRANCH: $(Build.SourceBranch)
-  #     BUILD_NUMBER: $(Build.BuildNumber)
-  #     BUILD_ID: $(Build.BuildId)
-  #     BUILD_DEFINITION_NAME: $(Build.DefinitionName)
-  #     UA_TOKEN: $(ua-token)
+  - bash: make -f packer.mk run-packer
+    displayName: Build VHD
+    retryCountOnTaskFailure: 3
+    env:
+      OS_TYPE: Linux
+      GIT_VERSION: $(Build.SourceVersion)
+      BRANCH: $(Build.SourceBranch)
+      BUILD_NUMBER: $(Build.BuildNumber)
+      BUILD_ID: $(Build.BuildId)
+      BUILD_DEFINITION_NAME: $(Build.DefinitionName)
+      UA_TOKEN: $(ua-token)
 
   - bash: |
-      PACKER_VNET_RESOURCE_GROUP_NAME="nodesig-tme-westus-packer-vnet-rg" && \
-      PACKER_VNET_NAME="nodesig-packer-vnet-westus" && \
-      CAPTURED_SIG_VERSION="1.1740448435.4727" && \
-      SIG_IMAGE_NAME="2204gen2containerd" && \
-      BUILD_LOCATION="westus" && \
+      PACKER_VNET_RESOURCE_GROUP_NAME="$(cat vhdbuilder/packer/settings.json | grep "vnet_resource_group_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
+      PACKER_VNET_NAME="$(cat vhdbuilder/packer/settings.json | grep "vnet_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
+      CAPTURED_SIG_VERSION="$(cat vhdbuilder/packer/settings.json | grep "captured_sig_version" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
+      SIG_IMAGE_NAME="$(cat vhdbuilder/packer/settings.json | grep "sig_image_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
+      BUILD_LOCATION="$(cat vhdbuilder/packer/settings.json | grep "location" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
       echo "##vso[task.setvariable variable=PACKER_BUILD_LOCATION]${BUILD_LOCATION}" && \
       echo "##vso[task.setvariable variable=PACKER_VNET_RESOURCE_GROUP_NAME]${PACKER_VNET_RESOURCE_GROUP_NAME}" && \
       echo "##vso[task.setvariable variable=PACKER_VNET_NAME]${PACKER_VNET_NAME}" && \
@@ -106,12 +106,12 @@ steps:
       echo "##vso[task.setvariable variable=IMAGE_NAME]${SIG_IMAGE_NAME}-${CAPTURED_SIG_VERSION}" && \
       echo "##vso[task.setvariable variable=SIG_IMAGE_NAME]${SIG_IMAGE_NAME}" && \
       echo "##vso[task.setvariable variable=CAPTURED_SIG_VERSION]${CAPTURED_SIG_VERSION}" && \
-      echo "##vso[task.setvariable variable=IMPORTED_IMAGE_NAME]" && \
-      echo "##vso[task.setvariable variable=OS_DISK_URI]" && \
-      echo "##vso[task.setvariable variable=MANAGED_SIG_ID]/subscriptions/6025ea9d-cd32-47fc-b23b-fc77f85f88b7/resourceGroups/aksvhdtmebuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204gen2containerd/versions/1.1740448435.4727" && \
-      echo "##vso[task.setvariable variable=SIG_GALLERY_NAME]PackerSigGalleryEastUS" && \
+      echo "##vso[task.setvariable variable=IMPORTED_IMAGE_NAME]$(cat vhdbuilder/packer/settings.json | grep "imported_image_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
+      echo "##vso[task.setvariable variable=OS_DISK_URI]$(cat packer-output | grep "OSDiskUri:" | cut -d " " -f 2)" && \
+      echo "##vso[task.setvariable variable=MANAGED_SIG_ID]$(cat packer-output | grep "ManagedImageSharedImageGalleryId:" | cut -d " " -f 2)" && \
+      echo "##vso[task.setvariable variable=SIG_GALLERY_NAME]$(cat vhdbuilder/packer/settings.json | grep "sig_gallery_name" | awk -F':' '{print $2}' | awk -F'"' '{print $2}')" && \
       echo "##vso[task.setvariable variable=PERFORMANCE_DATA_FILE]vhd-build-performance-data.json" && \
-      echo "##vso[task.setvariable variable=PKR_RG_NAME]aksvhdtmebuildrg" && \
+      echo "##vso[task.setvariable variable=PKR_RG_NAME]$(cat packer-output | grep "ResourceGroupName" | cut -d "'" -f 2 | head -1)" && \
       echo "##vso[task.setvariable variable=IS_NOT_1804]$( [[ "${OS_VERSION}" != "18.04" ]] && echo true || echo false )" && \
       echo "##vso[task.setvariable variable=OS_NAME]Linux" && \
       echo "##vso[task.setvariable variable=OS_TYPE]Linux" && \