try even more streamlined version

microsoft · May 14, 2024 · 412966f · 412966f
1 parent 2e98c2f
commit 412966f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 22 deletions.
diff --git a/azure-pipelines/1esstages.yml b/azure-pipelines/1esstages.yml
@@ -22,10 +22,13 @@ stages:
               - template: ./templates/setup.yml
               - template: ./templates/build.yml
               - template: ./templates/1espackage.yml
-              - ${{ if ne(parameters['useAzureFederatedCredentials'], true) }}:
-                  - template: ./templates/test.yml
-              - ${{ if eq(parameters['useAzureFederatedCredentials'], true) }}:
-                  - template: ./templates/test.nightly.yml
+              - template: ./templates/test.nightly.yml
+                parameters:
+                  useAzureFederatedCredentials: ${{ parameters.useAzureFederatedCredentials }}
+              # - ${{ if ne(parameters.useAzureFederatedCredentials, true) }}:
+              #     - template: ./templates/test.yml
+              # - ${{ if eq(parameters.useAzureFederatedCredentials, true) }}:
+              #     - template: ./templates/test.nightly.yml
             variables:
               artifact_name: ${{ job.name }}
               working_directory: ${{ job.working_directory }}

diff --git a/azure-pipelines/templates/test.nightly.yml b/azure-pipelines/templates/test.nightly.yml
@@ -1,25 +1,32 @@
+parameters:
+  - name: useAzureFederatedCredentials
+    type: boolean
+    default: false
+
 steps:
   # This gives the AzCodeE2ETests service connection access to this pipeline.
-  - task: AzureKeyVault@1
-    displayName: "\U0001F449 Authorize AzCodeE2ETests service connection"
-    inputs:
-      azureSubscription: 'AzCodeE2ETests'
-      KeyVaultName: 'AzCodeE2ETestsDummyKV'
-    condition: eq(variables['AzCode_UseAzureFederatedCredentials'], true)
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+  - ${{ if eq(parameters.useAzureFederatedCredentials, true) }}:
+      - task: AzureKeyVault@1
+        displayName: "\U0001F449 Authorize AzCodeE2ETests service connection"
+        inputs:
+          azureSubscription: 'AzCodeE2ETests'
+          KeyVaultName: 'AzCodeE2ETestsDummyKV'
+        condition: eq(variables['AzCode_UseAzureFederatedCredentials'], true)
+        env:
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 
   # This task obtains the values necessary to connect to the AzCodeE2ETests service connection from the AzCodeE2ETestsCredKV key vault.
-  - task: AzureKeyVault@2
-    displayName: "\U0001F449 Get AzCodeE2ETests service connection secrets"
-    inputs:
-      azureSubscription: 'AzCodeE2ETestsCreds'
-      KeyVaultName: 'AzCodeE2ETestsCredsKV'
-      SecretsFilter: 'AzCodeServiceConnectionID, AzCodeServiceConnectionDomain, AzCodeServiceConnectionClientID'
-      RunAsPreJob: true
-    condition: eq(variables['AzCode_UseAzureFederatedCredentials'], true)
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+  - ${{ if eq(parameters.useAzureFederatedCredentials, true) }}:
+      - task: AzureKeyVault@2
+        displayName: "\U0001F449 Get AzCodeE2ETests service connection secrets"
+        inputs:
+          azureSubscription: 'AzCodeE2ETestsCreds'
+          KeyVaultName: 'AzCodeE2ETestsCredsKV'
+          SecretsFilter: 'AzCodeServiceConnectionID, AzCodeServiceConnectionDomain, AzCodeServiceConnectionClientID'
+          RunAsPreJob: true
+        condition: eq(variables['AzCode_UseAzureFederatedCredentials'], true)
+        env:
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 
   - task: Npm@1
     displayName: "\U0001F449 Test"