From 37db96564f88cb1e91093a2db4027e01a5dbec08 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Mon, 13 Oct 2025 18:11:03 +0100 Subject: [PATCH 1/3] Try spn --- eng/common/core-templates/steps/get-federated-access-token.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/common/core-templates/steps/get-federated-access-token.yml b/eng/common/core-templates/steps/get-federated-access-token.yml index 3a4d4410c482..cff1236fc8d5 100644 --- a/eng/common/core-templates/steps/get-federated-access-token.yml +++ b/eng/common/core-templates/steps/get-federated-access-token.yml @@ -31,6 +31,7 @@ steps: inputs: azureSubscription: ${{ parameters.federatedServiceConnection }} scriptType: 'pscore' + addSpnToEnvironment: true scriptLocation: 'inlineScript' inlineScript: | $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv From 938ef504934cf1e25f044b0dd879bc1384abecca Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Mon, 13 Oct 2025 18:20:30 +0100 Subject: [PATCH 2/3] Add more properties --- eng/common/core-templates/steps/get-delegation-sas.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/common/core-templates/steps/get-delegation-sas.yml b/eng/common/core-templates/steps/get-delegation-sas.yml index 9db5617ea7de..278c4f791050 100644 --- a/eng/common/core-templates/steps/get-delegation-sas.yml +++ b/eng/common/core-templates/steps/get-delegation-sas.yml @@ -26,6 +26,7 @@ steps: inputs: azureSubscription: ${{ parameters.federatedServiceConnection }} scriptType: 'pscore' + addSpnToEnvironment: true scriptLocation: 'inlineScript' inlineScript: | # Calculate the expiration of the SAS token and convert to UTC From 938a99e7e5804c0070ef17c971af317a53889bb5 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 14 Oct 2025 18:43:51 +0100 Subject: [PATCH 3/3] [ci] Enable private feeds again --- eng/pipelines/common/provision.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml index 3a4c14223469..c646c11899cf 100644 --- a/eng/pipelines/common/provision.yml +++ b/eng/pipelines/common/provision.yml @@ -212,12 +212,12 @@ steps: # Provisioning Feeds # ################################################## -# - ${{ if and(eq(variables['System.TeamProject'], 'devdiv'), ne(parameters.skipInternalFeeds, 'true')) }}: -# - template: ../../common/templates-official/steps/enable-internal-sources.yml - -# - template: ../../common/templates-official/steps/enable-internal-runtimes.yml -# parameters: -# federatedServiceConnection: ${{ parameters.federatedServiceConnection }} -# outputVariableName: ${{ parameters.outputVariableName }} -# expiryInHours: ${{ parameters.expiryInHours }} -# base64Encode: ${{ parameters.base64Encode }} +- ${{ if and(eq(variables['System.TeamProject'], 'devdiv'), ne(parameters.skipInternalFeeds, 'true')) }}: + - template: ../../common/templates-official/steps/enable-internal-sources.yml + + - template: ../../common/templates-official/steps/enable-internal-runtimes.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }}