chore: use msi instead of sp in windows pipeline (#3585)

Azure · Aug 29, 2023 · 63538a0 · 63538a0
1 parent 2b30384
commit 63538a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/.pipelines/e2e-windows.yaml b/.pipelines/e2e-windows.yaml
@@ -18,7 +18,7 @@ pr:
 pool:
   # uncomment this if the auto teardown pool is down.
   # vmImage: ubuntu-22.04
-  name: $(1ES_DevInfra_Auto_TearDown_Pool_Name)
+  name: $(AZURE_POOL_NAME)
 
 parameters:
 - name: test2019containerd

diff --git a/.pipelines/templates/e2e-windows-template.yaml b/.pipelines/templates/e2e-windows-template.yaml
@@ -24,7 +24,7 @@ jobs:
     - bash: pip install -Iv azure-cli==2.45.0 --extra-index-url https://azurecliprod.blob.core.windows.net/edge
       displayName: use specified version of az cli
     - bash: |
-        az login --service-principal -u $(AZURE_BUILD_CLIENT_ID) -p $(AZURE_BUILD_CLIENT_SECRET) --tenant $(AZURE_BUILD_TENANT_ID)
+        az login --identity
         az account set -s $(AZURE_E2E_SUBSCRIPTION_ID)
       displayName: az login
     - bash: bash .pipelines/scripts/setup_go.sh
@@ -87,7 +87,7 @@ jobs:
     - bash: pip install -Iv azure-cli==2.45.0 --extra-index-url https://azurecliprod.blob.core.windows.net/edge
       displayName: use specified version of az cli
     - bash: |
-        az login --service-principal -u $(AZURE_BUILD_CLIENT_ID) -p $(AZURE_BUILD_CLIENT_SECRET) --tenant $(AZURE_BUILD_TENANT_ID)
+        az login --identity
         az account set -s $(AZURE_E2E_SUBSCRIPTION_ID)
       displayName: az login
     - bash: |

diff --git a/packer.mk b/packer.mk
@@ -52,13 +52,8 @@ endif
 endif
 
 az-login:
-ifeq (${OS_TYPE},Windows)
-	@echo "Logging into Azure with service principal..."
-	@az login --service-principal -u ${CLIENT_ID} -p ${CLIENT_SECRET} --tenant ${TENANT_ID}
-else
 	@echo "Logging into Azure with agent VM MSI..."
 	@az login --identity
-endif
 	@az account set -s ${SUBSCRIPTION_ID}
 
 init-packer: