Skip to content

delete mariner2 test-deps and update buildHelper func to fix poolHostVersion for windows #807

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 25, 2024
Merged

delete mariner2 test-deps and update buildHelper func to fix poolHostVersion for windows #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 6 additions & 14 deletions .vsts-ci/ltsReleaseStage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ stages:
imageName: nanoserver1809
artifactSuffix: nanoserver1809
poolOS: 'windows'
poolHostArchitecture: 'amd64'
maxParallel: 3
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
Expand All @@ -116,7 +115,8 @@ stages:
imageName: nanoserver2022
artifactSuffix: nanoserver2022
poolOS: 'windows'
poolHostArchitecture: 'amd64'
poolHostVersion: '1ESWindows2022'
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
maxParallel: 3
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
Expand All @@ -126,7 +126,8 @@ stages:
imageName: windowsserver2022
artifactSuffix: windowsserver2022
poolOS: 'windows'
poolHostArchitecture: 'amd64'
poolHostVersion: '1ESWindows2022'
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
maxParallel: 3
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
Expand All @@ -136,7 +137,8 @@ stages:
imageName: windowsservercore2022
artifactSuffix: windowsservercore2022
poolOS: 'windows'
poolHostArchitecture: 'amd64'
poolHostVersion: '1ESWindows2022'
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
maxParallel: 3
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
Expand Down Expand Up @@ -170,16 +172,6 @@ stages:
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releasePhase.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: mariner2\test-deps
artifactSuffix: mariner2_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releasePhase.yml@self
parameters:
archName: 'Build_linux_amd64'
Expand Down
16 changes: 4 additions & 12 deletions .vsts-ci/previewReleaseStage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ stages:
imageName: windowsserver2022
artifactSuffix: windowsserver2022
poolOS: 'windows'
poolHostArchitecture: 'amd64'
poolHostVersion: '1ESWindows2022'
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
maxParallel: 3
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
Expand All @@ -146,7 +147,8 @@ stages:
imageName: windowsservercore2022
artifactSuffix: windowsservercore2022
poolOS: 'windows'
poolHostArchitecture: 'amd64'
poolHostVersion: '1ESWindows2022'
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
maxParallel: 3
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
Expand Down Expand Up @@ -190,16 +192,6 @@ stages:
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releasePhase.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: mariner2\test-deps
artifactSuffix: mariner2_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releasePhase.yml@self
parameters:
archName: 'Build_linux_amd64'
Expand Down
16 changes: 4 additions & 12 deletions .vsts-ci/stableReleaseStage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ stages:
imageName: windowsserver2022
artifactSuffix: windowsserver2022
poolOS: 'windows'
poolHostArchitecture: 'amd64'
poolHostVersion: '1ESWindows2022'
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
maxParallel: 3
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
Expand All @@ -146,7 +147,8 @@ stages:
imageName: windowsservercore2022
artifactSuffix: windowsservercore2022
poolOS: 'windows'
poolHostArchitecture: 'amd64'
poolHostVersion: '1ESWindows2022'
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
maxParallel: 3
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
Expand Down Expand Up @@ -190,16 +192,6 @@ stages:
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releasePhase.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: mariner2\test-deps
artifactSuffix: mariner2_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releasePhase.yml@self
parameters:
archName: 'Build_linux_amd64'
Expand Down
1 change: 0 additions & 1 deletion release/7-2/mariner2/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
{"Tag": "2.0"}
],
"ShortDistroName": "mariner",
"SubImage": "test-deps",
"TestProperties": {
"size": 387
},
Expand Down
34 changes: 0 additions & 34 deletions release/7-2/mariner2/test-deps/docker/Dockerfile
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions release/7-2/mariner2/test-deps/meta.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion release/7-3/mariner2/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
{"Tag": "2.0"}
],
"ShortDistroName": "mariner",
"SubImage": "test-deps",
"TestProperties": {
"size": 332
},
Expand Down
35 changes: 0 additions & 35 deletions release/7-3/mariner2/test-deps/docker/Dockerfile
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions release/7-3/mariner2/test-deps/meta.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion release/7-4/mariner2/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
{"Tag": "2.0"}
],
"ShortDistroName": "mariner",
"SubImage": "test-deps",
"TestProperties": {
"size": 335
},
Expand Down
35 changes: 0 additions & 35 deletions release/7-4/mariner2/test-deps/docker/Dockerfile
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions release/7-4/mariner2/test-deps/meta.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion release/7-5/mariner2/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
{"Tag": "2.0"}
],
"ShortDistroName": "mariner",
"SubImage": "test-deps",
"TestProperties": {
"size": 335
},
Expand Down
35 changes: 0 additions & 35 deletions release/7-5/mariner2/test-deps/docker/Dockerfile
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions release/7-5/mariner2/test-deps/meta.json
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions tools/buildHelper/buildHelper.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,15 +1096,16 @@ function Get-TemplatePopulatedYaml {
Add-Content -Path $YamlFilePath -Value "$($sixSpace)imageName: $imageName" # ie. imageName: alpine317\test-deps (since this differs from artifactSuffix for test-deps images only, we have a separate entry as the yaml param)
Add-Content -Path $YamlFilePath -Value "$($sixSpace)artifactSuffix: $artifactSuffix" # i.e artifactSuffix: alpine317_test_deps
Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolOS: '$poolOS'"
Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolHostArchitecture: '$architecture'"
if ($poolOS -eq "linux")
{
# only need to specify host architecture for the pool for linux
Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolHostArchitecture: '$architecture'"
# only need to specify buildKitValue=1 for linux
Add-Content -Path $YamlFilePath -Value "$($sixSpace)buildKitValue: 1"
}
else
{
if ($imageName -contains "2022")
if ($imageName.Contains("2022"))
{
Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolHostVersion: '1ESWindows2022'"
Add-Content -Path $YamlFilePath -Value "$($sixSpace)windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'"
Expand Down