diff --git a/.vsts-ci/linux-daily.yml b/.vsts-ci/linux-daily.yml index 14cdcc137..e6a5375b0 100644 --- a/.vsts-ci/linux-daily.yml +++ b/.vsts-ci/linux-daily.yml @@ -122,9 +122,6 @@ stages: condition: succeededOrFailed() - pwsh: | - Import-Module .\build.psm1 - Set-CorrectLocale - Import-Module .\tools\ci.psm1 Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json' Invoke-CITest -Purpose UnelevatedPesterTests -TagSet Others @@ -132,9 +129,6 @@ stages: condition: succeededOrFailed() - pwsh: | - Import-Module .\build.psm1 - Set-CorrectLocale - Import-Module .\tools\ci.psm1 Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json' Invoke-CITest -Purpose ElevatedPesterTests -TagSet Others diff --git a/.vsts-ci/templates/nix-test.yml b/.vsts-ci/templates/nix-test.yml index d9ed3e357..6a1b6e6f9 100644 --- a/.vsts-ci/templates/nix-test.yml +++ b/.vsts-ci/templates/nix-test.yml @@ -63,9 +63,6 @@ jobs: continueOnError: true - pwsh: | - Import-Module .\build.psm1 -Force - Set-CorrectLocale - Import-Module .\tools\ci.psm1 Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json' $options = (Get-PSOptions) diff --git a/tools/ci.psm1 b/tools/ci.psm1 index c7b2735ab..f53c9271c 100644 --- a/tools/ci.psm1 +++ b/tools/ci.psm1 @@ -215,6 +215,9 @@ function Invoke-CITest [string] $TagSet ) + # Set locale correctly for Linux CIs + Set-CorrectLocale + # Pester doesn't allow Invoke-Pester -TagAll@('CI', 'RequireAdminOnWindows') currently # https://github.com/pester/Pester/issues/608 # To work-around it, we exlude all categories, but 'CI' from the list