Add container to Linux CI #17233
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,11 +47,15 @@ variables: | |
| __SuppressAnsiEscapeSequences: 1 | ||
|
|
||
| resources: | ||
| repositories: | ||
| - repository: Docker | ||
| type: github | ||
| endpoint: PowerShell | ||
| name: PowerShell/PowerShell-Docker | ||
| ref: master | ||
|
|
||
| stages: | ||
| - stage: BuildLinuxStage | ||
| displayName: Build for Linux | ||
| jobs: | ||
| - template: templates/ci-build.yml | ||
|
|
@@ -60,33 +64,34 @@ stages: | |
| jobName: linux_build | ||
| displayName: linux Build | ||
|
|
||
| - stage: TestUbuntu | ||
| displayName: Test for Ubuntu | ||
| dependsOn: [BuildLinuxStage] | ||
| jobs: | ||
| - template: templates/nix-test.yml | ||
| parameters: | ||
| name: Ubuntu | ||
| pool: ubuntu-20.04 | ||
| purpose: UnelevatedPesterTests | ||
| tagSet: CI | ||
|
|
||
| - template: templates/nix-test.yml | ||
| parameters: | ||
| name: Ubuntu | ||
| pool: ubuntu-20.04 | ||
| purpose: ElevatedPesterTests | ||
| tagSet: CI | ||
|
|
||
| - template: templates/nix-test.yml | ||
| parameters: | ||
| name: Ubuntu | ||
| pool: ubuntu-20.04 | ||
| purpose: UnelevatedPesterTests | ||
| tagSet: Others | ||
|
|
||
| - template: templates/nix-test.yml | ||
| parameters: | ||
| name: Ubuntu | ||
| pool: ubuntu-20.04 | ||
| purpose: ElevatedPesterTests | ||
| tagSet: Others | ||
|
|
@@ -95,24 +100,72 @@ stages: | |
| parameters: | ||
| pool: ubuntu-20.04 | ||
|
|
||
| - stage: TestContainer | ||
| displayName: Test in a container | ||
| dependsOn: [BuildLinuxStage] | ||
| jobs: | ||
| - job: getContainerJob | ||
| displayName: Choose a container | ||
| pool: | ||
| vmImage: ubuntu-20.04 | ||
| steps: | ||
| - checkout: self | ||
| clean: true | ||
|
|
||
| - checkout: Docker | ||
| clean: true | ||
|
|
||
| - pwsh: | | ||
| $matrix = ./PowerShell-Docker/build.ps1 -GenerateMatrixJson -FullJson -Channel preview | ConvertFrom-Json | ||
| # Filter out containers that won't run on AzDevOps Linux host as an agent | ||
| # Windows, nano server, alpine, and any ARM image | ||
| $linuxImages = $matrix.preview | | ||
TravisEz13 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Where-Object {$_.osversion -notmatch 'windows|nano|alpine|arm'} | | ||
| Select-Object JobName, Taglist | | ||
| Sort-Object -property JobName | ||
| # Force mariner for now, later we will add automated rotation by the month. | ||
| $marinerImage = $linuxImages | where-object {$_.JobName -like 'mariner*'} | ||
TravisEz13 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Import-Module ./PowerShell/tools/ci.psm1 | ||
| $tag = $marinerImage.Taglist -split ';' | select-object -first 1 | ||
| $containerName = "mcr.microsoft.com/powershell/test-deps:$tag" | ||
| Set-BuildVariable -Name containerName -Value $containerName -IsOutput | ||
| Set-BuildVariable -Name containerBuildName -Value $marinerImage.JobName -IsOutput | ||
| name: getContainerTask | ||
| displayName: Get Container | ||
| continueOnError: true | ||
|
|
||
| - template: templates/test/nix-container-test.yml | ||
| parameters: | ||
| name: container | ||
| pool: ubuntu-20.04 | ||
| purpose: UnelevatedPesterTests | ||
| tagSet: CI | ||
|
|
||
| - template: templates/test/nix-container-test.yml | ||
| parameters: | ||
| name: container | ||
| pool: ubuntu-20.04 | ||
| purpose: ElevatedPesterTests | ||
| tagSet: CI | ||
|
|
||
| - template: templates/test/nix-container-test.yml | ||
| parameters: | ||
| name: container | ||
| pool: ubuntu-20.04 | ||
| purpose: UnelevatedPesterTests | ||
| tagSet: Others | ||
|
|
||
| - template: templates/test/nix-container-test.yml | ||
| parameters: | ||
| name: container | ||
| pool: ubuntu-20.04 | ||
| purpose: ElevatedPesterTests | ||
| tagSet: Others | ||
|
|
||
| - stage: PackageLinux | ||
| displayName: Package Linux | ||
| dependsOn: ["BuildLinuxStage"] | ||
| jobs: | ||
| - template: linux/templates/packaging.yml | ||
| parameters: | ||
| pool: ubuntu-20.04 | ||
|
There was a problem hiding this comment. On checking a part of this is required, where we create test packages. There was a problem hiding this comment. Line 373 in 36fcec3 There was a problem hiding this comment. spoke offline and we use this from another pipeline. |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1,19 @@ | ||
| parameters: | ||
| pool: 'macOS-latest' | ||
| purpose: '' | ||
| tagSet: 'CI' | ||
| name: 'mac' | ||
|
|
||
| jobs: | ||
| - job: ${{ parameters.name }}_test_${{ parameters.purpose }}_${{ parameters.tagSet }} | ||
|
|
||
| pool: | ||
| vmImage: ${{ parameters.pool }} | ||
|
|
||
| displayName: ${{ parameters.name }} Test - ${{ parameters.purpose }} - ${{ parameters.tagSet }} | ||
|
|
||
| steps: | ||
| - template: ./test/nix-test-steps.yml | ||
| parameters: | ||
| purpose: ${{ parameters.purpose }} | ||
| tagSet: ${{ parameters.tagSet }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| parameters: | ||
| pool: 'macOS-latest' | ||
| purpose: '' | ||
| tagSet: 'CI' | ||
| name: 'mac' | ||
|
|
||
| jobs: | ||
| - job: ${{ parameters.name }}_test_${{ parameters.purpose }}_${{ parameters.tagSet }} | ||
|
|
||
| dependsOn: | ||
| - getContainerJob | ||
|
|
||
| variables: | ||
| getContainerJob: $[ dependencies.getContainerJob.outputs['getContainerTask.containerName'] ] | ||
| __INCONTAINER: 1 | ||
|
|
||
| container: $[ variables.getContainerJob ] | ||
|
|
||
| pool: | ||
| vmImage: ${{ parameters.pool }} | ||
|
|
||
| displayName: ${{ parameters.name }} Test - ${{ parameters.purpose }} - ${{ parameters.tagSet }} | ||
|
|
||
| steps: | ||
| - template: ./nix-test-steps.yml | ||
| parameters: | ||
| purpose: ${{ parameters.purpose }} | ||
| tagSet: ${{ parameters.tagSet }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| parameters: | ||
| purpose: '' | ||
| tagSet: 'CI' | ||
|
|
||
| steps: | ||
| - pwsh: | | ||
| Get-ChildItem -Path env: | ||
| displayName: Capture Environment | ||
| condition: succeededOrFailed() | ||
|
|
||
| - task: DownloadBuildArtifacts@0 | ||
| displayName: 'Download build artifacts' | ||
| inputs: | ||
| downloadType: specific | ||
| itemPattern: | | ||
| build/**/* | ||
| downloadPath: '$(System.ArtifactsDirectory)' | ||
|
|
||
| - pwsh: | | ||
| Get-ChildItem "$(System.ArtifactsDirectory)\*" -Recurse | ||
| displayName: 'Capture Artifacts Directory' | ||
| continueOnError: true | ||
|
|
||
| - pwsh: | | ||
| Import-Module .\tools\ci.psm1 | ||
| Invoke-CIInstall -SkipUser | ||
| displayName: Bootstrap | ||
|
|
||
| - task: ExtractFiles@1 | ||
| displayName: 'Extract Build ZIP' | ||
| inputs: | ||
| archiveFilePatterns: '$(System.ArtifactsDirectory)/build/build.zip' | ||
| destinationFolder: '$(System.ArtifactsDirectory)/bins' | ||
|
|
||
| - bash: | | ||
| find "$(System.ArtifactsDirectory)/bins" -type d -exec chmod +rwx {} \; | ||
| find "$(System.ArtifactsDirectory)/bins" -type f -exec chmod +rw {} \; | ||
TravisEz13 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| displayName: 'Fix permissions' | ||
| continueOnError: true | ||
|
|
||
| - pwsh: | | ||
| Get-ChildItem "$(System.ArtifactsDirectory)\bins\*" -Recurse -ErrorAction SilentlyContinue | ||
| displayName: 'Capture Extracted Build ZIP' | ||
| continueOnError: true | ||
|
|
||
| - pwsh: | | ||
| Import-Module .\tools\ci.psm1 | ||
| Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json' | ||
| $options = (Get-PSOptions) | ||
| $rootPath = '$(System.ArtifactsDirectory)\bins' | ||
| $originalRootPath = Split-Path -path $options.Output | ||
| $path = Join-Path -path $rootPath -ChildPath (split-path -leaf -path $originalRootPath) | ||
| $pwshPath = Join-Path -path $path -ChildPath 'pwsh' | ||
| chmod a+x $pwshPath | ||
| $options.Output = $pwshPath | ||
| Set-PSOptions $options | ||
| Invoke-CITest -Purpose '${{ parameters.purpose }}' -TagSet '${{ parameters.tagSet }}' | ||
| displayName: Test | ||
| condition: succeeded() | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i suppose eventually we should be using
ubuntu-latestand provide a little more future proofingThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's open a separate PR for that. I don't particularly like that because the people on build duty usually just decide to roll back if there is an actual version upgrade.