update packer/azure/, makefile

kubernetes-sigs · Jul 29, 2024 · 1327b78 · 1327b78
1 parent c0968b9
commit 1327b78
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/images/capi/Makefile b/images/capi/Makefile
@@ -655,8 +655,10 @@ build-azure-vhd-rhel-8: ## Builds RHEL 8 VHD image for Azure
 build-azure-vhd-windows-2019-containerd: ## Builds for Windows Server 2019 with containerd
 build-azure-vhd-windows-2022-containerd: ## Builds for Windows Server 2022 with containerd
 build-azure-sig-windows-annual-containerd: ## Builds for Windows Server Annual Channel with containerd
-build-azure-sig-23h2-datacenter-core: ## Builds for Windows Server 23h2 Datacenter Core with containerd
-build-azure-sig-23h2-datacenter-core-g2: ## Builds for Windows Server 23h2 Datacenter Core G2 with containerd
+build-azure-sig-23h2-datacenter-core: ## Builds for Windows Server 23h2 Datacenter Core in Shared Image Gallery
+build-azure-sig-23h2-datacenter-core-g2: ## Builds for Windows Server 23h2 Datacenter Core G2 in Shared Image Gallery
+build-azure-vhd-23h2-datacenter-core: ## Builds for Windows Server 23h2 Datacenter Core with containerd
+build-azure-vhd-23h2-datacenter-core-g2: ## Builds for Windows Server 23h2 Datacenter Core G2 with containerd
 build-azure-sig-centos-7-gen2: ## Builds CentOS Gen2 managed image in Shared Image Gallery
 build-azure-sig-mariner-2-gen2: ## Builds Azure Linux 2 Gen2 managed image in Shared Image Gallery
 build-azure-sig-azurelinux-3-gen2: ## Builds Azure Linux 3 Gen2 managed image in Shared Image Gallery
@@ -869,6 +871,8 @@ validate-azure-sig-windows-2022-containerd: ## Validate Windows Server 2022 with
 validate-azure-sig-windows-annual-containerd: ## Validate Windows Server Annual Channel with containerd Azure managed image in Shared Image Gallery Packer config
 validate-azure-sig-23h2-datacenter-core: ## Builds for Windows Server 23h2 Datacenter Core with containerd
 validate-azure-sig-23h2-datacenter-core-g2: ## Builds for Windows Server 23h2 Datacenter Core G2 with containerd
+validate-azure-vhd-23h2-datacenter-core: ## Builds for Windows Server 23h2 Datacenter Core with containerd
+validate-azure-vhd-23h2-datacenter-core-g2: ## Builds for Windows Server 23h2 Datacenter Core G2 with containerd
 validate-azure-vhd-centos-7: ## Validates CentOS 7 VHD image Azure Packer config
 validate-azure-vhd-mariner-2: ## Validates Azure Linux 2 VHD image Azure Packer config
 validate-azure-vhd-azurelinux-3: ## Validates Azure Linux 3 VHD image Azure Packer config

diff --git a/images/capi/azure_targets.sh b/images/capi/azure_targets.sh
@@ -1,8 +1,8 @@
-VHD_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 rhel-8 windows-2019-containerd windows-2022-containerd"
-VHD_CI_TARGETS="ubuntu-2204 ubuntu-2404 mariner-2 windows-2019-containerd windows-2022-containerd"
-SIG_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 rhel-8 windows-2019-containerd windows-2022-containerd flatcar"
-SIG_CI_TARGETS="ubuntu-2204 ubuntu-2404 mariner-2 windows-2019-containerd windows-2022-containerd flatcar"
+VHD_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 rhel-8 windows-2019-containerd windows-2022-containerd 23h2-datacenter-core"
+VHD_CI_TARGETS="ubuntu-2204 ubuntu-2404 mariner-2 windows-2019-containerd windows-2022-containerd 23h2-datacenter-core"
+SIG_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 rhel-8 windows-2019-containerd windows-2022-containerd flatcar 23h2-datacenter-core"
+SIG_CI_TARGETS="ubuntu-2204 ubuntu-2404 mariner-2 windows-2019-containerd windows-2022-containerd flatcar 23h2-datacenter-core"
 SIG_GEN2_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 flatcar"
 SIG_GEN2_CI_TARGETS="ubuntu-2204 ubuntu-2404 mariner-2 flatcar"
-SIG_CVM_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 windows-2019-containerd windows-2022-containerd"
-SIG_CVM_CI_TARGETS="ubuntu-2204 ubuntu-2404 windows-2022-containerd"
+SIG_CVM_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 windows-2019-containerd windows-2022-containerd 23h2-datacenter-core"
+SIG_CVM_CI_TARGETS="ubuntu-2204 ubuntu-2404 windows-2022-containerd 23h2-datacenter-core"
diff --git a/images/capi/packer/azure/23h2-datacenter-core-g2.json b/images/capi/packer/azure/23h2-datacenter-core-g2.json
@@ -4,6 +4,7 @@
   "build_name": "23h2-datacenter-core-g2",
   "distribution": "windows",
   "distribution_version": "23h2",
+  "distribution_release": "23h2-datacenter-core-g2",
   "image_offer": "WindowsServer",
   "image_publisher": "MicrosoftWindowsServer",
   "image_sku": "23h2-datacenter-core-g2",

diff --git a/images/capi/packer/azure/23h2-datacenter-core.json b/images/capi/packer/azure/23h2-datacenter-core.json
@@ -4,6 +4,7 @@
   "build_name": "23h2-datacenter-core",
   "distribution": "windows",
   "distribution_version": "23h2",
+  "distribution_release": "23h2-datacenter-core",
   "image_offer": "WindowsServer",
   "image_publisher": "MicrosoftWindowsServer",
   "image_sku": "23h2-datacenter-core",

diff --git a/images/capi/packer/azure/scripts/init-sig.sh b/images/capi/packer/azure/scripts/init-sig.sh
@@ -87,10 +87,10 @@ case ${SIG_TARGET} in
     create_image_definition ${SIG_TARGET} "win-annual-containerd" "V1" "Windows"
   ;;
   23h2-datacenter-core)
-    create_image_definition ${SIG_TARGET} "23h2-datacenter-core-containerd" "V1" "Windows"
+    create_image_definition ${SIG_TARGET} "23h2-datacenter-core" "V1" "Windows"
   ;;
   23h2-datacenter-core-g2)
-    create_image_definition ${SIG_TARGET} "23h2-datacenter-core-g2-containerd" "V1" "Windows"
+    create_image_definition ${SIG_TARGET} "23h2-datacenter-core-g2" "V1" "Windows"
   ;;
   windows-2019-containerd-cvm)
     SKU="windows-2019-cvm-containerd"