Skip to content

Commit 44b2248

Browse files
anamnavianamnavi
authored
Remove test-deps images from build for now (#816)
* Remove test-deps images from build for now * update yamls with latest changes from master * remove code from releaseJob.yml to add test-deps images to build
1 parent 1a3b48c commit 44b2248

File tree

5 files changed

+6
-289
lines changed

5 files changed

+6
-289
lines changed

‎.vsts-ci/ltsReleaseStage.yml

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@ stages:
1010
dependsOn: ['StageResolveVersionandYaml']
1111
displayName: Build lts
1212
jobs:
13-
- template: /.vsts-ci/releaseJob.yml@self
14-
parameters:
15-
archName: 'Build_linux_amd64'
16-
imageName: alpine316
17-
artifactSuffix: alpine316
18-
poolOS: 'linux'
19-
poolHostArchitecture: 'amd64'
20-
buildKitValue: 1
21-
channel: ${{ parameters.channel }}
22-
channelPath: ${{ parameters.channelPath }}
2313
- template: /.vsts-ci/releaseJob.yml@self
2414
parameters:
2515
archName: 'Build_linux_amd64'
@@ -30,16 +20,6 @@ stages:
3020
buildKitValue: 1
3121
channel: ${{ parameters.channel }}
3222
channelPath: ${{ parameters.channelPath }}
33-
- template: /.vsts-ci/releaseJob.yml@self
34-
parameters:
35-
archName: 'Build_linux_amd64'
36-
imageName: debian11
37-
artifactSuffix: debian11
38-
poolOS: 'linux'
39-
poolHostArchitecture: 'amd64'
40-
buildKitValue: 1
41-
channel: ${{ parameters.channel }}
42-
channelPath: ${{ parameters.channelPath }}
4323
- template: /.vsts-ci/releaseJob.yml@self
4424
parameters:
4525
archName: 'Build_linux_amd64'
@@ -144,63 +124,3 @@ stages:
144124
maxParallel: 3
145125
channel: ${{ parameters.channel }}
146126
channelPath: ${{ parameters.channelPath }}
147-
- template: /.vsts-ci/releaseJob.yml@self
148-
parameters:
149-
archName: 'Build_linux_amd64'
150-
imageName: alpine316\test-deps
151-
artifactSuffix: alpine316_test_deps
152-
poolOS: 'linux'
153-
poolHostArchitecture: 'amd64'
154-
buildKitValue: 1
155-
channel: ${{ parameters.channel }}
156-
channelPath: ${{ parameters.channelPath }}
157-
- template: /.vsts-ci/releaseJob.yml@self
158-
parameters:
159-
archName: 'Build_linux_amd64'
160-
imageName: alpine317\test-deps
161-
artifactSuffix: alpine317_test_deps
162-
poolOS: 'linux'
163-
poolHostArchitecture: 'amd64'
164-
buildKitValue: 1
165-
channel: ${{ parameters.channel }}
166-
channelPath: ${{ parameters.channelPath }}
167-
- template: /.vsts-ci/releaseJob.yml@self
168-
parameters:
169-
archName: 'Build_linux_amd64'
170-
imageName: debian11\test-deps
171-
artifactSuffix: debian11_test_deps
172-
poolOS: 'linux'
173-
poolHostArchitecture: 'amd64'
174-
buildKitValue: 1
175-
channel: ${{ parameters.channel }}
176-
channelPath: ${{ parameters.channelPath }}
177-
- template: /.vsts-ci/releaseJob.yml@self
178-
parameters:
179-
archName: 'Build_linux_amd64'
180-
imageName: ubi8\test-deps
181-
artifactSuffix: ubi8_test_deps
182-
poolOS: 'linux'
183-
poolHostArchitecture: 'amd64'
184-
buildKitValue: 1
185-
channel: ${{ parameters.channel }}
186-
channelPath: ${{ parameters.channelPath }}
187-
- template: /.vsts-ci/releaseJob.yml@self
188-
parameters:
189-
archName: 'Build_linux_amd64'
190-
imageName: ubuntu20.04\test-deps
191-
artifactSuffix: ubuntu2004_test_deps
192-
poolOS: 'linux'
193-
poolHostArchitecture: 'amd64'
194-
buildKitValue: 1
195-
channel: ${{ parameters.channel }}
196-
channelPath: ${{ parameters.channelPath }}
197-
- template: /.vsts-ci/releaseJob.yml@self
198-
parameters:
199-
archName: 'Build_linux_amd64'
200-
imageName: ubuntu22.04\test-deps
201-
artifactSuffix: ubuntu2204_test_deps
202-
poolOS: 'linux'
203-
poolHostArchitecture: 'amd64'
204-
buildKitValue: 1
205-
channel: ${{ parameters.channel }}
206-
channelPath: ${{ parameters.channelPath }}

‎.vsts-ci/previewReleaseStage.yml

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@ stages:
1010
dependsOn: ['StageResolveVersionandYaml']
1111
displayName: Build preview
1212
jobs:
13-
- template: /.vsts-ci/releaseJob.yml@self
14-
parameters:
15-
archName: 'Build_linux_amd64'
16-
imageName: alpine316
17-
artifactSuffix: alpine316
18-
poolOS: 'linux'
19-
poolHostArchitecture: 'amd64'
20-
buildKitValue: 1
21-
channel: ${{ parameters.channel }}
22-
channelPath: ${{ parameters.channelPath }}
2313
- template: /.vsts-ci/releaseJob.yml@self
2414
parameters:
2515
archName: 'Build_linux_amd64'
@@ -30,16 +20,6 @@ stages:
3020
buildKitValue: 1
3121
channel: ${{ parameters.channel }}
3222
channelPath: ${{ parameters.channelPath }}
33-
- template: /.vsts-ci/releaseJob.yml@self
34-
parameters:
35-
archName: 'Build_linux_amd64'
36-
imageName: debian11
37-
artifactSuffix: debian11
38-
poolOS: 'linux'
39-
poolHostArchitecture: 'amd64'
40-
buildKitValue: 1
41-
channel: ${{ parameters.channel }}
42-
channelPath: ${{ parameters.channelPath }}
4323
- template: /.vsts-ci/releaseJob.yml@self
4424
parameters:
4525
archName: 'Build_linux_amd64'
@@ -152,83 +132,3 @@ stages:
152132
maxParallel: 3
153133
channel: ${{ parameters.channel }}
154134
channelPath: ${{ parameters.channelPath }}
155-
- template: /.vsts-ci/releaseJob.yml@self
156-
parameters:
157-
archName: 'Build_linux_amd64'
158-
imageName: alpine316\test-deps
159-
artifactSuffix: alpine316_test_deps
160-
poolOS: 'linux'
161-
poolHostArchitecture: 'amd64'
162-
buildKitValue: 1
163-
channel: ${{ parameters.channel }}
164-
channelPath: ${{ parameters.channelPath }}
165-
- template: /.vsts-ci/releaseJob.yml@self
166-
parameters:
167-
archName: 'Build_linux_amd64'
168-
imageName: alpine317\test-deps
169-
artifactSuffix: alpine317_test_deps
170-
poolOS: 'linux'
171-
poolHostArchitecture: 'amd64'
172-
buildKitValue: 1
173-
channel: ${{ parameters.channel }}
174-
channelPath: ${{ parameters.channelPath }}
175-
- template: /.vsts-ci/releaseJob.yml@self
176-
parameters:
177-
archName: 'Build_linux_amd64'
178-
imageName: debian11\test-deps
179-
artifactSuffix: debian11_test_deps
180-
poolOS: 'linux'
181-
poolHostArchitecture: 'amd64'
182-
buildKitValue: 1
183-
channel: ${{ parameters.channel }}
184-
channelPath: ${{ parameters.channelPath }}
185-
- template: /.vsts-ci/releaseJob.yml@self
186-
parameters:
187-
archName: 'Build_linux_amd64'
188-
imageName: debian12\test-deps
189-
artifactSuffix: debian12_test_deps
190-
poolOS: 'linux'
191-
poolHostArchitecture: 'amd64'
192-
buildKitValue: 1
193-
channel: ${{ parameters.channel }}
194-
channelPath: ${{ parameters.channelPath }}
195-
- template: /.vsts-ci/releaseJob.yml@self
196-
parameters:
197-
archName: 'Build_linux_amd64'
198-
imageName: ubi8\test-deps
199-
artifactSuffix: ubi8_test_deps
200-
poolOS: 'linux'
201-
poolHostArchitecture: 'amd64'
202-
buildKitValue: 1
203-
channel: ${{ parameters.channel }}
204-
channelPath: ${{ parameters.channelPath }}
205-
- template: /.vsts-ci/releaseJob.yml@self
206-
parameters:
207-
archName: 'Build_linux_amd64'
208-
imageName: ubi9\test-deps
209-
artifactSuffix: ubi9_test_deps
210-
poolOS: 'linux'
211-
poolHostArchitecture: 'amd64'
212-
buildKitValue: 1
213-
channel: ${{ parameters.channel }}
214-
channelPath: ${{ parameters.channelPath }}
215-
- template: /.vsts-ci/releaseJob.yml@self
216-
parameters:
217-
archName: 'Build_linux_amd64'
218-
imageName: ubuntu20.04\test-deps
219-
artifactSuffix: ubuntu2004_test_deps
220-
poolOS: 'linux'
221-
poolHostArchitecture: 'amd64'
222-
buildKitValue: 1
223-
channel: ${{ parameters.channel }}
224-
channelPath: ${{ parameters.channelPath }}
225-
- template: /.vsts-ci/releaseJob.yml@self
226-
parameters:
227-
archName: 'Build_linux_amd64'
228-
imageName: ubuntu22.04\test-deps
229-
artifactSuffix: ubuntu2204_test_deps
230-
poolOS: 'linux'
231-
poolHostArchitecture: 'amd64'
232-
buildKitValue: 1
233-
channel: ${{ parameters.channel }}
234-
channelPath: ${{ parameters.channelPath }}

‎.vsts-ci/releaseJob.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,6 @@ jobs:
6666
- pwsh: |
6767
$finalImageName = '${{ parameters.imageName }}'
6868
$finalContextFolder = 'docker'
69-
$testDepsString = 'test-deps'
70-
if ($finalImageName.Contains($testDepsString))
71-
{
72-
$finalImageName = $finalImageName.TrimEnd("\$testDepsString")
73-
$finalContextFolder = Join-Path -Path $testDepsString -ChildPath $finalContextFolder
74-
}
7569
$pathToContextFolder = "${{ parameters.channelPath }}/$finalImageName/$finalContextFolder"
7670
Write-Host "##vso[task.setvariable variable=dockerBuildImageName;isOutput=true]$finalImageName"
7771
Write-Host "##vso[task.setvariable variable=dockerBuildContextFolder;isOutput=true]$finalContextFolder"

‎.vsts-ci/stableReleaseStage.yml

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@ stages:
1010
dependsOn: ['StageResolveVersionandYaml']
1111
displayName: Build stable
1212
jobs:
13-
- template: /.vsts-ci/releaseJob.yml@self
14-
parameters:
15-
archName: 'Build_linux_amd64'
16-
imageName: alpine316
17-
artifactSuffix: alpine316
18-
poolOS: 'linux'
19-
poolHostArchitecture: 'amd64'
20-
buildKitValue: 1
21-
channel: ${{ parameters.channel }}
22-
channelPath: ${{ parameters.channelPath }}
2313
- template: /.vsts-ci/releaseJob.yml@self
2414
parameters:
2515
archName: 'Build_linux_amd64'
@@ -30,16 +20,6 @@ stages:
3020
buildKitValue: 1
3121
channel: ${{ parameters.channel }}
3222
channelPath: ${{ parameters.channelPath }}
33-
- template: /.vsts-ci/releaseJob.yml@self
34-
parameters:
35-
archName: 'Build_linux_amd64'
36-
imageName: debian11
37-
artifactSuffix: debian11
38-
poolOS: 'linux'
39-
poolHostArchitecture: 'amd64'
40-
buildKitValue: 1
41-
channel: ${{ parameters.channel }}
42-
channelPath: ${{ parameters.channelPath }}
4323
- template: /.vsts-ci/releaseJob.yml@self
4424
parameters:
4525
archName: 'Build_linux_amd64'
@@ -152,83 +132,3 @@ stages:
152132
maxParallel: 3
153133
channel: ${{ parameters.channel }}
154134
channelPath: ${{ parameters.channelPath }}
155-
- template: /.vsts-ci/releaseJob.yml@self
156-
parameters:
157-
archName: 'Build_linux_amd64'
158-
imageName: alpine316\test-deps
159-
artifactSuffix: alpine316_test_deps
160-
poolOS: 'linux'
161-
poolHostArchitecture: 'amd64'
162-
buildKitValue: 1
163-
channel: ${{ parameters.channel }}
164-
channelPath: ${{ parameters.channelPath }}
165-
- template: /.vsts-ci/releaseJob.yml@self
166-
parameters:
167-
archName: 'Build_linux_amd64'
168-
imageName: alpine317\test-deps
169-
artifactSuffix: alpine317_test_deps
170-
poolOS: 'linux'
171-
poolHostArchitecture: 'amd64'
172-
buildKitValue: 1
173-
channel: ${{ parameters.channel }}
174-
channelPath: ${{ parameters.channelPath }}
175-
- template: /.vsts-ci/releaseJob.yml@self
176-
parameters:
177-
archName: 'Build_linux_amd64'
178-
imageName: debian11\test-deps
179-
artifactSuffix: debian11_test_deps
180-
poolOS: 'linux'
181-
poolHostArchitecture: 'amd64'
182-
buildKitValue: 1
183-
channel: ${{ parameters.channel }}
184-
channelPath: ${{ parameters.channelPath }}
185-
- template: /.vsts-ci/releaseJob.yml@self
186-
parameters:
187-
archName: 'Build_linux_amd64'
188-
imageName: debian12\test-deps
189-
artifactSuffix: debian12_test_deps
190-
poolOS: 'linux'
191-
poolHostArchitecture: 'amd64'
192-
buildKitValue: 1
193-
channel: ${{ parameters.channel }}
194-
channelPath: ${{ parameters.channelPath }}
195-
- template: /.vsts-ci/releaseJob.yml@self
196-
parameters:
197-
archName: 'Build_linux_amd64'
198-
imageName: ubi8\test-deps
199-
artifactSuffix: ubi8_test_deps
200-
poolOS: 'linux'
201-
poolHostArchitecture: 'amd64'
202-
buildKitValue: 1
203-
channel: ${{ parameters.channel }}
204-
channelPath: ${{ parameters.channelPath }}
205-
- template: /.vsts-ci/releaseJob.yml@self
206-
parameters:
207-
archName: 'Build_linux_amd64'
208-
imageName: ubi9\test-deps
209-
artifactSuffix: ubi9_test_deps
210-
poolOS: 'linux'
211-
poolHostArchitecture: 'amd64'
212-
buildKitValue: 1
213-
channel: ${{ parameters.channel }}
214-
channelPath: ${{ parameters.channelPath }}
215-
- template: /.vsts-ci/releaseJob.yml@self
216-
parameters:
217-
archName: 'Build_linux_amd64'
218-
imageName: ubuntu20.04\test-deps
219-
artifactSuffix: ubuntu2004_test_deps
220-
poolOS: 'linux'
221-
poolHostArchitecture: 'amd64'
222-
buildKitValue: 1
223-
channel: ${{ parameters.channel }}
224-
channelPath: ${{ parameters.channelPath }}
225-
- template: /.vsts-ci/releaseJob.yml@self
226-
parameters:
227-
archName: 'Build_linux_amd64'
228-
imageName: ubuntu22.04\test-deps
229-
artifactSuffix: ubuntu2204_test_deps
230-
poolOS: 'linux'
231-
poolHostArchitecture: 'amd64'
232-
buildKitValue: 1
233-
channel: ${{ parameters.channel }}
234-
channelPath: ${{ parameters.channelPath }}

‎build.ps1

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -737,10 +737,13 @@ End {
737737
foreach ($osGroup in $osGroups) {
738738
$architectureGroups = $osGroup.Group | Group-Object -Property Architecture
739739
foreach ($architectureGroup in $architectureGroups) {
740-
# Note: For each image to be built (including test-deps images) the <channel>ReleaseStage.yml file needs to have a template call for the image.
740+
# Note: For each image to be built the <channel>ReleaseStage.yml file needs to have a template call for the image.
741741
foreach ($tag in $architectureGroup.Group | Sort-Object -Property dockerfile) {
742-
Write-Verbose -Verbose "calling method to populate template call in yaml file for channel: $channelName for image: $($tag.Name)"
743-
Get-TemplatePopulatedYaml -YamlFilePath $channelReleaseStagePath -ImageInfo $tag
742+
if (!$tag.Name.ToString().Contains('test-deps'))
743+
{
744+
Write-Verbose -Verbose "calling method to populate template call in yaml file for channel: $channelName for image: $($tag.Name)"
745+
Get-TemplatePopulatedYaml -YamlFilePath $channelReleaseStagePath -ImageInfo $tag
746+
}
744747
}
745748
}
746749
}

0 commit comments

Comments
 (0)