Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Enable rolling builds and add arm64 in outerloop #37728

Merged
ViktorHofer merged 7 commits into from
May 17, 2019
Merged

Enable rolling builds and add arm64 in outerloop #37728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6eedcd3
Enable rolling builds and add arm64 in outerloop
ViktorHofer May 16, 2019
763c512
Fix indenting and break
ViktorHofer May 16, 2019
2ec17bb
Disable tests on official builds
ViktorHofer May 16, 2019
e7ff2ea
Allow Outerloop to run aggregated
ViktorHofer May 17, 2019
40f0554
Disable failing RH6 test
ViktorHofer May 17, 2019
1c1d1e4
Adjust queue names
ViktorHofer May 17, 2019
b3f15ec
Reuse queue in linux
ViktorHofer May 17, 2019
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
33 changes: 19 additions & 14 deletions .azure-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,31 +46,36 @@ resources:
jobs:
# Windows legs
- template: /eng/pipelines/windows.yml
${{ if and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}:
parameters:
isOfficialBuild: true
parameters:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}

# Linux legs
- template: /eng/pipelines/linux.yml
${{ if and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}:
parameters:
isOfficialBuild: true
parameters:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}

# MacOS legs
- template: /eng/pipelines/macos.yml
${{ if and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}:
parameters:
isOfficialBuild: true
parameters:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}

# Only run in official builds
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}:
# Redhat6 leg is only for official builds
- template: /eng/pipelines/redhat6.yml
# 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:
# isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
# fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}

# Publish step
# Publish step. Only run in official builds
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/pipelines/publish.yml
parameters:
dependsOn:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/corefx-base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ jobs:
- template: /eng/pipelines/helix.yml
parameters:
# send tests to helix only on public builds, official scheduled builds or manual official builds.
condition: or(eq(${{ parameters.isOfficialBuild }}, False), notIn(variables['Build.Reason'], 'BatchedCI', 'IndividualCI'))
Copy link
Copy Markdown
Member

@safern safern May 17, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Github won't let me comment on line 188 but maybe we could instead of using a condition here, use a ${{ if }} condition so that this step doesn't always show as skipped on official builds and that way the logs are smaller there.

- ${{ if eq(parameters.isOfficialBuild, 'false') }}:
  - template: /eng/pipelines/helix.yml
     ...

Then you can remove this condition parameter entirely.

Copy link
Copy Markdown
Member Author

@ViktorHofer ViktorHofer May 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about it but I don't think this is necessary. This will only be skipped in official builds and nobody looks at it unless something breaks.

Copy link
Copy Markdown
Member

@safern safern May 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I agree on that but, it is nice to have less steps showed as skipped the logs would be cleaner. Up to you.

condition: eq(${{ parameters.isOfficialBuild }}, False)
targetOS: ${{ parameters.targetOS }}
archGroup: $(_architecture)
configuration: $(_BuildConfig)
Expand Down
17 changes: 13 additions & 4 deletions eng/pipelines/freebsd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
# FreeBSD leg. Only for used in Official Builds
# FreeBSD leg
parameters:
# Required: value to specify if the job is comming from an official build to run extra steps and sign binaries
# Default: false
isOfficialBuild: false
# Required: value to specify if the full test matrix should be tested
# Default: false
fullMatrix: false
# Required: value to specify if the build is comming from an outerloop pipeline.
# Default: false
isOuterloopBuild: false

jobs:
- template: corefx-base.yml
parameters:
isOfficialBuild: true
isOfficialBuild: ${{ parameters.isOfficialBuild }}
targetOS: FreeBSD
jobs:

Expand All @@ -23,5 +33,4 @@ jobs:
submitToHelix: false

variables:
- _skipTests: true
- _outerloop: true # Only runs in official builds
- _outerloop: ${{ parameters.isOuterloopBuild }}
37 changes: 17 additions & 20 deletions eng/pipelines/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ parameters:
# Required: value to specify if the job is comming from an official build to run extra steps and sign binaries
# Default: false
isOfficialBuild: false
# Required: value to specify if the full test matrix should be tested
# Default: false
fullMatrix: false
# Required: value to specify if the build is comming from an outerloop pipeline.
# Default: false
isOuterloopBuild: false

jobs:

- template: corefx-base.yml
parameters:
isOfficialBuild: ${{ parameters.isOfficialBuild }}
Expand Down Expand Up @@ -76,7 +78,7 @@ jobs:
_buildScriptPrefix: ''
_buildExtraArguments: /p:RuntimeOS=linux-musl

${{ if eq(parameters.isOfficialBuild, 'true') }}:
${{ if eq(parameters.fullMatrix, 'true') }}:
arm_Release:
_BuildConfig: Release
_architecture: arm
Expand Down Expand Up @@ -104,22 +106,18 @@ jobs:
submitToHelix: true

variables:
- _skipTests: true
- _outerloop: ${{ parameters.isOfficialBuild }}
- ${{ if eq(parameters.isOuterloopBuild, 'true') }}:
- _outerloop: true

- ${{ if eq(parameters.isOfficialBuild, 'false') }}:
- linuxDefaultQueues: Centos.7.Amd64.Open+RedHat.7.Amd64.Open+Debian.8.Amd64.Open+Ubuntu.1604.Amd64.Open+Ubuntu.1804.Amd64.Open+OpenSuse.42.Amd64.Open+\(Fedora.28.Amd64\)ubuntu.1604.amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249
- linuxArm64Queues: \(Ubuntu.1604.Arm64\)Ubuntu.1604.Arm64.Docker.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-b049512-20190321153539
- alpineQueues: \(Alpine.38.Amd64\)ubuntu.1604.amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-09ca40b-20190508143246

- ${{ if eq(parameters.isOfficialBuild, 'true') }}:
- linuxDefaultQueues: Centos.7.Amd64+RedHat.7.Amd64+Debian.8.Amd64+Debian.9.Amd64+Ubuntu.1604.Amd64+Ubuntu.1804.Amd64+Ubuntu.1810.Amd64+OpenSuse.42.Amd64+SLES.12.Amd64+SLES.15.Amd64+\(Fedora.28.Amd64\)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249+\(Fedora.29.Amd64\)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-29-09ca40b-20190508143249+\(Ubuntu.1904.Amd64\)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-19.04-helix-amd64-09ca40b-20190508143257
- linuxArm64Queues: \(Ubuntu.1604.Arm64\)Ubuntu.1604.Arm64.Docker@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-b049512-20190321153539
- linuxArmQueues: \(Debian.9.Arm32\)Ubuntu.1604.Arm32@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-helix-arm32v7-b049512-20190321153542
- alpineQueues: \(Alpine.38.Amd64\)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-09ca40b-20190508143246+\(Alpine.39.Amd64\)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-helix-09ca40b-20190508143246
- alpineArm64Queues: \(Alpine.38.Arm64\)Ubuntu.1604.Arm64.Docker@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-46e69dd-20190327215724
- _outerloop: ${{ parameters.isOuterloopBuild }}
- linuxArm64Queues: \(Ubuntu.1604.Arm64.Open\)Ubuntu.1604.Arm64.Docker.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-b049512-20190321153539

- ${{ if eq(parameters.fullMatrix, 'false') }}:
- linuxDefaultQueues: Centos.7.Amd64.Open+RedHat.7.Amd64.Open+Debian.8.Amd64.Open+Ubuntu.1604.Amd64.Open+Ubuntu.1804.Amd64.Open+OpenSuse.42.Amd64.Open+\(Fedora.28.Amd64.Open\)ubuntu.1604.amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249
- alpineQueues: \(Alpine.38.Amd64.Open\)ubuntu.1604.amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-09ca40b-20190508143246

- ${{ if eq(parameters.fullMatrix, 'true') }}:
- linuxDefaultQueues: Centos.7.Amd64.Open+RedHat.7.Amd64.Open+Debian.8.Amd64.Open+Debian.9.Amd64.Open+Ubuntu.1604.Amd64.Open+Ubuntu.1804.Amd64.Open+Ubuntu.1810.Amd64.Open+OpenSuse.42.Amd64.Open+SLES.12.Amd64.Open+SLES.15.Amd64.Open+\(Fedora.28.Amd64.Open\)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249+\(Fedora.29.Amd64.Open\)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-29-09ca40b-20190508143249+\(Ubuntu.1904.Amd64.Open\)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-19.04-helix-amd64-09ca40b-20190508143257
- linuxArmQueues: \(Debian.9.Arm32.Open\)Ubuntu.1604.Arm32.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-helix-arm32v7-b049512-20190321153542
- alpineQueues: \(Alpine.38.Amd64.Open\)ubuntu.1604.amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-09ca40b-20190508143246+\(Alpine.39.Amd64.Open\)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-helix-09ca40b-20190508143246
- alpineArm64Queues: \(Alpine.38.Arm64.Open\)Ubuntu.1604.Arm64.Docker.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-46e69dd-20190327215724

# Legs without helix testing
# Only run this leg in PRs.
Expand Down Expand Up @@ -153,5 +151,4 @@ jobs:
submitToHelix: false

variables:
- _skipTests: true
- _outerloop: ${{ parameters.isOfficialBuild }}
- _outerloop: ${{ parameters.isOuterloopBuild }}
17 changes: 8 additions & 9 deletions eng/pipelines/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ parameters:
# Required: value to specify if the job is comming from an official build to run extra steps and sign binaries
# Default: false
isOfficialBuild: false
# Required: value to specify if the full test matrix should be tested
# Default: false
fullMatrix: false
# Required: value to specify if the build is comming from an outerloop pipeline.
# Default: false
isOuterloopBuild: false

jobs:

- template: corefx-base.yml
parameters:
isOfficialBuild: ${{ parameters.isOfficialBuild }}
Expand All @@ -20,14 +22,14 @@ jobs:
displayName: MacOS
strategy:
matrix:
${{ if eq(parameters.isOfficialBuild, 'false') }}:
${{ if eq(parameters.fullMatrix, 'false') }}:
x64_Debug:
_BuildConfig: Debug
_architecture: x64
_framework: netcoreapp
_helixQueues: $(macOSQueues)

${{ if eq(parameters.isOfficialBuild, 'true') }}:
${{ if eq(parameters.fullMatrix, 'true') }}:
x64_Release:
_BuildConfig: Release
_architecture: x64
Expand All @@ -49,13 +51,10 @@ jobs:
submitToHelix: true

variables:
- _skipTests: true
- _outerloop: ${{ parameters.isOfficialBuild }}
- ${{ if eq(parameters.isOuterloopBuild, 'true') }}:
- _outerloop: true

- _outerloop: ${{ parameters.isOuterloopBuild }}

- ${{ if eq(parameters.isOfficialBuild, 'false') }}:
- macOSQueues: OSX.1012.Amd64.Open+OSX.1013.Amd64.Open

- ${{ if eq(parameters.isOfficialBuild, 'true') }}:
- macOSQueues: OSX.1012.Amd64+OSX.1013.Amd64+OSX.1014.Amd64
- macOSQueues: OSX.1012.Amd64.Open+OSX.1013.Amd64.Open+OSX.1014.Amd64.Open
12 changes: 9 additions & 3 deletions eng/pipelines/outerloop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,25 @@ resources:

jobs:
# Windows outerloop legs
- ${{ if endsWith(variables['Build.DefinitionName'], 'windows') }}:
- ${{ if or(endsWith(variables['Build.DefinitionName'], 'windows'), endsWith(variables['Build.DefinitionName'], 'outerloop')) }}:
- template: /eng/pipelines/windows.yml
parameters:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}
isOuterloopBuild: true

# Linux outerloop legs
- ${{ if endsWith(variables['Build.DefinitionName'], 'linux') }}:
- ${{ if or(endsWith(variables['Build.DefinitionName'], 'linux'), endsWith(variables['Build.DefinitionName'], 'outerloop')) }}:
- template: /eng/pipelines/linux.yml
parameters:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}
isOuterloopBuild: true

# MacOS outerloop legs
- ${{ if endsWith(variables['Build.DefinitionName'], 'osx') }}:
- ${{ if or(endsWith(variables['Build.DefinitionName'], 'osx'), endsWith(variables['Build.DefinitionName'], 'outerloop')) }}:
- template: /eng/pipelines/macos.yml
parameters:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}
Comment thread
safern marked this conversation as resolved.
isOuterloopBuild: true
19 changes: 14 additions & 5 deletions eng/pipelines/redhat6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
# RedHat 6 leg. Only for used in Official Builds
# RedHat 6 leg
parameters:
# Required: value to specify if the job is comming from an official build to run extra steps and sign binaries
# Default: false
isOfficialBuild: false
# Required: value to specify if the full test matrix should be tested
# Default: false
fullMatrix: false
# Required: value to specify if the build is comming from an outerloop pipeline.
# Default: false
isOuterloopBuild: false

jobs:
- template: corefx-base.yml
parameters:
isOfficialBuild: true
isOfficialBuild: ${{ parameters.isOfficialBuild }}
targetOS: Linux
jobs:

Expand All @@ -26,6 +36,5 @@ jobs:
submitToHelix: true

variables:
- _skipTests: true
- _outerloop: true # Only runs in official builds
- redhatHelixQueue: RedHat.6.Amd64
- _outerloop: ${{ parameters.isOuterloopBuild }}
- redhatHelixQueue: RedHat.6.Amd64.Open
Loading