Add Windows 2025 support for built-in images (#606)

jenkinsci · Dec 19, 2024 · 3684c51 · 3684c51
1 parent a0e5bf0
commit 3684c51
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMAgentTemplate.java
@@ -1737,6 +1737,7 @@ public ListBoxModel doFillBuiltInImageItems() {
             model.add(Constants.UBUNTU_2404_LTS);
             model.add(Constants.UBUNTU_2204_LTS);
             model.add(Constants.UBUNTU_2004_LTS);
+            model.add(Constants.WINDOWS_SERVER_2025);
             model.add(Constants.WINDOWS_SERVER_2022);
             model.add(Constants.WINDOWS_SERVER_2019);
             model.add(Constants.WINDOWS_SERVER_2016);

diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMManagementServiceDelegate.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMManagementServiceDelegate.java
@@ -1653,6 +1653,8 @@ private static Map<String, Map<String, String>> getDefaultImageProperties() {
                 imageProperties("MicrosoftWindowsServer", "WindowsServer", "2019-Datacenter", "2019-Datacenter-with-Containers", Constants.OS_TYPE_WINDOWS));
         imageProperties.put(Constants.WINDOWS_SERVER_2022,
                 imageProperties("MicrosoftWindowsServer", "WindowsServer", "2022-datacenter-azure-edition-core", "2022-datacenter-azure-edition-core", Constants.OS_TYPE_WINDOWS));
+        imageProperties.put(Constants.WINDOWS_SERVER_2025,
+                imageProperties("MicrosoftWindowsServer", "WindowsServer", "2025-datacenter-azure-edition-core", "2025-datacenter-azure-edition-core", Constants.OS_TYPE_WINDOWS));
         imageProperties.put(Constants.UBUNTU_2004_LTS,
                 imageProperties("canonical", "0001-com-ubuntu-server-focal", "20_04-lts-gen2", "20_04-lts-gen2", Constants.OS_TYPE_LINUX));
         imageProperties.put(Constants.UBUNTU_2204_LTS,
@@ -1686,13 +1688,15 @@ private static Map<String, Map<String, String>> getPreInstalledToolsScript() {
         tools.put(Constants.WINDOWS_SERVER_2016, new HashMap<>());
         tools.put(Constants.WINDOWS_SERVER_2019, new HashMap<>());
         tools.put(Constants.WINDOWS_SERVER_2022, new HashMap<>());
+        tools.put(Constants.WINDOWS_SERVER_2025, new HashMap<>());
         tools.put(Constants.UBUNTU_2004_LTS, new HashMap<>());
         tools.put(Constants.UBUNTU_2204_LTS, new HashMap<>());
         tools.put(Constants.UBUNTU_2404_LTS, new HashMap<>());
         try {
             windows(Constants.WINDOWS_SERVER_2016, tools);
             windows(Constants.WINDOWS_SERVER_2019, tools);
             windows(Constants.WINDOWS_SERVER_2022, tools);
+            windows(Constants.WINDOWS_SERVER_2025, tools);
             ubuntu(Constants.UBUNTU_2004_LTS, tools);
             ubuntu(Constants.UBUNTU_2204_LTS, tools);
             ubuntu(Constants.UBUNTU_2404_LTS, tools);

diff --git a/src/main/java/com/microsoft/azure/vmagent/util/Constants.java b/src/main/java/com/microsoft/azure/vmagent/util/Constants.java
@@ -128,6 +128,7 @@ public final class Constants {
     /**
      * Built In Image.
      */
+    public static final String WINDOWS_SERVER_2025 = "Windows Server 2025";
     public static final String WINDOWS_SERVER_2022 = "Windows Server 2022";
     public static final String WINDOWS_SERVER_2019 = "Windows Server 2019";
     public static final String WINDOWS_SERVER_2016 = "Windows Server 2016";