Merge branch 'main' into chore/improve-analyzer-tests

microsoft · Aug 4, 2024 · 04c6dab · 04c6dab
2 parents 5191db3 + 3e4a806
commit 04c6dab
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/.pipelines/templates/build-and-push-containers.yml b/.pipelines/templates/build-and-push-containers.yml
@@ -23,13 +23,16 @@ steps:
           REGISTRY_NAME=${{ parameters.REGISTRY_NAME }}
           IMAGE_PREFIX=${{ parameters.IMAGE_PREFIX }}
           TAG=${{ parameters.TAG }}
+        projectName: 'microsoft_presidio'
+
   - task: DockerCompose@0
     displayName: Push Presidio Images to ACR
     inputs:
         action: 'Push services'
         dockerComposeFile: ${{ parameters.DOCKER_COMPOSE_FILE }}
         containerregistrytype: 'Container Registry'
         dockerRegistryEndpoint: 'presidio-acr'
+        projectName: 'microsoft_presidio'
         dockerComposeFileArgs: |
           REGISTRY_NAME=${{ parameters.REGISTRY_NAME }}
           IMAGE_PREFIX=${{ parameters.IMAGE_PREFIX }}

diff --git a/.pipelines/templates/e2e-tests.yml b/.pipelines/templates/e2e-tests.yml
@@ -13,11 +13,12 @@ steps:
       displayName: Start Presidio Cluster
       inputs:
           action: Run services
+          projectName: 'microsoft_presidio'
           dockerComposeFile: docker-compose.yml
           buildImages: false
       # Start cluster when testing against remote cluster, when an external url is not provided.
       condition: eq('${{ parameters.anonymizer_base_url }}', '')
-
+      
     - task: UsePythonVersion@0
       inputs:
           versionSpec: '3.9'
@@ -49,6 +50,7 @@ steps:
     - task: DockerCompose@0
       displayName: Docker Logs
       inputs:
+        projectName: 'microsoft_presidio'
         dockerComposeCommand: logs
         dockerComposeFile: docker-compose.yml
         buildImages: false

diff --git a/.pipelines/templates/test-docs.yml b/.pipelines/templates/test-docs.yml
@@ -20,6 +20,7 @@ steps:
   displayName: 'Run service with docker compose'
   inputs:
     containerregistrytype: 'Azure Container Registry'
+    projectName: 'microsoft_presidio'
     dockerComposeFile: '**/docker-compose.yml'
     action: 'Run services'
 

diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml
@@ -43,6 +43,7 @@ stages:
             displayName: Pull Presidio Images from ACR
             inputs:
               action: Run a Docker Compose command
+              projectName: 'microsoft_presidio'
               dockerComposeCommand: pull
               dockerComposeFile: docker-compose.yml
               containerregistrytype: 'Container Registry'

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -23,8 +23,10 @@ stages:
       steps:
         - task: DockerCompose@0
           displayName: Build Presidio Images
+
           inputs:
               action: Build services
+              projectName: 'microsoft_presidio'
               dockerComposeFile: docker-compose.yml
               dockerComposeFileArgs: |
                 REGISTRY_NAME=$(REGISTRY_NAME)