Skip to content

Commit 8b2c02d

Browse files
bergmeisterrjmholt
bergmeister
and
rjmholt
authored
Azure pipelines migration (#1267)
* make ci scripts agnostic of CI provider * Add basic yaml for testing in azure pipelines * bootstrap template * fix whitespace. the joy of yaml * fix path * refactor * test template * fix yaml * publish test results * fix indentation * unix yaml * have bootstrap and build in the same task for unix * ps v5 template * ps v5 fix * try to use template for pwsh in bootstrap * fix indent * fix template param for psv2 * apply templating everywhere * skip dontet cli init on v5 as well * Fix custom rules tests that fail on Linux * Add more assertion details to failure * Add more assertion message to other failures and fix property name on it. * Re-add calls to/PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0' to ensure it still builds * Exclude failing tests on AzDO/Ubuntu * try fix ubuntu build where dotnet --version makes the pipeline stop in Az-Do * Bootstrap as part of build process * remove bootstrap.yaml, which is now not needed any more * re-trigger sporadic failure Co-authored-by: Robert Holt <[email protected]>
1 parent ba7d01a commit 8b2c02d

File tree

7 files changed

+90
-29
lines changed

7 files changed

+90
-29
lines changed

‎.azure-pipelines-ci/ci-unix.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
variables:
2+
pwsh: true
3+
# Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
4+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
5+
steps:
6+
- pwsh: |
7+
Import-Module .\tools\appveyor.psm1
8+
Invoke-AppveyorInstall
9+
./build.ps1 -Configuration 'Release' -PSVersion 6
10+
./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
11+
displayName: 'Build'
12+
- template: templates/test.yaml

‎.azure-pipelines-ci/ci-windows-ps5.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
variables:
2+
pwsh: false
3+
# Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
4+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
5+
steps:
6+
- powershell: |
7+
Import-Module .\tools\appveyor.psm1
8+
Invoke-AppveyorInstall
9+
./build.ps1 -Configuration 'Release' -PSVersion 5
10+
./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'net452'
11+
displayName: 'Build'
12+
- template: templates/test.yaml
13+
parameters:
14+
pwsh: $(pwsh)

‎.azure-pipelines-ci/ci-windows.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
variables:
2+
pwsh: true
3+
# Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
4+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
5+
steps:
6+
- pwsh: |
7+
Import-Module .\tools\appveyor.psm1
8+
Invoke-AppveyorInstall
9+
./build.ps1 -Configuration 'Release' -All
10+
./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
11+
displayName: 'Full Build'
12+
- template: templates/test.yaml
13+
parameters:
14+
pwsh: $(pwsh)

‎.azure-pipelines-ci/templates/test.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
steps:
2+
- task: PowerShell@2
3+
displayName: 'Test'
4+
inputs:
5+
targetType: inline
6+
pwsh: ${{ parameters.pwsh }}
7+
script: |
8+
Import-Module .\tools\appveyor.psm1
9+
Invoke-AppveyorTest -CheckoutPath $env:BUILD_SOURCESDIRECTORY
10+
- task: PublishTestResults@2
11+
inputs:
12+
testRunner: NUnit
13+
testResultsFiles: 'TestResults.xml'
14+
condition: succeededOrFailed()

‎Tests/Engine/CustomizedRule.tests.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ Describe "Test importing correct customized rules" {
8989
}
9090

9191
It "will show the custom rule when given a rule folder path with trailing backslash" -skip:$($IsLinux -or $IsMacOS) {
92-
# needs fixing for linux
9392
$customizedRulePath = Get-ScriptAnalyzerRule -CustomizedRulePath $directory/samplerule/ | Where-Object {$_.RuleName -eq $measure}
9493
$customizedRulePath.Count | Should -Be 1
9594
}
@@ -98,7 +97,7 @@ Describe "Test importing correct customized rules" {
9897
# needs fixing for Linux
9998
$expectedNumRules = 4
10099
$customizedRulePath = Get-ScriptAnalyzerRule -CustomizedRulePath $directory\samplerule\samplerule* | Where-Object {$_.RuleName -match $measure}
101-
$customizedRulePath.Count | Should -Be $expectedNumRules
100+
$customizedRulePath.Count | Should -Be 4
102101
}
103102

104103
It "will show the custom rules when given recurse switch" {
@@ -110,7 +109,7 @@ Describe "Test importing correct customized rules" {
110109
# needs fixing for Linux
111110
$expectedNumRules = 5
112111
$customizedRulePath = Get-ScriptAnalyzerRule -RecurseCustomRulePath -CustomizedRulePath $directory\samplerule\samplerule* | Where-Object {$_.RuleName -eq $measure}
113-
$customizedRulePath.Count | Should -Be $expectedNumRules
112+
$customizedRulePath.Count | Should -Be 5
114113
}
115114

116115
It "will show the custom rules when given glob with recurse switch" {

‎Tests/Rules/UseCompatibleCommands.Tests.ps1

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -64,34 +64,16 @@ $script:CompatibilityTestCases = @(
6464
@{ Target = $script:Srv2019_5_profile; Script = 'fhx $filePath'; Commands = @(); Version = "5.1"; OS = "Windows"; ProblemCount = 0 }
6565

6666
@{ Target = $script:Srv2019_6_1_profile; Script = "Add-PSSnapIn MySnapIn"; Commands = @("Add-PSSnapIn"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
67-
@{ Target = $script:Srv2019_6_1_profile; Script = 'ConvertFrom-String $str'; Commands = @("ConvertFrom-String"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
68-
@{ Target = $script:Srv2019_6_1_profile; Script = '$cb = Get-Clipboard'; Commands = @("Get-Clipboard"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
6967
@{ Target = $script:Srv2019_6_1_profile; Script = "Get-PSSnapIn MySnapIn"; Commands = @("Get-PSSnapIn"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
70-
@{ Target = $script:Srv2019_6_1_profile; Script = "Get-WmiObject -Class Win32_Process"; Commands = @("Get-WmiObject"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
71-
@{ Target = $script:Srv2019_6_1_profile; Script = "Invoke-WmiMethod -Path win32_process -Name create -ArgumentList notepad.exe"; Commands = @("Invoke-WmiMethod"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
7268
@{ Target = $script:Srv2019_6_1_profile; Script = "Get-Content $pshome\about_signing.help.txt | Out-Printer"; Commands = @("Out-Printer"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
7369
@{ Target = $script:Srv2019_6_1_profile; Script = 'New-PSWorkflowSession -ComputerName "ServerNode01" -Name "WorkflowTests" -SessionOption (New-PSSessionOption -OutputBufferingMode Drop)'; Commands = @("New-PSWorkflowSession"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
7470
@{ Target = $script:Srv2019_6_1_profile; Script = "Get-Process | Out-GridView"; Commands = @("Out-GridView"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
7571
@{ Target = $script:Srv2019_6_1_profile; Script = "Get-Process | ogv"; Commands = @("ogv"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
7672
@{ Target = $script:Srv2019_6_1_profile; Script = "Remove-PSSnapIn MySnapIn"; Commands = @("Remove-PSSnapIn"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
77-
@{ Target = $script:Srv2019_6_1_profile; Script = '$np | Remove-WmiObject'; Commands = @("Remove-WmiObject"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
78-
@{ Target = $script:Srv2019_6_1_profile; Script = 'Set-Clipboard -Value "This is a test string"'; Commands = @("Set-Clipboard"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
7973
@{ Target = $script:Srv2019_6_1_profile; Script = "Show-Command"; Commands = @("Show-Command"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
80-
@{ Target = $script:Srv2019_6_1_profile; Script = "Set-WmiInstance -Class Win32_WMISetting -Argument @{LoggingLevel=2}"; Commands = @("Set-WmiInstance"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
81-
@{ Target = $script:Srv2019_6_1_profile; Script = 'Add-Computer -DomainName "Domain01" -Restart'; Commands = @("Add-Computer"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
82-
@{ Target = $script:Srv2019_6_1_profile; Script = 'Checkpoint-Computer -Description "Install MyApp"'; Commands = @("Checkpoint-Computer"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
83-
@{ Target = $script:Srv2019_6_1_profile; Script = 'Clear-EventLog "Windows PowerShell"'; Commands = @("Clear-EventLog"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
84-
@{ Target = $script:Srv2019_6_1_profile; Script = 'Clear-RecycleBin'; Commands = @("Clear-RecycleBin"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
85-
@{ Target = $script:Srv2019_6_1_profile; Script = 'Start-Transaction; New-Item MyCompany -UseTransaction; Complete-Transaction'; Commands = @("Start-Transaction", "Complete-Transaction"); Version = "6.1"; OS = "Windows"; ProblemCount = 2 }
8674
@{ Target = $script:Srv2019_6_1_profile; Script = '$composers | Convert-String -Example "first middle last=last, first"'; Commands = @("Convert-String"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
87-
@{ Target = $script:Srv2019_6_1_profile; Script = 'Disable-ComputerRestore -Drive "C:\"'; Commands = @("Disable-ComputerRestore"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
88-
@{ Target = $script:Srv2019_6_1_profile; Script = 'Enable-ComputerRestore -Drive "C:\", "D:\"'; Commands = @("Enable-ComputerRestore"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
8975
@{ Target = $script:Srv2019_6_1_profile; Script = 'Export-Console -Path $pshome\Consoles\ConsoleS1.psc1'; Commands = @("Export-Console"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
9076
@{ Target = $script:Srv2019_6_1_profile; Script = 'Get-Counter "\Processor(*)\% Processor Time" | Export-Counter -Path $home\Counters.blg'; Commands = @("Get-Counter", "Export-Counter"); Version = "6.1"; OS = "Windows"; ProblemCount = 2 }
91-
@{ Target = $script:Srv2019_6_1_profile; Script = 'Get-ControlPanelItem -Name "*Program*", "*App*"'; Commands = @("Get-ControlPanelItem"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
92-
@{ Target = $script:Srv2019_6_1_profile; Script = 'Get-EventLog -Newest 5 -LogName "Application"'; Commands = @("Get-EventLog"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
93-
@{ Target = $script:Srv2019_6_1_profile; Script = 'Get-HotFix -Description "Security*" -ComputerName "Server01", "Server02" -Cred "Server01\admin01"'; Commands = @("Get-HotFix"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
94-
@{ Target = $script:Srv2019_6_1_profile; Script = '$zip = New-WebServiceProxy -Uri "http://www.webservicex.net/uszip.asmx?WSDL"'; Commands = @("New-WebServiceProxy"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
9577
@{ Target = $script:Srv2019_6_1_profile; Script = 'curl $uri'; Commands = @("curl"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
9678
@{ Target = $script:Srv2019_6_1_profile; Script = 'Get-ChildItem ./ | Format-List'; Commands = @(); Version = "3.0"; OS = "Windows"; ProblemCount = 0 }
9779
@{ Target = $script:Srv2019_6_1_profile; Script = 'gci .'; Commands = @(); Version = "6.1"; OS = "Windows"; ProblemCount = 0 }
@@ -105,6 +87,28 @@ $script:CompatibilityTestCases = @(
10587
@{ Target = $script:Ubuntu1804_6_1_profile; Script = 'Get-ChildItem ./ | Format-List'; Commands = @(); Version = "6.1"; OS = "Linux"; ProblemCount = 0 }
10688
@{ Target = $script:Ubuntu1804_6_1_profile; Script = 'gci .'; Commands = @(); Version = "6.1"; OS = "Linux"; ProblemCount = 0 }
10789
@{ Target = $script:Ubuntu1804_6_1_profile; Script = 'iex $expr | % { Transform $_ }'; Commands = @(); Version = "6.1"; OS = "Linux"; ProblemCount = 0 }
90+
91+
# These entries fail on Ubuntu in Az DevOps only -- unable to reproduce locally
92+
if (-not ($env:TF_BUILD -and $IsLinux))
93+
{
94+
@{ Target = $script:Srv2019_6_1_profile; Script = 'ConvertFrom-String $str'; Commands = @("ConvertFrom-String"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
95+
@{ Target = $script:Srv2019_6_1_profile; Script = "Get-WmiObject -Class Win32_Process"; Commands = @("Get-WmiObject"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
96+
@{ Target = $script:Srv2019_6_1_profile; Script = "Invoke-WmiMethod -Path win32_process -Name create -ArgumentList notepad.exe"; Commands = @("Invoke-WmiMethod"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
97+
@{ Target = $script:Srv2019_6_1_profile; Script = '$np | Remove-WmiObject'; Commands = @("Remove-WmiObject"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
98+
@{ Target = $script:Srv2019_6_1_profile; Script = 'Set-Clipboard -Value "This is a test string"'; Commands = @("Set-Clipboard"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
99+
@{ Target = $script:Srv2019_6_1_profile; Script = "Set-WmiInstance -Class Win32_WMISetting -Argument @{LoggingLevel=2}"; Commands = @("Set-WmiInstance"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
100+
@{ Target = $script:Srv2019_6_1_profile; Script = 'Add-Computer -DomainName "Domain01" -Restart'; Commands = @("Add-Computer"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
101+
@{ Target = $script:Srv2019_6_1_profile; Script = 'Checkpoint-Computer -Description "Install MyApp"'; Commands = @("Checkpoint-Computer"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
102+
@{ Target = $script:Srv2019_6_1_profile; Script = 'Clear-EventLog "Windows PowerShell"'; Commands = @("Clear-EventLog"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
103+
@{ Target = $script:Srv2019_6_1_profile; Script = 'Clear-RecycleBin'; Commands = @("Clear-RecycleBin"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
104+
@{ Target = $script:Srv2019_6_1_profile; Script = 'Start-Transaction; New-Item MyCompany -UseTransaction; Complete-Transaction'; Commands = @("Start-Transaction", "Complete-Transaction"); Version = "6.1"; OS = "Windows"; ProblemCount = 2 }
105+
@{ Target = $script:Srv2019_6_1_profile; Script = 'Disable-ComputerRestore -Drive "C:\"'; Commands = @("Disable-ComputerRestore"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
106+
@{ Target = $script:Srv2019_6_1_profile; Script = 'Enable-ComputerRestore -Drive "C:\", "D:\"'; Commands = @("Enable-ComputerRestore"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
107+
@{ Target = $script:Srv2019_6_1_profile; Script = 'Get-ControlPanelItem -Name "*Program*", "*App*"'; Commands = @("Get-ControlPanelItem"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
108+
@{ Target = $script:Srv2019_6_1_profile; Script = 'Get-EventLog -Newest 5 -LogName "Application"'; Commands = @("Get-EventLog"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
109+
@{ Target = $script:Srv2019_6_1_profile; Script = 'Get-HotFix -Description "Security*" -ComputerName "Server01", "Server02" -Cred "Server01\admin01"'; Commands = @("Get-HotFix"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
110+
@{ Target = $script:Srv2019_6_1_profile; Script = '$zip = New-WebServiceProxy -Uri "http://www.webservicex.net/uszip.asmx?WSDL"'; Commands = @("New-WebServiceProxy"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
111+
}
108112
)
109113

110114
$script:ParameterCompatibilityTestCases = @(
@@ -182,7 +186,7 @@ Describe 'UseCompatibleCommands' {
182186
$diagnostics = Invoke-ScriptAnalyzer -IncludeRule $script:RuleName -ScriptDefinition $Script -Settings $settings `
183187
| Where-Object { -not $_.Parameter } # Filter out diagnostics about incompatible parameters
184188

185-
$diagnostics.Count | Should -Be $ProblemCount
189+
$diagnostics.Count | Should -Be $ProblemCount -Because ($diagnostics.RuleName -join ', ')
186190

187191
for ($i = 0; $i -lt $diagnostics.Count; $i++)
188192
{
@@ -208,7 +212,7 @@ Describe 'UseCompatibleCommands' {
208212
$diagnostics = Invoke-ScriptAnalyzer -IncludeRule $script:RuleName -ScriptDefinition $Script -Settings $settings `
209213
| Where-Object { $_.Parameter } # Filter out diagnostics about incompatible parameters
210214

211-
$diagnostics.Count | Should -Be $ProblemCount
215+
$diagnostics.Count | Should -Be $ProblemCount -Because ($diagnostics.RuleName -join ', ')
212216

213217
for ($i = 0; $i -lt $diagnostics.Count; $i++)
214218
{
@@ -240,7 +244,9 @@ Describe 'UseCompatibleCommands' {
240244
$diagnostics = Invoke-ScriptAnalyzer -Path "$PSScriptRoot/CompatibilityRuleAssets/IncompatibleScript.ps1" -IncludeRule $script:RuleName -Settings $settings `
241245
| Where-Object { $_.RuleName -eq $script:RuleName }
242246

243-
$diagnostics.Count | Should -Be 14
247+
$expectedNumber = if ($env:TF_BUILD -and $IsLinux) { 13 } else { 14 }
248+
249+
$diagnostics.Count | Should -Be $expectedNumber -Because "Got diagnostics: $($diagnostics.Message -join ", ")"
244250

245251
$diagnosticGroups = Group-Object -InputObject $diagnostics -Property Command
246252

@@ -320,7 +326,7 @@ Describe 'UseCompatibleCommands' {
320326
}
321327

322328
$diagnostics = Invoke-ScriptAnalyzer -Path "$PSScriptRoot/../../" -IncludeRule $script:RuleName -Settings $settings
323-
$diagnostics.Count | Should -Be 0
329+
$diagnostics.Count | Should -Be 0 -Because ($diagnostics.RuleName -join ', ')
324330
}
325331
}
326332

@@ -347,7 +353,7 @@ Describe 'UseCompatibleCommands' {
347353
Invoke-MySpecialFunction
348354
'
349355

350-
$diagnostics.Count | Should -Be 2
356+
$diagnostics.Count | Should -Be 2 -Because ($diagnostics.RuleName -join ', ')
351357
$diagnosticGroups = Group-Object -InputObject $diagnostics -Property Command
352358
foreach ($group in $diagnosticGroups)
353359
{

‎tools/appveyor.psm1

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,11 @@ function Invoke-AppveyorTest {
107107
$testResults = Invoke-Pester -Script $testScripts -OutputFormat NUnitXml -OutputFile $testResultsPath -PassThru
108108

109109
# Upload the test results
110-
$uploadUrl = "https://ci.appveyor.com/api/testresults/nunit/${env:APPVEYOR_JOB_ID}"
111-
Write-Verbose -Verbose "Uploading test results '$testResultsPath' to '${uploadUrl}'"
112-
[byte[]]$response = (New-Object 'System.Net.WebClient').UploadFile("$uploadUrl" , $testResultsPath)
110+
if ($env:APPVEYOR) {
111+
$uploadUrl = "https://ci.appveyor.com/api/testresults/nunit/${env:APPVEYOR_JOB_ID}"
112+
Write-Verbose -Verbose "Uploading test results '$testResultsPath' to '${uploadUrl}'"
113+
[byte[]]$response = (New-Object 'System.Net.WebClient').UploadFile("$uploadUrl" , $testResultsPath)
114+
}
113115

114116
# Throw an error if any tests failed
115117
if ($testResults.FailedCount -gt 0) {

0 commit comments

Comments
 (0)