Skip to content

Commit ea027b7

Browse files
authored
update build yamls (#846)
1 parent 924d12e commit ea027b7

File tree

12 files changed

+46
-283
lines changed

12 files changed

+46
-283
lines changed

.pipelines/PowerShell-Docker-Image-Build-Official.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ extends:
140140
- template: /.vsts-ci/stableReleaseStage.yml@self
141141
parameters:
142142
channel: ${{ parameters.releaseChannel }}
143-
channelPath: 'release/7-4'
143+
channelPath: 'release/7-5'
144144
- ${{ if eq(parameters.releaseChannel, 'preview') }}:
145145
- template: /.vsts-ci/previewReleaseStage.yml@self
146146
parameters:
@@ -150,4 +150,4 @@ extends:
150150
- template: /.vsts-ci/ltsReleaseStage.yml@self
151151
parameters:
152152
channel: ${{ parameters.releaseChannel }}
153-
channelPath: 'release/7-2'
153+
channelPath: 'release/7-4'

.vsts-ci/ltsReleaseStage.yml

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,28 @@ stages:
2323
- template: /.vsts-ci/releaseJob.yml@self
2424
parameters:
2525
archName: 'Build_linux_amd64'
26-
imageName: mariner2
27-
artifactSuffix: mariner2
26+
imageName: alpine320
27+
artifactSuffix: alpine320
28+
poolOS: 'linux'
29+
poolHostArchitecture: 'amd64'
30+
buildKitValue: 1
31+
channel: ${{ parameters.channel }}
32+
channelPath: ${{ parameters.channelPath }}
33+
- template: /.vsts-ci/releaseJob.yml@self
34+
parameters:
35+
archName: 'Build_linux_amd64'
36+
imageName: azurelinux3
37+
artifactSuffix: azurelinux3
38+
poolOS: 'linux'
39+
poolHostArchitecture: 'amd64'
40+
buildKitValue: 1
41+
channel: ${{ parameters.channel }}
42+
channelPath: ${{ parameters.channelPath }}
43+
- template: /.vsts-ci/releaseJob.yml@self
44+
parameters:
45+
archName: 'Build_linux_amd64'
46+
imageName: debian12
47+
artifactSuffix: debian12
2848
poolOS: 'linux'
2949
poolHostArchitecture: 'amd64'
3050
buildKitValue: 1
@@ -33,8 +53,8 @@ stages:
3353
- template: /.vsts-ci/releaseJob.yml@self
3454
parameters:
3555
archName: 'Build_linux_amd64'
36-
imageName: ubi8
37-
artifactSuffix: ubi8
56+
imageName: mariner2
57+
artifactSuffix: mariner2
3858
poolOS: 'linux'
3959
poolHostArchitecture: 'amd64'
4060
buildKitValue: 1
@@ -82,24 +102,22 @@ stages:
82102
channelPath: ${{ parameters.channelPath }}
83103
- template: /.vsts-ci/releaseJob.yml@self
84104
parameters:
85-
archName: 'Build_windows_amd64'
86-
imageName: nanoserver1809
87-
artifactSuffix: nanoserver1809
88-
poolOS: 'windows'
89-
poolHostVersion: '1ESWindows2022'
90-
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
91-
maxParallel: 3
105+
archName: 'Build_linux_arm64'
106+
imageName: azurelinux3-arm64
107+
artifactSuffix: azurelinux3_arm64
108+
poolOS: 'linux'
109+
poolHostArchitecture: 'arm64'
110+
buildKitValue: 1
92111
channel: ${{ parameters.channel }}
93112
channelPath: ${{ parameters.channelPath }}
94113
- template: /.vsts-ci/releaseJob.yml@self
95114
parameters:
96-
archName: 'Build_windows_amd64'
97-
imageName: nanoserver2022
98-
artifactSuffix: nanoserver2022
99-
poolOS: 'windows'
100-
poolHostVersion: '1ESWindows2022'
101-
windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
102-
maxParallel: 3
115+
archName: 'Build_linux_arm64'
116+
imageName: mariner2-arm64
117+
artifactSuffix: mariner2_arm64
118+
poolOS: 'linux'
119+
poolHostArchitecture: 'arm64'
120+
buildKitValue: 1
103121
channel: ${{ parameters.channel }}
104122
channelPath: ${{ parameters.channelPath }}
105123
- template: /.vsts-ci/releaseJob.yml@self

.vsts-ci/stableReleaseStage.yml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,8 @@ stages:
6363
- template: /.vsts-ci/releaseJob.yml@self
6464
parameters:
6565
archName: 'Build_linux_amd64'
66-
imageName: ubi8
67-
artifactSuffix: ubi8
68-
poolOS: 'linux'
69-
poolHostArchitecture: 'amd64'
70-
buildKitValue: 1
71-
channel: ${{ parameters.channel }}
72-
channelPath: ${{ parameters.channelPath }}
73-
- template: /.vsts-ci/releaseJob.yml@self
74-
parameters:
75-
archName: 'Build_linux_amd64'
76-
imageName: ubi9
77-
artifactSuffix: ubi9
66+
imageName: ubuntu20.04
67+
artifactSuffix: ubuntu2004
7868
poolOS: 'linux'
7969
poolHostArchitecture: 'amd64'
8070
buildKitValue: 1
@@ -83,8 +73,8 @@ stages:
8373
- template: /.vsts-ci/releaseJob.yml@self
8474
parameters:
8575
archName: 'Build_linux_amd64'
86-
imageName: ubuntu20.04
87-
artifactSuffix: ubuntu2004
76+
imageName: ubuntu22.04
77+
artifactSuffix: ubuntu2204
8878
poolOS: 'linux'
8979
poolHostArchitecture: 'amd64'
9080
buildKitValue: 1
@@ -93,8 +83,8 @@ stages:
9383
- template: /.vsts-ci/releaseJob.yml@self
9484
parameters:
9585
archName: 'Build_linux_amd64'
96-
imageName: ubuntu22.04
97-
artifactSuffix: ubuntu2204
86+
imageName: ubuntu24.04
87+
artifactSuffix: ubuntu2404
9888
poolOS: 'linux'
9989
poolHostArchitecture: 'amd64'
10090
buildKitValue: 1

release/7-4/ubi8/docker/Dockerfile

Lines changed: 0 additions & 59 deletions
This file was deleted.

release/7-4/ubi8/meta.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

release/7-4/ubi8/test-deps/docker/Dockerfile

Lines changed: 0 additions & 23 deletions
This file was deleted.

release/7-4/ubi8/test-deps/meta.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

release/7-4/ubi9/docker/Dockerfile

Lines changed: 0 additions & 62 deletions
This file was deleted.

release/7-4/ubi9/meta.json

Lines changed: 0 additions & 21 deletions
This file was deleted.

release/7-4/ubi9/test-deps/docker/Dockerfile

Lines changed: 0 additions & 23 deletions
This file was deleted.

release/7-4/ubi9/test-deps/meta.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)