Adding Windows BYOL publish files (#2378)

* Adding Windows BYOL publish files * Updating to be a variable * Update windows-server-2016-dc-uefi.publish.json
GoogleCloudPlatform · Oct 15, 2024 · 79ab714 · 79ab714
1 parent 561a27f
commit 79ab714
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 1 deletion.
diff --git a/daisy_workflows/build-publish/windows/windows-server-2016-dc-uefi.publish.json b/daisy_workflows/build-publish/windows/windows-server-2016-dc-uefi.publish.json
@@ -20,6 +20,11 @@
   "PublishProject": "google.com:windows-internal",
   "ComputeEndpoint": {{$endpoint}},
   "DeleteAfter": {{$delete_after}},
+  {{- else if eq .environment "byol" -}}
+  "WorkProject": {{$work_project}},
+  "PublishProject": "bct-prod-images",
+  "ComputeEndpoint": {{$endpoint}},
+  "DeleteAfter": {{$delete_after}},
   {{- else -}}
   "WorkProject": {{$work_project}},
   "PublishProject": "bct-prod-images",
@@ -30,13 +35,20 @@
   {{$time := trimPrefix .publish_version "v"}}
   "Images": [
     {
+      {{- if eq .environment "byol" -}}
+      "Prefix": "windows-server-2016-byol",
+      "Family": "windows-2016-byol",
+      {{- else -}}
       "Prefix": "windows-server-2016-dc",
       "Family": "windows-2016",
+      {{- end}}
       "Description": "Microsoft, Windows Server, 2016 Datacenter, 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 if eq .environment "byol" -}}
+        "projects/windows-cloud/global/licenses/windows-server-2016-byol"
         {{- else -}}
         "projects/windows-cloud/global/licenses/windows-server-2016-dc"
         {{- end}}

diff --git a/daisy_workflows/build-publish/windows/windows-server-2019-dc-uefi.publish.json b/daisy_workflows/build-publish/windows/windows-server-2019-dc-uefi.publish.json
@@ -20,6 +20,11 @@
   "PublishProject": "google.com:windows-internal",
   "ComputeEndpoint": {{$endpoint}},
   "DeleteAfter": {{$delete_after}},
+  {{- else if eq .environment "byol" -}}
+  "WorkProject": {{$work_project}},
+  "PublishProject": "bct-prod-images",
+  "ComputeEndpoint": {{$endpoint}},
+  "DeleteAfter": {{$delete_after}},
   {{- else -}}
   "WorkProject": {{$work_project}},
   "PublishProject": "bct-prod-images",
@@ -30,13 +35,20 @@
   {{$time := trimPrefix .publish_version "v"}}
   "Images": [
     {
+      {{- if eq .environment "byol" -}}
+      "Prefix": "windows-server-2019-byol",
+      "Family": "windows-2019-byol",
+      {{- else -}}
       "Prefix": "windows-server-2019-dc",
       "Family": "windows-2019",
+      {{- end}}
       "Description": "Microsoft, Windows Server, 2019 Datacenter, 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 if eq .environment "byol" -}}
+        "projects/windows-cloud/global/licenses/windows-server-2019-byol"
         {{- else -}}
         "projects/windows-cloud/global/licenses/windows-server-2019-dc"
         {{- end}}

diff --git a/daisy_workflows/build-publish/windows/windows-server-2022-dc-uefi.publish.json b/daisy_workflows/build-publish/windows/windows-server-2022-dc-uefi.publish.json
@@ -20,6 +20,11 @@
   "PublishProject": "google.com:windows-internal",
   "ComputeEndpoint": {{$endpoint}},
   "DeleteAfter": {{$delete_after}},
+  {{- else if eq .environment "byol" -}}
+  "WorkProject": {{$work_project}},
+  "PublishProject": "bct-prod-images",
+  "ComputeEndpoint": {{$endpoint}},
+  "DeleteAfter": {{$delete_after}},
   {{- else -}}
   "WorkProject": {{$work_project}},
   "PublishProject": "bct-prod-images",
@@ -30,13 +35,20 @@
   {{$time := trimPrefix .publish_version "v"}}
   "Images": [
     {
+      {{- if eq .environment "byol" -}}
+      "Prefix": "windows-server-2022-byol",
+      "Family": "windows-2022-byol",
+      {{- else -}}
       "Prefix": "windows-server-2022-dc",
       "Family": "windows-2022",
+      {{- end}}
       "Description": "Microsoft, Windows Server, 2022 Datacenter, 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 if eq .environment "byol" -}}
+        "projects/windows-cloud/global/licenses/windows-server-2022-byol"
         {{- else -}}
         "projects/windows-cloud/global/licenses/windows-server-2022-dc"
         {{- 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
@@ -20,6 +20,11 @@
   "PublishProject": "google.com:windows-internal",
   "ComputeEndpoint": {{$endpoint}},
   "DeleteAfter": {{$delete_after}},
+  {{- else if eq .environment "byol" -}}
+  "WorkProject": {{$work_project}},
+  "PublishProject": "bct-prod-images",
+  "ComputeEndpoint": {{$endpoint}},
+  "DeleteAfter": {{$delete_after}},
   {{- else -}}
   "WorkProject": {{$work_project}},
   "PublishProject": "bct-prod-images",
@@ -30,15 +35,22 @@
   {{$time := trimPrefix .publish_version "v"}}
   "Images": [
     {
+      {{- if eq .environment "byol" -}}
+      "Prefix": "windows-server-2025-byol",
+      "Family": "windows-2025-byol",
+      {{- else -}}
       "Prefix": "windows-server-2025-dc",
       "Family": "windows-2025",
+      {{- end}}
       "Description": "Microsoft, Windows Server, 2025 Datacenter Preview, 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 if eq .environment "byol" -}}
+        "projects/windows-cloud/global/licenses/windows-server-2025-byol"
         {{- else -}}
-        "projects/windows-cloud/global/licenses/windows-server-2022-dc"
+        "projects/windows-cloud/global/licenses/windows-server-2025-dc"
         {{- end}}
       ],
       "GuestOsFeatures": {{$guest_features}}