Merge branch 'master' into imageBump/202410.09.0

.pipelines/.vsts-vhd-builder.yaml

@@ -104,7 +104,7 @@ stages:
       LOCATION: $(PACKER_BUILD_LOCATION)
     jobs:
       - template: ./templates/e2e-template.yaml
-  - stage: Generate and Publish Testdata
+  - stage: Generate_and_Publish_Testdata
     condition: succeeded()
     jobs:
       - job: Generate_Publish_Testdata
@@ -113,7 +113,7 @@ stages:
         - bash: |
             make generate
           displayName: Generate Testdata
-        - task: 1ES.PublishPipelineArtifact@1
+        - task: PublishPipelineArtifact@1
           inputs:
             targetPath: $(Pipeline.Workspace)/pkg/agent/testdata
             artifact: testdata

.pipelines/scripts/verify_shell.sh

@@ -25,7 +25,7 @@ else
     echo "shellcheck installed"
 fi
 
-filesToCheck=$(find . -type f -name "*.sh" -not -path './parts/linux/cloud-init/artifacts/*' -not -path './pkg/agent/testdata/*' -not -path './vendor/*' -not -path './hack/tools/vendor/*' -not -path './.git/*' -not -path './self-contained/*' -not -path './hack/tools/bin/shellspecsrc/*')
+filesToCheck=$(find . -type f -name "*.sh" -not -path './parts/linux/cloud-init/artifacts/*' -not -path './pkg/agent/testdata/*' -not -path './vendor/*' -not -path './hack/tools/vendor/*' -not -path './.git/*' -not -path './hack/tools/bin/shellspecsrc/*')
 
 # also shell-check generated test data
 generatedTestData=$(find ./pkg/agent/testdata -type f -name "*.sh" )

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

@@ -69,21 +69,6 @@ steps:
       echo "##vso[task.setvariable variable=BUILD_DATE]$BUILD_DATE"
     displayName: Get Build Mode
 
-  - bash: |
-      if [[ ${{ parameters.artifactName }} =~ "2019" ]]; then
-        WINDOWS_VERSION="$(cat vhdbuilder/packer/windows-image.env | grep -a "WINDOWS_2019_BASE_IMAGE_VERSION" | cut -d "=" -f 2 | cut -d "." -f 1,2)"
-      elif [[ ${{ parameters.artifactName }} =~ "2022" ]]; then
-        WINDOWS_VERSION="$(cat vhdbuilder/packer/windows-image.env | grep -a "WINDOWS_2022_BASE_IMAGE_VERSION" | cut -d "=" -f 2 | cut -d "." -f 1,2)"
-      elif [[ ${{ parameters.artifactName }} =~ "23H2" ]]; then
-        WINDOWS_VERSION="$(cat vhdbuilder/packer/windows-image.env | grep -a "WINDOWS_23H2_BASE_IMAGE_VERSION" | cut -d "=" -f 2 | cut -d "." -f 1,2)"
-      else
-        echo "Current distro is not supported to get image version. You need to update related code."
-        exit 1
-      fi
-      AKS_WINDOWS_IMAGE_VERSION="$WINDOWS_VERSION.${BUILD_DATE}"
-      echo "##vso[task.setvariable variable=AKS_WINDOWS_IMAGE_VERSION]$AKS_WINDOWS_IMAGE_VERSION"
-    displayName: Get Image Version
-
   - script: |
       branch=$(Build.SourceBranch)
       branch=$(echo "${branch}" | sed 's/refs\/heads\///g')
@@ -116,7 +101,7 @@ steps:
       -e WINDOWS_CORE_IMAGE_URL=${WINDOWS_CORE_IMAGE_URL} \
       -e WINDOWS_PRIVATE_PACKAGES_URL=${WINDOWS_PRIVATE_PACKAGES_URL} \
       -e AZURE_MSI_RESOURCE_STRING=${AZURE_MSI_RESOURCE_STRING} \
-      -e AKS_WINDOWS_IMAGE_VERSION=${AKS_WINDOWS_IMAGE_VERSION} \
+      -e BUILD_DATE=${BUILD_DATE} \
       ${AZURE_CONTAINER_IMAGE} make -f packer.mk run-packer-windows
     displayName: Building windows VHD
 
@@ -156,6 +141,12 @@ steps:
   - bash: |
       sudo chmod 777 image-bom.json
       jq . image-bom.json > tmp.json
+
+      echo "Reading image version from image-bom.json"
+      AKS_WINDOWS_IMAGE_VERSION=$(cat image-bom.json | jq -r '.imageVersion')
+      echo "##vso[task.setvariable variable=AKS_WINDOWS_IMAGE_VERSION]$AKS_WINDOWS_IMAGE_VERSION"
+      echo "Image version: $AKS_WINDOWS_IMAGE_VERSION"
+
       mv tmp.json ${AKS_WINDOWS_IMAGE_VERSION}-image-list.json
       cp release-notes.txt ${AKS_WINDOWS_IMAGE_VERSION}.txt
     displayName: Reformat image-bom.json and rename release-notes.txt

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

@@ -164,6 +164,21 @@ steps:
     condition: always()
     displayName: Check Build Performance
 
+  - task: PublishPipelineArtifact@0
+    condition: always()
+    displayName: Publish BCC Tools Installation Log
+    inputs:
+      artifactName: 'bcc-tools-installation-log-${{ parameters.artifactName }}'
+      targetPath: 'bcc-tools-installation.log'
+
+  - task: CopyFiles@2
+    condition: always()
+    displayName: Copy BCC Tools Installation Log
+    inputs:
+      SourceFolder: '$(System.DefaultWorkingDirectory)'
+      Contents: 'bcc-tools-installation.log'
+      TargetFolder: '$(Build.ArtifactStagingDirectory)'
+
   - task: CopyFiles@2
     condition: eq(variables['IS_NOT_1804'], 'true')
     displayName: Copy Trivy Report