Skip to content

Remove Ubi images for 7-4, and update build yamls #846

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

Merged
merged 1 commit into from
Jan 27, 2025
Merged
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
4 changes: 2 additions & 2 deletions .pipelines/PowerShell-Docker-Image-Build-Official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ extends:
- template: /.vsts-ci/stableReleaseStage.yml@self
parameters:
channel: ${{ parameters.releaseChannel }}
channelPath: 'release/7-4'
channelPath: 'release/7-5'
- ${{ if eq(parameters.releaseChannel, 'preview') }}:
- template: /.vsts-ci/previewReleaseStage.yml@self
parameters:
Expand All @@ -150,4 +150,4 @@ extends:
- template: /.vsts-ci/ltsReleaseStage.yml@self
parameters:
channel: ${{ parameters.releaseChannel }}
channelPath: 'release/7-2'
channelPath: 'release/7-4'
54 changes: 36 additions & 18 deletions .vsts-ci/ltsReleaseStage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,28 @@ stages:
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: mariner2
artifactSuffix: mariner2
imageName: alpine320
artifactSuffix: alpine320
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: azurelinux3
artifactSuffix: azurelinux3
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
artifactSuffix: debian12
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand All @@ -33,8 +53,8 @@ stages:
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubi8
artifactSuffix: ubi8
imageName: mariner2
artifactSuffix: mariner2
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand Down Expand Up @@ -82,24 +102,22 @@ stages:
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_windows_amd64'
imageName: nanoserver1809
artifactSuffix: nanoserver1809
poolOS: 'windows'
poolHostVersion: '1ESWindows2022'
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
maxParallel: 3
archName: 'Build_linux_arm64'
imageName: azurelinux3-arm64
artifactSuffix: azurelinux3_arm64
poolOS: 'linux'
poolHostArchitecture: 'arm64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_windows_amd64'
imageName: nanoserver2022
artifactSuffix: nanoserver2022
poolOS: 'windows'
poolHostVersion: '1ESWindows2022'
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
maxParallel: 3
archName: 'Build_linux_arm64'
imageName: mariner2-arm64
artifactSuffix: mariner2_arm64
poolOS: 'linux'
poolHostArchitecture: 'arm64'
buildKitValue: 1
channel: ${{ parameters.channel }}
channelPath: ${{ parameters.channelPath }}
- template: /.vsts-ci/releaseJob.yml@self
Expand Down
22 changes: 6 additions & 16 deletions .vsts-ci/stableReleaseStage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,8 @@ stages:
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubi8
artifactSuffix: ubi8
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
artifactSuffix: ubi9
imageName: ubuntu20.04
artifactSuffix: ubuntu2004
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand All @@ -83,8 +73,8 @@ stages:
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu20.04
artifactSuffix: ubuntu2004
imageName: ubuntu22.04
artifactSuffix: ubuntu2204
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand All @@ -93,8 +83,8 @@ stages:
- template: /.vsts-ci/releaseJob.yml@self
parameters:
archName: 'Build_linux_amd64'
imageName: ubuntu22.04
artifactSuffix: ubuntu2204
imageName: ubuntu24.04
artifactSuffix: ubuntu2404
poolOS: 'linux'
poolHostArchitecture: 'amd64'
buildKitValue: 1
Expand Down
59 changes: 0 additions & 59 deletions release/7-4/ubi8/docker/Dockerfile

This file was deleted.

17 changes: 0 additions & 17 deletions release/7-4/ubi8/meta.json

This file was deleted.

23 changes: 0 additions & 23 deletions release/7-4/ubi8/test-deps/docker/Dockerfile

This file was deleted.

20 changes: 0 additions & 20 deletions release/7-4/ubi8/test-deps/meta.json

This file was deleted.

62 changes: 0 additions & 62 deletions release/7-4/ubi9/docker/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions release/7-4/ubi9/meta.json

This file was deleted.

23 changes: 0 additions & 23 deletions release/7-4/ubi9/test-deps/docker/Dockerfile

This file was deleted.

20 changes: 0 additions & 20 deletions release/7-4/ubi9/test-deps/meta.json

This file was deleted.

Loading
Loading