Update server and server core publish workflows for byol (#2426)

* Update server and server core publish workflows for byol Add support for byol environment publishing recently added to concourse * Add publish project for byol environment Needed to avoid image name conflict on byol publishes * fix 2025 core image families
GoogleCloudPlatform · Feb 7, 2025 · 2515cbd · 2515cbd
1 parent e01efb8
commit 2515cbd
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 14 deletions.
diff --git a/daisy_workflows/build-publish/windows/windows-server-2016-dc-core-uefi.publish.json b/daisy_workflows/build-publish/windows/windows-server-2016-dc-core-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": "cloud-cluster-guest-stresstest",
+  "ComputeEndpoint": {{$endpoint}},
+  "DeleteAfter": {{$delete_after}},
   {{- else -}}
   "WorkProject": {{$work_project}},
   "PublishProject": "bct-prod-images",
@@ -30,14 +35,21 @@
   {{$time := trimPrefix .publish_version "v"}}
   "Images": [
     {
-      "Prefix": "windows-server-2016-dc-core",
+      {{- if eq .environment "byol" -}}
+      "Family": "windows-2016-core-byol",
+      {{- else -}}
       "Family": "windows-2016-core",
+      {{- end}}
+      "Prefix": "windows-server-2016-dc-core",
       "Description": "Microsoft, Windows Server, 2016 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 if eq .environment "byol" -}}
+        "projects/windows-cloud/global/licenses/windows-server-2016-byol",
+        "projects/windows-cloud/global/licenses/windows-server-core"
         {{- else -}}
         "projects/windows-cloud/global/licenses/windows-server-2016-dc",
         "projects/windows-cloud/global/licenses/windows-server-core"

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
@@ -22,7 +22,7 @@
   "DeleteAfter": {{$delete_after}},
   {{- else if eq .environment "byol" -}}
   "WorkProject": {{$work_project}},
-  "PublishProject": "bct-prod-images",
+  "PublishProject": "cloud-cluster-guest-stresstest",
   "ComputeEndpoint": {{$endpoint}},
   "DeleteAfter": {{$delete_after}},
   {{- else -}}

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

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
@@ -22,7 +22,7 @@
   "DeleteAfter": {{$delete_after}},
   {{- else if eq .environment "byol" -}}
   "WorkProject": {{$work_project}},
-  "PublishProject": "bct-prod-images",
+  "PublishProject": "cloud-cluster-guest-stresstest",
   "ComputeEndpoint": {{$endpoint}},
   "DeleteAfter": {{$delete_after}},
   {{- else -}}
@@ -36,12 +36,11 @@
   "Images": [
     {
       {{- if eq .environment "byol" -}}
-      "Prefix": "windows-server-2019-byol",
       "Family": "windows-2019-byol",
       {{- else -}}
-      "Prefix": "windows-server-2019-dc",
       "Family": "windows-2019",
       {{- end}}
+      "Prefix": "windows-server-2019-dc",
       "Description": "Microsoft, Windows Server, 2019 Datacenter, Server with Desktop Experience, x64 built on {{$time}}",
       "Architecture": "X86_64",
       "Licenses": [

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

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
@@ -22,7 +22,7 @@
   "DeleteAfter": {{$delete_after}},
   {{- else if eq .environment "byol" -}}
   "WorkProject": {{$work_project}},
-  "PublishProject": "bct-prod-images",
+  "PublishProject": "cloud-cluster-guest-stresstest",
   "ComputeEndpoint": {{$endpoint}},
   "DeleteAfter": {{$delete_after}},
   {{- else -}}
@@ -36,12 +36,11 @@
   "Images": [
     {
       {{- if eq .environment "byol" -}}
-      "Prefix": "windows-server-2022-byol",
       "Family": "windows-2022-byol",
       {{- else -}}
-      "Prefix": "windows-server-2022-dc",
       "Family": "windows-2022",
       {{- end}}
+      "Prefix": "windows-server-2022-dc",
       "Description": "Microsoft, Windows Server, 2022 Datacenter, Server with Desktop Experience, x64 built on {{$time}}",
       "Architecture": "X86_64",
       "Licenses": [

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
@@ -20,6 +20,11 @@
   "PublishProject": "google.com:windows-internal",
   "ComputeEndpoint": {{$endpoint}},
   "DeleteAfter": {{$delete_after}},
+  {{- else if eq .environment "byol" -}}
+  "WorkProject": {{$work_project}},
+  "PublishProject": "cloud-cluster-guest-stresstest",
+  "ComputeEndpoint": {{$endpoint}},
+  "DeleteAfter": {{$delete_after}},
   {{- else -}}
   "WorkProject": {{$work_project}},
   "PublishProject": "bct-prod-images",
@@ -30,14 +35,21 @@
   {{$time := trimPrefix .publish_version "v"}}
   "Images": [
     {
-      "Prefix": "windows-server-2025-dc-core",
+      {{- if eq .environment "byol" -}}
+      "Family": "windows-2025-core-byol",
+      {{- else -}}
       "Family": "windows-2025-core",
+      {{- end}}
+      "Prefix": "windows-server-2025-dc-core",
       "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 if eq .environment "byol" -}}
+        "projects/windows-cloud/global/licenses/windows-server-2025-byol",
+        "projects/windows-cloud/global/licenses/windows-server-core"
         {{- else -}}
         "projects/windows-cloud/global/licenses/windows-server-2025-dc",
         "projects/windows-cloud/global/licenses/windows-server-core"

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
@@ -22,7 +22,7 @@
   "DeleteAfter": {{$delete_after}},
   {{- else if eq .environment "byol" -}}
   "WorkProject": {{$work_project}},
-  "PublishProject": "bct-prod-images",
+  "PublishProject": "cloud-cluster-guest-stresstest",
   "ComputeEndpoint": {{$endpoint}},
   "DeleteAfter": {{$delete_after}},
   {{- else -}}
@@ -36,12 +36,11 @@
   "Images": [
     {
       {{- if eq .environment "byol" -}}
-      "Prefix": "windows-server-2025-byol",
       "Family": "windows-2025-byol",
       {{- else -}}
-      "Prefix": "windows-server-2025-dc",
       "Family": "windows-2025",
       {{- end}}
+      "Prefix": "windows-server-2025-dc",
       "Description": "Microsoft, Windows Server, 2025 Datacenter, Server with Desktop Experience, x64 built on {{$time}}",
       "Architecture": "X86_64",
       "Licenses": [