Merge branch 'master' into longw/releases-3.1.23

Azure · Jul 31, 2024 · b86ae67 · b86ae67
2 parents a2f29aa + 38ef4cd
commit b86ae67
Show file tree

Hide file tree

Showing 16 changed files with 2,907 additions and 7 deletions.
diff --git a/.pipelines/templates/e2e-template.yaml b/.pipelines/templates/e2e-template.yaml
@@ -8,17 +8,20 @@ jobs:
       - group: ab-e2e
     steps:
       - bash: |
+          set -ex
           az login --identity
           az account set -s $(AZURE_SUBSCRIPTION_ID)
         displayName: Azure login
       - bash: bash .pipelines/scripts/setup_go.sh
         displayName: Setup go
       - bash: |
+          set -ex
           LOGGING_DIR="scenario-logs-$(date +%s)"
           echo "setting logging dir to $LOGGING_DIR"
           echo "##vso[task.setvariable variable=LOGGING_DIR]$LOGGING_DIR"
         displayName: Set logging directory
       - bash: |
+          set -ex
           export PATH="/usr/local/go/bin:$PATH"
           go version
           
@@ -33,7 +36,9 @@ jobs:
           fi
           
           cd e2e
-          go test -parallel 100 -timeout 90m -v ./...
+          mkdir -p bin
+          GOBIN=`pwd`/bin/ go install github.com/jstemmer/go-junit-report/v2@latest
+          go test -v -parallel 100 -timeout 90m -v ./... 2>&1 | ./bin/go-junit-report -iocopy -set-exit-code -out "$(Build.SourcesDirectory)/e2e/report.xml"
         displayName: Run AgentBaker E2E
         env:
           VHD_BUILD_ID: $(VHD_BUILD_ID)
@@ -43,6 +48,12 @@ jobs:
       - bash: mkdir -p $(System.DefaultWorkingDirectory)/e2e/$(LOGGING_DIR)
         condition: always()
         displayName: Create folder for scenario logs
+      - task: PublishTestResults@2
+        displayName: Upload test results
+        condition: succeededOrFailed()
+        inputs:
+          testRunner: JUnit
+          testResultsFiles: "$(Build.SourcesDirectory)/e2e/report.xml"
       - publish: $(System.DefaultWorkingDirectory)/e2e/$(LOGGING_DIR)
         artifact: $(LOGGING_DIR)
         condition: always()

diff --git a/vhdbuilder/packer/configure-windows-vhd.ps1 b/vhdbuilder/packer/configure-windows-vhd.ps1
@@ -691,6 +691,9 @@ function Update-Registry {
         Enable-WindowsFixInFeatureManagement -Name 2540111500
         Enable-WindowsFixInFeatureManagement -Name 50261647
         Enable-WindowsFixInFeatureManagement -Name 1475968140
+
+        Write-Log "Enable 1 fix in 2024-07B"
+        Enable-WindowsFixInFeatureManagement -Name 747051149
     }
 
     if ($env:WindowsSKU -Like '23H2*') {

diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
@@ -72,6 +72,7 @@ switch -Regex ($windowsSku) {
         )
     }
     "23H2*" {
+        # Don't need to update patchUrls and patchIDs for 23H2 since it's by design.
         $global:patchUrls = @()
         $global:patchIDs = @()
 

diff --git a/vhdbuilder/packer/test/windows-vhd-content-test.ps1 b/vhdbuilder/packer/test/windows-vhd-content-test.ps1
@@ -392,6 +392,8 @@ function Test-RegistryAdded {
         Validate-WindowsFixInFeatureManagement -Name 2540111500
         Validate-WindowsFixInFeatureManagement -Name 50261647
         Validate-WindowsFixInFeatureManagement -Name 1475968140
+
+        Validate-WindowsFixInFeatureManagement -Name 747051149
     }
     if ($env:WindowsSKU -Like '23H2*') {
         Validate-WindowsFixInHnsState -Name NamespaceExcludedUdpPorts -Value 65330

diff --git a/vhdbuilder/packer/windows-image.env b/vhdbuilder/packer/windows-image.env
@@ -4,31 +4,31 @@
 # CLI example to get the latest image version:
 #   az vm image show --urn MicrosoftWindowsServer:WindowsServer:2019-Datacenter-Core-smalldisk:latest
 WINDOWS_2019_BASE_IMAGE_SKU=2019-Datacenter-Core-smalldisk
-WINDOWS_2019_BASE_IMAGE_VERSION=17763.5936.240607
+WINDOWS_2019_BASE_IMAGE_VERSION=17763.6054.240703
 
 # CLI example to get the latest image version:
 #   az vm image show --urn MicrosoftWindowsServer:WindowsServer:2022-Datacenter-Core-smalldisk:latest
 WINDOWS_2022_BASE_IMAGE_SKU=2022-Datacenter-Core-smalldisk
-WINDOWS_2022_BASE_IMAGE_VERSION=20348.2529.240619
+WINDOWS_2022_BASE_IMAGE_VERSION=20348.2582.240703
 
 # CLI example to get all available image version under a SKU (suffix g2 for Gen 2):
 #   az vm image list --all --publisher MicrosoftWindowsServer --offer WindowsServer --output table -s 2022-datacenter-core-smalldisk-g2
 # CLI example to get the latest image version:
 #   az vm image show --urn MicrosoftWindowsServer:WindowsServer:2022-datacenter-core-smalldisk-g2:latest
 WINDOWS_2022_GEN2_BASE_IMAGE_SKU=2022-datacenter-core-smalldisk-g2
-WINDOWS_2022_GEN2_BASE_IMAGE_VERSION=20348.2529.240619
+WINDOWS_2022_GEN2_BASE_IMAGE_VERSION=20348.2582.240703
 
 # CLI example to get the latest image version:
 #   az vm image show --urn MicrosoftWindowsServer:WindowsServer:23h2-datacenter-core:latest
 WINDOWS_23H2_BASE_IMAGE_SKU=23h2-datacenter-core
-WINDOWS_23H2_BASE_IMAGE_VERSION=25398.950.240607
+WINDOWS_23H2_BASE_IMAGE_VERSION=25398.1009.240702
 
 # CLI example to get all available image version under a SKU (suffix g2 for Gen 2):
 #   az vm image list --all --publisher MicrosoftWindowsServer --offer WindowsServer --output table -s 23h2-datacenter-core-g2
 # CLI example to get the latest image version:
 #   az vm image show --urn MicrosoftWindowsServer:WindowsServer:23h2-datacenter-core-g2:latest
 WINDOWS_23H2_GEN2_BASE_IMAGE_SKU=23h2-datacenter-core-g2
-WINDOWS_23H2_GEN2_BASE_IMAGE_VERSION=25398.950.240607
+WINDOWS_23H2_GEN2_BASE_IMAGE_VERSION=25398.1009.240702
 
 # Please uncomment the following lines and set a larger os disk size that is at least 30GB when your PR check-in fails
 # WINDOWS_2019_CONTAINERD_OS_DISK_SIZE_GB=30

diff --git a/vhdbuilder/packer/write-release-notes-windows.ps1 b/vhdbuilder/packer/write-release-notes-windows.ps1
@@ -149,7 +149,8 @@ $wuRegistryNames = @(
     "1605443213",
     "2540111500",
     "50261647",
-    "1475968140"
+    "1475968140",
+    "747051149"
 )
 
 foreach ($key in $wuRegistryKeys) {