Skip to content

Commit 5b909c0

Browse files
ellahathawayellahathaway
authored
Use variables for container values (#45490)
1 parent 6ac6af9 commit 5b909c0

File tree

3 files changed

+56
-52
lines changed

3 files changed

+56
-52
lines changed

‎eng/pipelines/templates/jobs/vmr-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
${{ if ne(parameters.container.image, '') }}:
132132
container:
133133
image: ${{ parameters.container.image }}
134-
options: --privileged
134+
options: $(defaultContainerOptions)
135135

136136
# Currently, CodeQL slows the build down too much
137137
# https://github.com/dotnet/source-build/issues/4276

‎eng/pipelines/templates/variables/vmr-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ variables:
1212
- name: VmrBranch
1313
value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }}
1414

15+
- name: defaultContainerOptions
16+
value: --privileged
17+
1518
- name: almaLinuxContainerName
1619
value: almaLinuxContainer
1720
- name: almaLinuxContainerImage

‎src/SourceBuild/content/eng/pipelines/ci.yml

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
value: ${{ eq(variables['Build.Reason'], 'PullRequest') }}
4545

4646
- template: /eng/common/templates-official/variables/pool-providers.yml@self
47+
- template: /src/sdk/eng/pipelines/templates/variables/vmr-build.yml@self
4748

4849
resources:
4950
repositories:
@@ -78,57 +79,57 @@ extends:
7879
baselineFile: $(Build.SourcesDirectory)\.config\guardian\.gdnbaselines
7980

8081
containers:
81-
almaLinuxContainer:
82-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build
83-
options: --privileged
84-
alpineLatestContainer:
85-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-amd64
86-
options: --privileged
87-
alpinePreviousContainer:
88-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode
89-
options: --privileged
90-
centOSStreamContainer:
91-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
92-
options: --privileged
93-
fedoraContainer:
94-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41
95-
options: --privileged
96-
ubuntuContainer:
97-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04
98-
options: --privileged
99-
ubuntuArmContainer:
100-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04-arm64
101-
options: --privileged
102-
azurelinuxX64CrossContainer:
103-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64
104-
options: --privileged
105-
azurelinuxArmCrossContainer:
106-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm
107-
options: --privileged
108-
azurelinuxArm64CrossContainer:
109-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm64
110-
options: --privileged
111-
azurelinuxX64AlpineCrossContainer:
112-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64-alpine
113-
options: --privileged
114-
azurelinuxArmAlpineCrossContainer:
115-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm-alpine
116-
options: --privileged
117-
azurelinuxArm64AlpineCrossContainer:
118-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm64-alpine
119-
options: --privileged
120-
androidCrossContainer:
121-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-android-amd64
122-
options: --privileged
123-
linuxBionicCrossContainer:
124-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-android-openssl
125-
options: --privileged
126-
browserCrossContainer:
127-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-webassembly-amd64
128-
options: --privileged
129-
wasiCrossContainer:
130-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-webassembly-amd64
131-
options: --privileged
82+
${{ variables.almaLinuxContainerName }}:
83+
image: ${{ variables.almaLinuxContainerImage }}
84+
options: ${{ variables.defaultContainerOptions }}
85+
${{ variables.alpineLatestContainerName }}:
86+
image: ${{ variables.alpineLatestContainerImage }}
87+
options: ${{ variables.defaultContainerOptions }}
88+
${{ variables.alpinePreviousContainerName }}:
89+
image: ${{ variables.alpinePreviousContainerImage }}
90+
options: ${{ variables.defaultContainerOptions }}
91+
${{ variables.centOSStreamContainerName }}:
92+
image: ${{ variables.centOSStreamContainerImage }}
93+
options: ${{ variables.defaultContainerOptions }}
94+
${{ variables.fedoraContainerName }}:
95+
image: ${{ variables.fedoraContainerImage }}
96+
options: ${{ variables.defaultContainerOptions }}
97+
${{ variables.ubuntuContainerName }}:
98+
image: ${{ variables.ubuntuContainerImage }}
99+
options: ${{ variables.defaultContainerOptions }}
100+
${{ variables.ubuntuArmContainerName }}:
101+
image: ${{ variables.ubuntuArmContainerImage }}
102+
options: ${{ variables.defaultContainerOptions }}
103+
${{ variables.azurelinuxX64CrossContainerName }}:
104+
image: ${{ variables.azurelinuxX64CrossContainerImage }}
105+
options: ${{ variables.defaultContainerOptions }}
106+
${{ variables.azurelinuxArmCrossContainerName }}:
107+
image: ${{ variables.azurelinuxArmCrossContainerImage }}
108+
options: ${{ variables.defaultContainerOptions }}
109+
${{ variables.azurelinuxArm64CrossContainerName }}:
110+
image: ${{ variables.azurelinuxArm64CrossContainerImage }}
111+
options: ${{ variables.defaultContainerOptions }}
112+
${{ variables.azurelinuxX64AlpineCrossContainerName }}:
113+
image: ${{ variables.azurelinuxX64AlpineCrossContainerImage }}
114+
options: ${{ variables.defaultContainerOptions }}
115+
${{ variables.azurelinuxArmAlpineCrossContainerName }}:
116+
image: ${{ variables.azurelinuxArmAlpineCrossContainerImage }}
117+
options: ${{ variables.defaultContainerOptions }}
118+
${{ variables.azurelinuxArm64AlpineCrossContainerName }}:
119+
image: ${{ variables.azurelinuxArm64AlpineCrossContainerImage }}
120+
options: ${{ variables.defaultContainerOptions }}
121+
${{ variables.androidCrossContainerName }}:
122+
image: ${{ variables.androidCrossContainerImage }}
123+
options: ${{ variables.defaultContainerOptions }}
124+
${{ variables.linuxBionicCrossContainerName }}:
125+
image: ${{ variables.linuxBionicCrossContainerImage }}
126+
options: ${{ variables.defaultContainerOptions }}
127+
${{ variables.browserCrossContainerName }}:
128+
image: ${{ variables.browserCrossContainerImage }}
129+
options: ${{ variables.defaultContainerOptions }}
130+
${{ variables.wasiCrossContainerName }}:
131+
image: ${{ variables.wasiCrossContainerImage }}
132+
options: ${{ variables.defaultContainerOptions }}
132133

133134
stages:
134135
- ${{ if and(ne(variables.isPRTrigger, 'true'), eq(variables['System.TeamProject'], 'internal')) }}:

0 commit comments

Comments
 (0)