Updating publish workflows for 2025 (#2411)

GoogleCloudPlatform · Nov 19, 2024 · 3de04c1 · 3de04c1
1 parent fffe7de
commit 3de04c1
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/daisy_workflows/build-publish/windows/windows-server-2025-core-uefi.publish.json b/daisy_workflows/build-publish/windows/windows-server-2025-core-uefi.publish.json
@@ -32,14 +32,14 @@
     {
       "Prefix": "windows-server-2025-core",
       "Family": "windows-2025-core-standard",
-      "Description": "Microsoft, Windows Server, 2025 Core Preview, Server Core, x64 built on {{$time}}",
+      "Description": "Microsoft, Windows Server, 2025 Core, Server Core, x64 built on {{$time}}",
       "Architecture": "X86_64",
       "Licenses": [
         {{if eq .environment "internal" -}}
         "projects/google.com:windows-internal/global/licenses/internal-windows",
         "projects/windows-cloud/global/licenses/windows-server-core"
         {{- else -}}
-        "projects/windows-cloud/global/licenses/windows-server-2022",
+        "projects/windows-cloud/global/licenses/windows-server-2025",
         "projects/windows-cloud/global/licenses/windows-server-core"
         {{- end}}
       ],

diff --git a/daisy_workflows/build-publish/windows/windows-server-2025-dc-core-uefi.publish.json b/daisy_workflows/build-publish/windows/windows-server-2025-dc-core-uefi.publish.json
@@ -32,14 +32,14 @@
     {
       "Prefix": "windows-server-2025-dc-core",
       "Family": "windows-2025-core",
-      "Description": "Microsoft, Windows Server, 2025 Datacenter Core Preview, Server Core, x64 built on {{$time}}",
+      "Description": "Microsoft, Windows Server, 2025 Datacenter Core, Server Core, x64 built on {{$time}}",
       "Architecture": "X86_64",
       "Licenses": [
         {{if eq .environment "internal" -}}
         "projects/google.com:windows-internal/global/licenses/internal-windows",
         "projects/windows-cloud/global/licenses/windows-server-core"
         {{- else -}}
-        "projects/windows-cloud/global/licenses/windows-server-2022-dc",
+        "projects/windows-cloud/global/licenses/windows-server-2025-dc",
         "projects/windows-cloud/global/licenses/windows-server-core"
         {{- end}}
       ],

diff --git a/daisy_workflows/build-publish/windows/windows-server-2025-dc-uefi.publish.json b/daisy_workflows/build-publish/windows/windows-server-2025-dc-uefi.publish.json
@@ -42,7 +42,7 @@
       "Prefix": "windows-server-2025-dc",
       "Family": "windows-2025",
       {{- end}}
-      "Description": "Microsoft, Windows Server, 2025 Datacenter Preview, Server with Desktop Experience, x64 built on {{$time}}",
+      "Description": "Microsoft, Windows Server, 2025 Datacenter, Server with Desktop Experience, x64 built on {{$time}}",
       "Architecture": "X86_64",
       "Licenses": [
         {{if eq .environment "internal" -}}

diff --git a/daisy_workflows/build-publish/windows/windows-server-2025-uefi.publish.json b/daisy_workflows/build-publish/windows/windows-server-2025-uefi.publish.json
@@ -32,13 +32,13 @@
     {
       "Prefix": "windows-server-2025",
       "Family": "windows-2025-standard",
-      "Description": "Microsoft, Windows Server, 2025 Preview, Server with Desktop Experience, x64 built on {{$time}}",
+      "Description": "Microsoft, Windows Server, 2025, Server with Desktop Experience, x64 built on {{$time}}",
       "Architecture": "X86_64",
       "Licenses": [
         {{if eq .environment "internal" -}}
         "projects/google.com:windows-internal/global/licenses/internal-windows"
         {{- else -}}
-        "projects/windows-cloud/global/licenses/windows-server-2022"
+        "projects/windows-cloud/global/licenses/windows-server-2025"
         {{- end}}
       ],
       "GuestOsFeatures": {{$guest_features}}

diff --git a/daisy_workflows/image_build/windows/post_install.ps1 b/daisy_workflows/image_build/windows/post_install.ps1
@@ -501,7 +501,7 @@ function Change-InstanceProperties {
   Set-ItemProperty -Path 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Policies\System' -Name 'LocalAccountTokenFilterPolicy' -Value 1 -Force
 
   # https://support.microsoft.com/en-us/help/4072698/windows-server-guidance-to-protect-against-the-speculative-execution
-  # Not enabling by deault for now.
+  # Not enabling by default for now.
   #New-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management' -Name 'FeatureSettingsOverride' -Value 0  -PropertyType DWORD -Force
   #New-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management' -Name 'FeatureSettingsOverrideMask' -Value 3  -PropertyType DWORD -Force
 }

diff --git a/daisy_workflows/image_build/windows/windows-server-2025-core-uefi-payg.wf.json b/daisy_workflows/image_build/windows/windows-server-2025-core-uefi-payg.wf.json
@@ -93,7 +93,7 @@
           "Family": "${family}",
           "Description": "${description}",
           "Licenses": [
-            "projects/windows-cloud/global/licenses/windows-server-2022",
+            "projects/windows-cloud/global/licenses/windows-server-2025",
             "projects/windows-cloud/global/licenses/windows-server-core"
           ],
           "GuestOsFeatures": [

diff --git a/daisy_workflows/image_build/windows/windows-server-2025-dc-core-uefi-payg.wf.json b/daisy_workflows/image_build/windows/windows-server-2025-dc-core-uefi-payg.wf.json
@@ -93,7 +93,7 @@
           "Family": "${family}",
           "Description": "${description}",
           "Licenses": [
-            "projects/windows-cloud/global/licenses/windows-server-2022-dc",
+            "projects/windows-cloud/global/licenses/windows-server-2025-dc",
             "projects/windows-cloud/global/licenses/windows-server-core"
           ],
           "GuestOsFeatures": [

diff --git a/daisy_workflows/image_build/windows/windows-server-2025-dc-uefi-byol.wf.json b/daisy_workflows/image_build/windows/windows-server-2025-dc-uefi-byol.wf.json
@@ -93,7 +93,7 @@
           "Family": "${family}",
           "Description": "${description}",
           "Licenses": [
-            "projects/windows-cloud/global/licenses/windows-server-2025-dc"
+            "projects/windows-cloud/global/licenses/windows-server-2025-byol"
           ],
           "GuestOsFeatures": [
             {

diff --git a/daisy_workflows/image_build/windows/windows-server-2025-dc-uefi-payg.wf.json b/daisy_workflows/image_build/windows/windows-server-2025-dc-uefi-payg.wf.json
@@ -93,7 +93,7 @@
           "Family": "${family}",
           "Description": "${description}",
           "Licenses": [
-            "projects/windows-cloud/global/licenses/windows-server-2022-dc"
+            "projects/windows-cloud/global/licenses/windows-server-2025-dc"
           ],
           "GuestOsFeatures": [
             {

diff --git a/daisy_workflows/image_build/windows/windows-server-2025-uefi-byol.wf.json b/daisy_workflows/image_build/windows/windows-server-2025-uefi-byol.wf.json
@@ -93,7 +93,7 @@
           "Family": "${family}",
           "Description": "${description}",
           "Licenses": [
-            "projects/windows-cloud/global/licenses/windows-server-2025"
+            "projects/windows-cloud/global/licenses/windows-server-2025-byol"
           ],
           "GuestOsFeatures": [
             {

diff --git a/daisy_workflows/image_build/windows/windows-server-2025-uefi-payg.wf.json b/daisy_workflows/image_build/windows/windows-server-2025-uefi-payg.wf.json
@@ -93,7 +93,7 @@
           "Family": "${family}",
           "Description": "${description}",
           "Licenses": [
-            "projects/windows-cloud/global/licenses/windows-server-2022"
+            "projects/windows-cloud/global/licenses/windows-server-2025"
           ],
           "GuestOsFeatures": [
             {