@@ -37,11 +37,50 @@ steps:
3737 $env:ARM_TENANT_ID = $env:tenantId
3838 $env:ARM_CLIENT_ID = $env:servicePrincipalId
3939 $env:ARM_OIDC_REQUEST_TOKEN = "$(System.AccessToken)"
40- $env:ARM_OIDC_AZURE_SERVICE_CONNECTION_ID = "azapi-oidc-test"
40+ $env:ARM_OIDC_AZURE_SERVICE_CONNECTION_ID = $env:AZURESUBSCRIPTION_SERVICE_CONNECTION_ID
4141 $env:ARM_USE_OIDC = 'true'
4242 $env:ARM_USE_CLI = 'false'
4343 $env:TESTARGS = '-run TestAccAuth_oidc'
4444 make acctests
4545 addSpnToEnvironment : true
4646 useGlobalConfig : true
47+ failOnStandardError : true
48+
49+ - task : AzureCLI@2
50+ displayName : Acc Tests with AzureRM OIDC Azure Pipeline Configurations
51+ inputs :
52+ azureSubscription : ' azapi-oidc-test'
53+ scriptType : ' pscore'
54+ scriptLocation : ' inlineScript'
55+ inlineScript : |
56+ $env:ARM_TENANT_ID = $env:tenantId
57+ $env:ARM_CLIENT_ID = $env:servicePrincipalId
58+ $env:SYSTEM_ACCESSTOKEN = "$(System.AccessToken)"
59+ $env:SYSTEM_OIDCREQUESTURI = "$(System.OidcRequestUri)"
60+ $env:ARM_OIDC_AZURE_SERVICE_CONNECTION_ID = $env:AZURESUBSCRIPTION_SERVICE_CONNECTION_ID
61+ $env:ARM_USE_OIDC = 'true'
62+ $env:ARM_USE_CLI = 'false'
63+ $env:TESTARGS = '-run TestAccAuth_oidc'
64+ make acctests
65+ addSpnToEnvironment : true
66+ useGlobalConfig : true
67+ failOnStandardError : true
68+
69+ - task : AzureCLI@2
70+ displayName : Acc Tests with simplified AzureRM OIDC Azure Pipeline Configurations
71+ inputs :
72+ azureSubscription : ' azapi-oidc-test'
73+ scriptType : ' pscore'
74+ scriptLocation : ' inlineScript'
75+ inlineScript : |
76+ $env:ARM_TENANT_ID = $env:tenantId
77+ $env:ARM_CLIENT_ID = $env:servicePrincipalId
78+ $env:ARM_OIDC_REQUEST_TOKEN = "$(System.AccessToken)"
79+ $env:ARM_USE_OIDC = 'true'
80+ $env:ARM_USE_CLI = 'false'
81+ $env:TESTARGS = '-run TestAccAuth_oidc'
82+
83+ make acctests
84+ addSpnToEnvironment : true
85+ useGlobalConfig : true
4786 failOnStandardError : true
0 commit comments