Skip to content

Commit fe9a0dd

Browse files
committed
Add CentOS Stream 9 container to CI matrix
1 parent 11ef768 commit fe9a0dd

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ parameters:
1414
# -----------------------------------------------------------------------------------------------
1515
centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80
1616
centOS8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-source-build-20211118190102-9355e7b
17+
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c
1718
debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b
1819
fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
1920
ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b
@@ -49,6 +50,12 @@ jobs:
4950
_Container: ${{ parameters.centOS7Container }}
5051
_ExcludeOmniSharpTests: true
5152
_RunOnline: false
53+
CentOSStream9-Offline:
54+
_BootstrapPrep: true
55+
_BuildArch: x64
56+
_Container: ${{ parameters.centOSStream9Container }}
57+
_ExcludeOmniSharpTests: false
58+
_RunOnline: false
5259
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
5360
CentOS8-Offline:
5461
_BootstrapPrep: true
@@ -68,7 +75,7 @@ jobs:
6875
_Container: ${{ parameters.ubuntu1804Container }}
6976
_ExcludeOmniSharpTests: false
7077
_RunOnline: false
71-
timeoutInMinutes: 300
78+
timeoutInMinutes: 600
7279
workspace:
7380
clean: all
7481

@@ -88,7 +95,7 @@ jobs:
8895
customPrepArgs='--bootstrap'
8996
fi
9097
91-
docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs}
98+
docker run --security-opt seccomp=unconfined --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs}
9299
runOnline: $(_RunOnline)
93100
tarballDir: ${{ parameters.tarballDir }}
94101
tarballResourceId: ${{ parameters.tarballResourceId }}

src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,14 @@ steps:
6060
networkArgs='--network none'
6161
fi
6262
63-
docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball ${networkArgs} ${{ parameters.container }} ./build.sh ${customBuildArgs} ${{ parameters.additionalBuildArgs }} -- /p:CleanWhileBuilding=true
63+
docker run --security-opt seccomp=unconfined --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball ${networkArgs} ${{ parameters.container }} ./build.sh ${customBuildArgs} ${{ parameters.additionalBuildArgs }} -- /p:CleanWhileBuilding=true
6464
displayName: Build Tarball
65+
timeoutInMinutes: 360
6566
6667
- script: |
6768
set -x
6869
69-
docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball -e excludeOmniSharpTests=${{ parameters.excludeOmniSharpTests}} ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }}
70+
docker run --security-opt seccomp=unconfined --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball -e excludeOmniSharpTests=${{ parameters.excludeOmniSharpTests}} ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }}
7071
displayName: Run Tests
7172
7273
# Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph.

src/SourceBuild/tarball/content/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</PropertyGroup>
6565

6666
<PropertyGroup>
67-
<LogVerbosity Condition="'$(LogVerbosity)'==''">minimal</LogVerbosity>
67+
<LogVerbosity Condition="'$(LogVerbosity)'==''">normal</LogVerbosity>
6868
</PropertyGroup>
6969

7070
<PropertyGroup>

src/SourceBuild/tarball/content/repos/aspnetcore.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<BuildCommandArgs>$(BuildCommandArgs) /p:EnablePackageValidation=false</BuildCommandArgs>
1818
<BuildCommand>$(ProjectDirectory)\eng\build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
1919

20-
<LogVerbosityOptOut>true</LogVerbosityOptOut>
20+
<LogVerbosityOptOut>false</LogVerbosityOptOut>
2121

2222
<RepoApiImplemented>false</RepoApiImplemented>
2323
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>

0 commit comments

Comments
 (0)