run connected store tests in separate job with fresh docker-compose (#…

…3356)

* run connected store tests in separate job with fresh docker-compose

build/common/run-e2e-connected-store-tests.yml

@@ -0,0 +1,25 @@
+parameters:
+  externalStorageTests: true
+
+steps:
+- task: DownloadBuildArtifacts@0
+  inputs:
+    buildType: 'current'
+    downloadType: 'single'
+    downloadPath: '$(System.ArtifactsDirectory)'
+    artifactName: 'IntegrationTests'
+
+- script: dotnet test "Microsoft.Health.Dicom.Web.Tests.E2E.dll" --filter "Category!=bvt-dp & Category!=dicomupdate" --logger trx --results-directory "$(Agent.TempDirectory)/TestResults" -e DicomServer__Features__EnableExternalStore="true"
+  displayName: 'dotnet test Microsoft.Health.Dicom.Web.Tests.E2E.dll with EnableExternalStore'
+  workingDirectory: '$(System.ArtifactsDirectory)/IntegrationTests/Microsoft.Health.Dicom.Web.Tests.E2E'
+  condition: eq(${{ parameters.externalStorageTests }}, true)
+
+- task: PublishTestResults@2
+  displayName: 'Publish Connected Store Test Results'
+  condition: succeededOrFailed()
+  inputs:
+    testResultsFormat: 'VSTest'
+    testResultsFiles: '*.trx'
+    searchFolder: '$(Agent.TempDirectory)/TestResults'
+    testRunTitle: 'E2E Connected Store Tests'
+    buildConfiguration: '$(buildConfiguration)'

build/common/run-e2e-features-enabled-connected-store-tests.yml

@@ -0,0 +1,21 @@
+steps:
+- task: DownloadBuildArtifacts@0
+  inputs:
+    buildType: 'current'
+    downloadType: 'single'
+    downloadPath: '$(System.ArtifactsDirectory)'
+    artifactName: 'IntegrationTests'
+
+- script: dotnet test "Microsoft.Health.Dicom.Web.Tests.E2E.dll" --filter "Category=bvt-dp" --logger trx --results-directory "$(Agent.TempDirectory)/TestResults" -e DicomServer__Features__EnableExternalStore="true"
+  displayName: 'dotnet test Microsoft.Health.Dicom.Web.Tests.E2E.dll with EnableExternalStore'
+  workingDirectory: '$(System.ArtifactsDirectory)/IntegrationTests/Microsoft.Health.Dicom.Web.Tests.E2E'
+
+- task: PublishTestResults@2
+  displayName: 'Publish Connected Store Test Results'
+  condition: succeededOrFailed()
+  inputs:
+    testResultsFormat: 'VSTest'
+    testResultsFiles: '*.trx'
+    searchFolder: '$(Agent.TempDirectory)/TestResults'
+    testRunTitle: 'Partitioned Connected Store E2E Tests'
+    buildConfiguration: '$(buildConfiguration)'

build/common/run-e2e-features-enabled-tests.yml

@@ -10,10 +10,6 @@ steps:
   displayName: 'dotnet test Microsoft.Health.Dicom.Web.Tests.E2E.dll'
   workingDirectory: '$(System.ArtifactsDirectory)/IntegrationTests/Microsoft.Health.Dicom.Web.Tests.E2E'
 
-- script: dotnet test "Microsoft.Health.Dicom.Web.Tests.E2E.dll" --filter "Category=bvt-dp" --logger trx --results-directory "$(Agent.TempDirectory)/TestResults" -e DicomServer__Features__EnableExternalStore="true"
-  displayName: 'dotnet test Microsoft.Health.Dicom.Web.Tests.E2E.dll with EnableExternalStore'
-  workingDirectory: '$(System.ArtifactsDirectory)/IntegrationTests/Microsoft.Health.Dicom.Web.Tests.E2E'
-
 - task: PublishTestResults@2
   displayName: 'Publish Test Results'
   condition: succeededOrFailed()

build/common/run-e2e-tests.yml

@@ -13,11 +13,6 @@ steps:
   displayName: 'dotnet test Microsoft.Health.Dicom.Web.Tests.E2E.dll'
   workingDirectory: '$(System.ArtifactsDirectory)/IntegrationTests/Microsoft.Health.Dicom.Web.Tests.E2E'
 
-- script: dotnet test "Microsoft.Health.Dicom.Web.Tests.E2E.dll" --filter "Category!=bvt-dp & Category!=dicomupdate" --logger trx --results-directory "$(Agent.TempDirectory)/TestResults" -e DicomServer__Features__EnableExternalStore="true"
-  displayName: 'dotnet test Microsoft.Health.Dicom.Web.Tests.E2E.dll with EnableExternalStore'
-  workingDirectory: '$(System.ArtifactsDirectory)/IntegrationTests/Microsoft.Health.Dicom.Web.Tests.E2E'
-  condition: eq(${{ parameters.externalStorageTests }}, true)
-
 - task: PublishTestResults@2
   displayName: 'Publish Test Results'
   condition: succeededOrFailed()

build/pr/run-e2e-features-enabled-tests.yml

@@ -30,3 +30,35 @@ jobs:
     displayName: 'Stop docker-compose'
     workingDirectory: 'docker'
     condition: always()
+
+- job: SetupAndRunConnectedStore
+  displayName: 'Feature-Specific E2E Connected Store Tests'
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+    - task: UseDotNet@2
+      displayName: 'Use .Net Core sdk'
+      inputs:
+        useGlobalJson: true
+
+    - script: ContinuousIntegrationBuild=true docker-compose -p healthcare -f docker-compose.yml -f docker-compose.features.yml up --build -d
+      displayName: 'Run docker-compose'
+      workingDirectory: 'docker'
+
+    - bash: for i in {1..12}; do curl -fsS "$(testEnvironmentUrl)health/check" > /dev/null && exit 0 || sleep 5; done; exit 1
+      displayName: 'Wait for DICOM Server'
+
+    - bash: for i in {1..12}; do curl -fsS "$(testFunctionsUrl)" > /dev/null && exit 0 || sleep 5; done; exit 1
+      displayName: 'Wait for DICOM Functions'
+
+    - template: ../common/run-e2e-features-enabled-connected-store-tests.yml
+
+    - script: docker-compose -p healthcare -f docker-compose.yml -f docker-compose.features.yml logs -t
+      displayName: 'docker-compose logs'
+      workingDirectory: 'docker'
+      condition: always()
+
+    - script: docker-compose -p healthcare -f docker-compose.yml -f docker-compose.features.yml rm -s -f
+      displayName: 'Stop docker-compose'
+      workingDirectory: 'docker'
+      condition: always()

build/pr/run-e2e-tests.yml

@@ -30,3 +30,35 @@ jobs:
     displayName: 'Stop docker-compose'
     workingDirectory: 'docker'
     condition: always()
+
+- job: SetupAndRunConnectedStore
+  displayName: 'E2E Connected Store Tests'
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+    - task: UseDotNet@2
+      displayName: 'Use .Net Core sdk'
+      inputs:
+        useGlobalJson: true
+
+    - script: ContinuousIntegrationBuild=true docker-compose -p healthcare -f docker-compose.yml -f docker-compose.ports.azurite.yml up --build -d
+      displayName: 'Run docker-compose'
+      workingDirectory: 'docker'
+
+    - bash: for i in {1..12}; do curl -fsS "$(testEnvironmentUrl)health/check" > /dev/null && exit 0 || sleep 5; done; exit 1
+      displayName: 'Wait for DICOM Server'
+
+    - bash: for i in {1..12}; do curl -fsS "$(testFunctionsUrl)" > /dev/null && exit 0 || sleep 5; done; exit 1
+      displayName: 'Wait for DICOM Functions'
+
+    - template: ../common/run-e2e-connected-store-tests.yml
+
+    - script: docker-compose -p healthcare -f docker-compose.yml logs -t
+      displayName: 'docker-compose logs'
+      workingDirectory: 'docker'
+      condition: always()
+
+    - script: docker-compose -p healthcare -f docker-compose.yml rm -s -f
+      displayName: 'Stop docker-compose'
+      workingDirectory: 'docker'
+      condition: always()