Skip to content

Commit df3f1c4

Browse files
authored
Don't round-trip download through service principal login during stage 1 upload (#14912)
1 parent ac6857c commit df3f1c4

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

eng/common/core-templates/job/source-index-stage1.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,11 @@ jobs:
6969

7070
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
7171
- task: AzureCLI@2
72-
displayName: Get stage 1 auth token
72+
displayName: Log in to Azure and upload stage1 artifacts to source index
7373
inputs:
7474
azureSubscription: 'SourceDotNet Stage1 Publish'
7575
addSpnToEnvironment: true
7676
scriptType: 'ps'
7777
scriptLocation: 'inlineScript'
7878
inlineScript: |
79-
echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId"
80-
echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken"
81-
echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId"
82-
83-
- script: |
84-
echo "Client ID: $(ARM_CLIENT_ID)"
85-
echo "ID Token: $(ARM_ID_TOKEN)"
86-
echo "Tenant ID: $(ARM_TENANT_ID)"
87-
az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
88-
displayName: "Login to Azure"
89-
90-
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
91-
displayName: Upload stage1 artifacts to source index
79+
$(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1

0 commit comments

Comments
 (0)