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.

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

Remove test-deps images from build for now #816

Merged
merged 4 commits into from
Aug 28, 2024
Merged

Remove test-deps images from build for now #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01b7102
Remove test-deps images from build for now
anamnavi Aug 27, 2024
0b66589
Merge branch 'master' of https://github.com/PowerShell/PowerShell-Doc…
anamnavi Aug 27, 2024
3190817
update yamls with latest changes from master
anamnavi Aug 28, 2024
cd7bfc8
remove code from releaseJob.yml to add test-deps images to build
anamnavi Aug 28, 2024
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
80 changes: 0 additions & 80 deletions .vsts-ci/ltsReleaseStage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@ stages:
dependsOn: ['StageResolveVersionandYaml']
displayName: Build lts
jobs:
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: alpine316
artifactSuffix: alpine316
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
Expand All @@ -30,16 +20,6 @@ stages:
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: debian11
artifactSuffix: debian11
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
Expand Down Expand Up @@ -144,63 +124,3 @@ stages:
maxParallel: 3
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: alpine316\test-deps
artifactSuffix: alpine316_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: alpine317\test-deps
artifactSuffix: alpine317_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: debian11\test-deps
artifactSuffix: debian11_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubi8\test-deps
artifactSuffix: ubi8_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu20.04\test-deps
artifactSuffix: ubuntu2004_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu22.04\test-deps
artifactSuffix: ubuntu2204_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
100 changes: 0 additions & 100 deletions .vsts-ci/previewReleaseStage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@ stages:
dependsOn: ['StageResolveVersionandYaml']
displayName: Build preview
jobs:
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: alpine316
artifactSuffix: alpine316
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
Expand All @@ -30,16 +20,6 @@ stages:
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: debian11
artifactSuffix: debian11
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
Expand Down Expand Up @@ -152,83 +132,3 @@ stages:
maxParallel: 3
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: alpine316\test-deps
artifactSuffix: alpine316_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: alpine317\test-deps
artifactSuffix: alpine317_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: debian11\test-deps
artifactSuffix: debian11_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: debian12\test-deps
artifactSuffix: debian12_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubi8\test-deps
artifactSuffix: ubi8_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubi9\test-deps
artifactSuffix: ubi9_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu20.04\test-deps
artifactSuffix: ubuntu2004_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu22.04\test-deps
artifactSuffix: ubuntu2204_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
6 changes: 0 additions & 6 deletions .vsts-ci/releaseJob.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,6 @@ jobs:
- pwsh: |
$finalImageName = '${{ parameters.imageName }}'
$finalContextFolder = 'docker'
$testDepsString = 'test-deps'
if ($finalImageName.Contains($testDepsString))
{
$finalImageName = $finalImageName.TrimEnd("\$testDepsString")
$finalContextFolder = Join-Path -Path $testDepsString -ChildPath $finalContextFolder
}
$pathToContextFolder = "${{ parameters.channelPath }}/$finalImageName/$finalContextFolder"
Write-Host "##vso[task.setvariable variable=dockerBuildImageName;isOutput=true]$finalImageName"
Write-Host "##vso[task.setvariable variable=dockerBuildContextFolder;isOutput=true]$finalContextFolder"
Expand Down
100 changes: 0 additions & 100 deletions .vsts-ci/stableReleaseStage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@ stages:
dependsOn: ['StageResolveVersionandYaml']
displayName: Build stable
jobs:
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: alpine316
artifactSuffix: alpine316
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
Expand All @@ -30,16 +20,6 @@ stages:
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: debian11
artifactSuffix: debian11
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
Expand Down Expand Up @@ -152,83 +132,3 @@ stages:
maxParallel: 3
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: alpine316\test-deps
artifactSuffix: alpine316_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: alpine317\test-deps
artifactSuffix: alpine317_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: debian11\test-deps
artifactSuffix: debian11_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: debian12\test-deps
artifactSuffix: debian12_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubi8\test-deps
artifactSuffix: ubi8_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubi9\test-deps
artifactSuffix: ubi9_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu20.04\test-deps
artifactSuffix: ubuntu2004_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu22.04\test-deps
artifactSuffix: ubuntu2204_test_deps
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
9 changes: 6 additions & 3 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,10 +737,13 @@ End {
foreach ($osGroup in $osGroups) {
$architectureGroups = $osGroup.Group | Group-Object -Property Architecture
foreach ($architectureGroup in $architectureGroups) {
# 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.
# Note: For each image to be built the <channel>ReleaseStage.yml file needs to have a template call for the image.
foreach ($tag in $architectureGroup.Group | Sort-Object -Property dockerfile) {
Write-Verbose -Verbose "calling method to populate template call in yaml file for channel: $channelName for image: $($tag.Name)"
Get-TemplatePopulatedYaml -YamlFilePath $channelReleaseStagePath -ImageInfo $tag
if (!$tag.Name.ToString().Contains('test-deps'))
{
Write-Verbose -Verbose "calling method to populate template call in yaml file for channel: $channelName for image: $($tag.Name)"
Get-TemplatePopulatedYaml -YamlFilePath $channelReleaseStagePath -ImageInfo $tag
}
}
}
}
Expand Down
Loading