Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update server and server core publish workflows for byol #2426

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
Expand All @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
Expand All @@ -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": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
Expand All @@ -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": [
Expand Down