@@ -80,16 +80,17 @@ steps:
8080 pwsh : true
8181 ScriptType : InlineScript
8282 Inline : >-
83+ $account = (Get-AzContext).Account;
84+ $env:AZURESUBSCRIPTION_CLIENT_ID = $account.Id;
85+ $env:AZURESUBSCRIPTION_TENANT_ID = $account.Tenants;
86+
8387 if ($IsWindows) {
8488 . $(VENV_LOCATION)/Scripts/Activate.ps1
8589 }
8690 else {
8791 . $(VENV_LOCATION)/bin/activate.ps1
8892 }
8993 Write-Host (Get-Command python).Source
90- $account = (Get-AzContext).Account;
91- $env:AZURESUBSCRIPTION_CLIENT_ID = $account.Id;
92- $env:AZURESUBSCRIPTION_TENANT_ID = $account.Tenants;
9394
9495 python scripts/devops_tasks/dispatch_tox.py
9596 "$(TargetingString)"
@@ -143,16 +144,53 @@ steps:
143144 displayName: Create Coverage Report
144145 condition: and(succeeded(), ${{ parameters.RunCoverage }})
145146
146- - task : PythonScript@0
147- displayName : ' Test Samples'
148- condition : and(succeeded(), eq(variables['TestSamples'], 'true'))
149- inputs :
150- scriptPath : ' scripts/devops_tasks/dispatch_tox.py'
151- arguments : >-
152- "$(TargetingString)"
153- --service="${{ parameters.ServiceDirectory }}"
154- --toxenv="samples"
155- env : ${{ parameters.EnvVars }}
147+ - ${{ if eq('true', parameters.UseFederatedAuth) }} :
148+ - task : AzurePowerShell@5
149+ displayName : Test Samples (AzurePowerShell@5)
150+ condition : and(succeeded(), eq(variables['TestSamples'], 'true'))
151+ env :
152+ SYSTEM_ACCESSTOKEN : $(System.AccessToken)
153+ ${{ insert }} : ${{ parameters.EnvVars }}
154+ inputs :
155+ azureSubscription : ${{ parameters.ServiceConnection }}
156+ azurePowerShellVersion : LatestVersion
157+ pwsh : true
158+ ScriptType : InlineScript
159+ Inline : >-
160+ $account = (Get-AzContext).Account;
161+ $env:AZURESUBSCRIPTION_CLIENT_ID = $account.Id;
162+ $env:AZURESUBSCRIPTION_TENANT_ID = $account.Tenants;
163+
164+ if ($IsWindows) {
165+ . $(VENV_LOCATION)/Scripts/Activate.ps1
166+ }
167+ else {
168+ . $(VENV_LOCATION)/bin/activate.ps1
169+ }
170+ Write-Host (Get-Command python).Source
171+
172+ scripts/devops_tasks/dispatch_tox.py
173+ "$(TargetingString)"
174+ --service="${{ parameters.ServiceDirectory }}"
175+ --toxenv="samples";
176+ Write-Host "Last exit code: $LASTEXITCODE";
177+ exit $LASTEXITCODE;
178+ - ${{ else }} :
179+ - pwsh : |
180+ if ($IsWindows) {
181+ . $(VENV_LOCATION)/Scripts/Activate.ps1
182+ }
183+ else {
184+ . $(VENV_LOCATION)/bin/activate.ps1
185+ }
186+ Write-Host (Get-Command python).Source
187+ python scripts/devops_tasks/dispatch_tox.py "$(TargetingString)" `
188+ --service="${{ parameters.ServiceDirectory }}" `
189+ --toxenv="samples"
190+ exit $LASTEXITCODE;
191+ env: ${{ parameters.EnvVars }}
192+ displayName: 'Test Samples'
193+ condition: and(succeeded(), eq(variables['TestSamples'], 'true'))
156194
157195 - task : PublishTestResults@2
158196 condition : always()
0 commit comments