try again provisioning

Author: rmarinho

eng/pipelines/common/provision.yml

@@ -29,26 +29,29 @@ parameters:
   federatedServiceConnection: 'dotnetbuilds-internal-read'
   outputVariableName: 'dotnetbuilds-internal-container-read-token'
   expiryInHours: 1
-  base64Encode: false
-  skipInternalFeeds: true
+  base64Encode: true
+  skipInternalFeeds: false
 
 steps:
+
 ##################################################
-#               Provisioning macOS               #
+#               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 }}
 
-# Populate internal runtime variables.
-- template: /eng/common/templates/steps/enable-internal-sources.yml
-  parameters:
-    legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
-
-- template: /eng/common/templates/steps/enable-internal-runtimes.yml
-  parameters:
-    base64Encode: false
-    outputVariableName: 'dotnetbuilds-internal-container-read-token'
 
+##################################################
+#               Provisioning macOS               #
+##################################################
 
 #check if the _tool directory exists and remove it
 - pwsh: |
@@ -239,18 +242,4 @@ steps:
     displayName: 'Provision Android SDK - Create AVDs'
     condition: succeeded()
     env:
-      AndroidSdkProvisionApiLevel: ${{ parameters.androidEmulatorApiLevel }}
-
-##################################################
-#               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 }}
+      AndroidSdkProvisionApiLevel: ${{ parameters.androidEmulatorApiLevel }}