pr-fix: add updated integration test run to release pipeline

arcus-azure · May 30, 2024 · 8864a3a · 8864a3a
1 parent 32f4a2c
commit 8864a3a
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 36 deletions.
diff --git a/build/ci-build.yml b/build/ci-build.yml
@@ -119,23 +119,10 @@ stages:
             inputs:
               artifact: 'Build'
               path: '$(Build.SourcesDirectory)'
-          - task: UseDotNet@2
-            displayName: 'Import .NET Core SDK ($(DotNet.Sdk.PreviousVersion))'
-            inputs:
-              packageType: 'sdk'
-              version: '$(DotNet.Sdk.PreviousVersion)'
-          - task: AzureKeyVault@2
-            displayName: 'Import secrets from Azure Key Vault'
-            inputs:
-              azureSubscription: '${{ parameters.azureServiceConnection }}'
-              KeyVaultName: '${{ parameters.keyVaultName }}'
-              SecretsFilter: '*'
-          - template: test/run-integration-tests.yml@templates
+          - template: test/run-self-contained-integration-tests.yml
             parameters:
-              dotnetSdkVersion: '$(DotNet.Sdk.Version)'
-              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
-              projectName: '$(Project).Tests.Integration'
-              category: 'Integration'
+              azureServiceConnection: '${{ parameters.azureServiceConnection }}'
+              keyVaultName: '${{ parameters.keyVaultName }}'
 
   - stage: DockerTests
     displayName: Docker Tests
@@ -152,11 +139,6 @@ stages:
             inputs:
               artifact: 'Build'
               path: '$(Build.SourcesDirectory)'
-          - task: UseDotNet@2
-            displayName: 'Import .NET Core SDK ($(DotNet.Sdk.PreviousVersion))'
-            inputs:
-              packageType: 'sdk'
-              version: '$(DotNet.Sdk.PreviousVersion)'
           - template: templates/run-docker-integration-tests.yml
             parameters:
               dockerProjectName: '$(Project).Tests.Runtimes.AzureFunction'

diff --git a/build/nuget-release.yml b/build/nuget-release.yml
@@ -6,6 +6,14 @@ pr: none
 parameters:
   - name: 'Package.Version'
     type: 'string'
+  - name: azureServiceConnection
+    displayName: 'Azure service connection'
+    type: string
+    default: 'Azure Codit-Arcus Service Principal'
+  - name: keyVaultName
+    displayName: 'Azure Key vault with integration test secrets'
+    type: string
+    default: 'arcus-observability-kv'
 
 resources:
   repositories:
@@ -93,17 +101,10 @@ stages:
             inputs:
               artifact: 'Build'
               path: '$(Build.SourcesDirectory)'
-          - task: UseDotNet@2
-            displayName: 'Import .NET Core SDK ($(DotNet.Sdk.PreviousVersion))'
-            inputs:
-              packageType: 'sdk'
-              version: '$(DotNet.Sdk.PreviousVersion)'
-          - template: test/run-integration-tests.yml@templates
+          - template: test/run-self-contained-integration-tests.yml
             parameters:
-              dotnetSdkVersion: '$(DotNet.Sdk.Version)'
-              includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
-              projectName: '$(Project).Tests.Integration'
-              category: 'Integration'
+              azureServiceConnection: '${{ parameters.azureServiceConnection }}'
+              keyVaultName: '${{ parameters.keyVaultName }}'
 
   - stage: DockerTests
     displayName: Docker Tests
@@ -120,11 +121,6 @@ stages:
             inputs:
               artifact: 'Build'
               path: '$(Build.SourcesDirectory)'
-          - task: UseDotNet@2
-            displayName: 'Import .NET Core SDK ($(DotNet.Sdk.PreviousVersion))'
-            inputs:
-              packageType: 'sdk'
-              version: '$(DotNet.Sdk.PreviousVersion)'
           - template: templates/run-docker-integration-tests.yml
             parameters:
               dockerProjectName: '$(Project).Tests.Runtimes.AzureFunction'

diff --git a/build/templates/run-docker-integration-tests.yml b/build/templates/run-docker-integration-tests.yml
@@ -15,6 +15,11 @@ steps:
     env:
       PROJECT_NAME: ${{ parameters.dockerProjectName }}
       HTTP_PORT: ${{ parameters.httpPort }}
+  - task: UseDotNet@2
+    displayName: 'Import .NET Core SDK ($(DotNet.Sdk.PreviousVersion))'
+    inputs:
+      packageType: 'sdk'
+      version: '$(DotNet.Sdk.PreviousVersion)'
   - task: UseDotNet@2
     displayName: 'Import .NET Core SDK ($(DotNet.Sdk.Version))'
     inputs:

diff --git a/build/templates/run-self-contained-integration-tests.yml b/build/templates/run-self-contained-integration-tests.yml
@@ -0,0 +1,22 @@
+parameters:
+  azureServiceConnection: ''
+  keyVaultName: ''
+
+steps:
+  - task: UseDotNet@2
+    displayName: 'Import .NET Core SDK ($(DotNet.Sdk.PreviousVersion))'
+    inputs:
+      packageType: 'sdk'
+      version: '$(DotNet.Sdk.PreviousVersion)'
+  - task: AzureKeyVault@2
+    displayName: 'Import secrets from Azure Key Vault'
+    inputs:
+      azureSubscription: '${{ parameters.azureServiceConnection }}'
+      KeyVaultName: '${{ parameters.keyVaultName }}'
+      SecretsFilter: '*'
+  - template: test/run-integration-tests.yml@templates
+    parameters:
+      dotnetSdkVersion: '$(DotNet.Sdk.Version)'
+      includePreviewVersions: $(DotNet.Sdk.IncludePreviewVersions)
+      projectName: '$(Project).Tests.Integration'
+      category: 'Integration'