Skip to content

Commit b480a95

Browse files
anamnavianamnavi
authored
delete mariner2 test-deps, update buildHelper func to populate poolHostVersion, and update channel based ReleaseStage.yml files (#807)
1 parent 2a940c6 commit b480a95

File tree

16 files changed

+17
-251
lines changed

16 files changed

+17
-251
lines changed

Diff for: ‎.vsts-ci/ltsReleaseStage.yml

+6-14
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ stages:
106106
imageName: nanoserver1809
107107
artifactSuffix: nanoserver1809
108108
poolOS: 'windows'
109-
poolHostArchitecture: 'amd64'
110109
maxParallel: 3
111110
channel: ${{ parameters.channel }}
112111
channelPath: ${{ parameters.channelPath }}
@@ -116,7 +115,8 @@ stages:
116115
imageName: nanoserver2022
117116
artifactSuffix: nanoserver2022
118117
poolOS: 'windows'
119-
poolHostArchitecture: 'amd64'
118+
poolHostVersion: '1ESWindows2022'
119+
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
120120
maxParallel: 3
121121
channel: ${{ parameters.channel }}
122122
channelPath: ${{ parameters.channelPath }}
@@ -126,7 +126,8 @@ stages:
126126
imageName: windowsserver2022
127127
artifactSuffix: windowsserver2022
128128
poolOS: 'windows'
129-
poolHostArchitecture: 'amd64'
129+
poolHostVersion: '1ESWindows2022'
130+
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
130131
maxParallel: 3
131132
channel: ${{ parameters.channel }}
132133
channelPath: ${{ parameters.channelPath }}
@@ -136,7 +137,8 @@ stages:
136137
imageName: windowsservercore2022
137138
artifactSuffix: windowsservercore2022
138139
poolOS: 'windows'
139-
poolHostArchitecture: 'amd64'
140+
poolHostVersion: '1ESWindows2022'
141+
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
140142
maxParallel: 3
141143
channel: ${{ parameters.channel }}
142144
channelPath: ${{ parameters.channelPath }}
@@ -170,16 +172,6 @@ stages:
170172
buildKitValue: 1
171173
channel: ${{ parameters.channel }}
172174
channelPath: ${{ parameters.channelPath }}
173-
- template: /.vsts-ci/releasePhase.yml@self
174-
parameters:
175-
archName: 'Build_linux_amd64'
176-
imageName: mariner2\test-deps
177-
artifactSuffix: mariner2_test_deps
178-
poolOS: 'linux'
179-
poolHostArchitecture: 'amd64'
180-
buildKitValue: 1
181-
channel: ${{ parameters.channel }}
182-
channelPath: ${{ parameters.channelPath }}
183175
- template: /.vsts-ci/releasePhase.yml@self
184176
parameters:
185177
archName: 'Build_linux_amd64'

Diff for: ‎.vsts-ci/previewReleaseStage.yml

+4-12
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ stages:
136136
imageName: windowsserver2022
137137
artifactSuffix: windowsserver2022
138138
poolOS: 'windows'
139-
poolHostArchitecture: 'amd64'
139+
poolHostVersion: '1ESWindows2022'
140+
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
140141
maxParallel: 3
141142
channel: ${{ parameters.channel }}
142143
channelPath: ${{ parameters.channelPath }}
@@ -146,7 +147,8 @@ stages:
146147
imageName: windowsservercore2022
147148
artifactSuffix: windowsservercore2022
148149
poolOS: 'windows'
149-
poolHostArchitecture: 'amd64'
150+
poolHostVersion: '1ESWindows2022'
151+
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
150152
maxParallel: 3
151153
channel: ${{ parameters.channel }}
152154
channelPath: ${{ parameters.channelPath }}
@@ -190,16 +192,6 @@ stages:
190192
buildKitValue: 1
191193
channel: ${{ parameters.channel }}
192194
channelPath: ${{ parameters.channelPath }}
193-
- template: /.vsts-ci/releasePhase.yml@self
194-
parameters:
195-
archName: 'Build_linux_amd64'
196-
imageName: mariner2\test-deps
197-
artifactSuffix: mariner2_test_deps
198-
poolOS: 'linux'
199-
poolHostArchitecture: 'amd64'
200-
buildKitValue: 1
201-
channel: ${{ parameters.channel }}
202-
channelPath: ${{ parameters.channelPath }}
203195
- template: /.vsts-ci/releasePhase.yml@self
204196
parameters:
205197
archName: 'Build_linux_amd64'

Diff for: ‎.vsts-ci/stableReleaseStage.yml

+4-12
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ stages:
136136
imageName: windowsserver2022
137137
artifactSuffix: windowsserver2022
138138
poolOS: 'windows'
139-
poolHostArchitecture: 'amd64'
139+
poolHostVersion: '1ESWindows2022'
140+
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
140141
maxParallel: 3
141142
channel: ${{ parameters.channel }}
142143
channelPath: ${{ parameters.channelPath }}
@@ -146,7 +147,8 @@ stages:
146147
imageName: windowsservercore2022
147148
artifactSuffix: windowsservercore2022
148149
poolOS: 'windows'
149-
poolHostArchitecture: 'amd64'
150+
poolHostVersion: '1ESWindows2022'
151+
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
150152
maxParallel: 3
151153
channel: ${{ parameters.channel }}
152154
channelPath: ${{ parameters.channelPath }}
@@ -190,16 +192,6 @@ stages:
190192
buildKitValue: 1
191193
channel: ${{ parameters.channel }}
192194
channelPath: ${{ parameters.channelPath }}
193-
- template: /.vsts-ci/releasePhase.yml@self
194-
parameters:
195-
archName: 'Build_linux_amd64'
196-
imageName: mariner2\test-deps
197-
artifactSuffix: mariner2_test_deps
198-
poolOS: 'linux'
199-
poolHostArchitecture: 'amd64'
200-
buildKitValue: 1
201-
channel: ${{ parameters.channel }}
202-
channelPath: ${{ parameters.channelPath }}
203195
- template: /.vsts-ci/releasePhase.yml@self
204196
parameters:
205197
archName: 'Build_linux_amd64'

Diff for: ‎release/7-2/mariner2/meta.json

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
{"Tag": "2.0"}
88
],
99
"ShortDistroName": "mariner",
10-
"SubImage": "test-deps",
1110
"TestProperties": {
1211
"size": 387
1312
},

Diff for: ‎release/7-2/mariner2/test-deps/docker/Dockerfile

-34
This file was deleted.

Diff for: ‎release/7-2/mariner2/test-deps/meta.json

-17
This file was deleted.

Diff for: ‎release/7-3/mariner2/meta.json

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
{"Tag": "2.0"}
88
],
99
"ShortDistroName": "mariner",
10-
"SubImage": "test-deps",
1110
"TestProperties": {
1211
"size": 332
1312
},

Diff for: ‎release/7-3/mariner2/test-deps/docker/Dockerfile

-35
This file was deleted.

Diff for: ‎release/7-3/mariner2/test-deps/meta.json

-17
This file was deleted.

Diff for: ‎release/7-4/mariner2/meta.json

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
{"Tag": "2.0"}
88
],
99
"ShortDistroName": "mariner",
10-
"SubImage": "test-deps",
1110
"TestProperties": {
1211
"size": 335
1312
},

Diff for: ‎release/7-4/mariner2/test-deps/docker/Dockerfile

-35
This file was deleted.

Diff for: ‎release/7-4/mariner2/test-deps/meta.json

-17
This file was deleted.

Diff for: ‎release/7-5/mariner2/meta.json

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
{"Tag": "2.0"}
88
],
99
"ShortDistroName": "mariner",
10-
"SubImage": "test-deps",
1110
"TestProperties": {
1211
"size": 335
1312
},

Diff for: ‎release/7-5/mariner2/test-deps/docker/Dockerfile

-35
This file was deleted.

Diff for: ‎release/7-5/mariner2/test-deps/meta.json

-17
This file was deleted.

Diff for: ‎tools/buildHelper/buildHelper.psm1

+3-2
Original file line numberDiff line numberDiff line change
@@ -1096,15 +1096,16 @@ function Get-TemplatePopulatedYaml {
10961096
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)
10971097
Add-Content -Path $YamlFilePath -Value "$($sixSpace)artifactSuffix: $artifactSuffix" # i.e artifactSuffix: alpine317_test_deps
10981098
Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolOS: '$poolOS'"
1099-
Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolHostArchitecture: '$architecture'"
11001099
if ($poolOS -eq "linux")
11011100
{
1101+
# only need to specify host architecture for the pool for linux
1102+
Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolHostArchitecture: '$architecture'"
11021103
# only need to specify buildKitValue=1 for linux
11031104
Add-Content -Path $YamlFilePath -Value "$($sixSpace)buildKitValue: 1"
11041105
}
11051106
else
11061107
{
1107-
if ($imageName -contains "2022")
1108+
if ($imageName.Contains("2022"))
11081109
{
11091110
Add-Content -Path $YamlFilePath -Value "$($sixSpace)poolHostVersion: '1ESWindows2022'"
11101111
Add-Content -Path $YamlFilePath -Value "$($sixSpace)windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'"

0 commit comments

Comments
 (0)