Skip to content

Commit

Permalink
Move redhat6 into linux group
Browse files Browse the repository at this point in the history
  • Loading branch information
ViktorHofer committed Jun 17, 2019
1 parent 32c7d6d commit 519eccd
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 50 deletions.
7 changes: 0 additions & 7 deletions .azure-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@ jobs:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}

# RedHat6 leg
- template: /eng/pipelines/redhat6.yml
parameters:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}

# FreeBSD leg is only for official builds
# - template: /eng/pipelines/freebsd.yml
# parameters:
Expand All @@ -84,5 +78,4 @@ jobs:
- AllConfigurations
- LinuxTest
- MacOS
- RedHat6
# - FreeBSD
16 changes: 13 additions & 3 deletions eng/pipelines/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ jobs:
displayName: Linux
strategy:
matrix:
# Run RedHat6 in release mode on CI to cover Release configuration differences
RedHat6_x64_Release:
_BuildConfig: Release
_architecture: x64
_framework: netcoreapp
_buildExtraArguments: /p:RuntimeOS=rhel.6 /p:PortableBuild=false
_dockerContainer: rhel6_container
_helixQueues: $(redhatHelixQueue)
_publishTests: ${{ parameters.fullMatrix }}

${{ if eq(parameters.fullMatrix, 'false') }}:
x64_Debug:
_BuildConfig: Debug
Expand All @@ -33,9 +43,8 @@ jobs:
_buildScriptPrefix: ''
_buildExtraArguments: ''

# Use a Release leg in PRs to validate both configurations
musl_x64_Release:
_BuildConfig: Release
musl_x64_Debug:
_BuildConfig: Debug
_architecture: x64
_framework: netcoreapp
_helixQueues: $(alpineQueues)
Expand Down Expand Up @@ -105,6 +114,7 @@ jobs:
timeoutInMinutes: 180

variables:
- redhatHelixQueue: RedHat.6.Amd64.Open

- ${{ if eq(parameters.fullMatrix, 'false') }}:
- linuxDefaultQueues: Centos.7.Amd64.Open+RedHat.7.Amd64.Open+Debian.9.Amd64.Open+Ubuntu.1604.Amd64.Open+Ubuntu.1804.Amd64.Open+SLES.15.Amd64.Open+\(Fedora.29.Amd64.Open\)[email protected]/dotnet-buildtools/prereqs:fedora-29-09ca40b-20190508143249
Expand Down
40 changes: 0 additions & 40 deletions eng/pipelines/redhat6.yml

This file was deleted.

0 comments on commit 519eccd

Please sign in to comment.