Skip to content

Convert windows CI to stages #9607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 4 commits into from
May 16, 2019
Merged

Convert windows CI to stages #9607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c428b2
Convert windows CI to stages
TravisEz13 May 15, 2019
17b7637
refactor verify-xunit to use parentJobs pattern
TravisEz13 May 15, 2019
0d1ff0d
merge changes into windows-daily
TravisEz13 May 15, 2019
932cbba
remove invalid paths
TravisEz13 May 15, 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
3 changes: 2 additions & 1 deletion .vsts-ci/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ jobs:
- template: templates/verify-xunit.yml
parameters:
pool: Hosted Ubuntu 1604
dependsOn: linux_build
parentJobs:
- linux_build

- job: CodeCovTestPackage
displayName: CodeCoverage and Test Packages
Expand Down
3 changes: 2 additions & 1 deletion .vsts-ci/mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ jobs:
- template: templates/verify-xunit.yml
parameters:
pool: 'Hosted macOS'
dependsOn: mac_build
parentJobs:
- mac_build

- job: CodeCovTestPackage
displayName: CodeCoverage and Test Packages
Expand Down
4 changes: 2 additions & 2 deletions .vsts-ci/templates/verify-xunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
dependsOn: 'win_build'
parentJobs: []
pool: 'Hosted VS2017'
jobName: 'xunit_verify'

Expand All @@ -9,7 +9,7 @@ jobs:
pool:
name: ${{ parameters.pool }}
dependsOn:
- ${{ parameters.dependsOn }}
${{ parameters.parentJobs }}
steps:
- task: DownloadBuildArtifacts@0
displayName: 'Download build artifacts'
Expand Down
77 changes: 37 additions & 40 deletions .vsts-ci/windows-daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,27 @@ trigger:
include:
- master
- release*
- feature*
paths:
include:
- '*'
exclude:
- /.vsts-ci/misc-analysis.yml
- /.github/ISSUE_TEMPLATE/*
- /.dependabot/config.yml
pr:
branches:
include:
- master
- release*
- feature*
paths:
include:
- '*'
exclude:
- /.vsts-ci/misc-analysis.yml
- /.github/ISSUE_TEMPLATE/*
- /.dependabot/config.yml

variables:
GIT_CONFIG_PARAMETERS: "'core.autocrlf=false'"
Expand All @@ -35,49 +39,42 @@ resources:
- repo: self
clean: true

jobs:
- template: templates/ci-build.yml
stages:
- stage: BuildWin
displayName: Build for Windows
jobs:
- template: templates/ci-build.yml

- template: templates/windows-test.yml
parameters:
purpose: UnelevatedPesterTests
tagSet: CI
parentJobs:
- win_build
- stage: TestWin
displayName: Test for Windows
jobs:
- template: templates/windows-test.yml
parameters:
purpose: UnelevatedPesterTests
tagSet: CI

- template: templates/windows-test.yml
parameters:
purpose: ElevatedPesterTests
tagSet: CI
parentJobs:
- win_build
- template: templates/windows-test.yml
parameters:
purpose: ElevatedPesterTests
tagSet: CI

- template: templates/windows-test.yml
parameters:
purpose: UnelevatedPesterTests
tagSet: Others
parentJobs:
- win_build
- template: templates/windows-test.yml
parameters:
purpose: UnelevatedPesterTests
tagSet: Others

- template: templates/windows-test.yml
parameters:
purpose: ElevatedPesterTests
tagSet: Others
parentJobs:
- win_build
- template: templates/windows-test.yml
parameters:
purpose: ElevatedPesterTests
tagSet: Others

# we wait for all tests to finish as this phase uploads the daily nuget package to MyGet.
# we want to upload only if tests have passed.
- template: templates/windows-packaging.yml
parameters:
parentJobs:
- win_test_UnelevatedPesterTests_CI
- win_test_ElevatedPesterTests_CI
- win_test_UnelevatedPesterTests_Others
- win_test_ElevatedPesterTests_Others
- verify_xunit
- template: templates/verify-xunit.yml
parameters:
pool: 'Hosted VS2017'

- stage: PackagingWin
displayName: Packaging for Windows
jobs:
# Unlike daily builds, we do not upload nuget package to MyGet so we do not wait on tests to finish.
- template: templates/windows-packaging.yml

- template: templates/verify-xunit.yml
parameters:
pool: 'Hosted VS2017'
dependsOn: win_build
68 changes: 34 additions & 34 deletions .vsts-ci/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ trigger:
include:
- '*'
exclude:
- /tools/releaseBuild/**/*
- /.vsts-ci/misc-analysis.yml
- /.github/ISSUE_TEMPLATE/*
- /.dependabot/config.yml
Expand All @@ -25,7 +24,6 @@ pr:
include:
- '*'
exclude:
- /tools/releaseBuild/**/*
- /.vsts-ci/misc-analysis.yml
- /.github/ISSUE_TEMPLATE/*
- /.dependabot/config.yml
Expand All @@ -41,41 +39,43 @@ resources:
- repo: self
clean: true

jobs:
- template: templates/ci-build.yml
stages:
- stage: BuildWin
displayName: Build for Windows
jobs:
- template: templates/ci-build.yml

- template: templates/windows-test.yml
parameters:
purpose: UnelevatedPesterTests
tagSet: CI
parentJobs:
- win_build
- stage: TestWin
displayName: Test for Windows
jobs:
- template: templates/windows-test.yml
parameters:
purpose: UnelevatedPesterTests
tagSet: CI

- template: templates/windows-test.yml
parameters:
purpose: ElevatedPesterTests
tagSet: CI
parentJobs:
- win_build
- template: templates/windows-test.yml
parameters:
purpose: ElevatedPesterTests
tagSet: CI

- template: templates/windows-test.yml
parameters:
purpose: UnelevatedPesterTests
tagSet: Others
parentJobs:
- win_build
- template: templates/windows-test.yml
parameters:
purpose: UnelevatedPesterTests
tagSet: Others

- template: templates/windows-test.yml
parameters:
purpose: ElevatedPesterTests
tagSet: Others
parentJobs:
- win_build
- template: templates/windows-test.yml
parameters:
purpose: ElevatedPesterTests
tagSet: Others

# Unlike daily builds, we do not upload nuget package to MyGet so we do not wait on tests to finish.
- template: templates/windows-packaging.yml
- template: templates/verify-xunit.yml
parameters:
pool: 'Hosted VS2017'

- stage: PackagingWin
displayName: Packaging for Windows
dependsOn: [] # by specifying an empty array, this stage doesn't depend on the stage before it
jobs:
# Unlike daily builds, we do not upload nuget package to MyGet so we do not wait on tests to finish.
- template: templates/windows-packaging.yml

- template: templates/verify-xunit.yml
parameters:
pool: 'Hosted VS2017'
dependsOn: win_build