From 7217f6b881175491c76565c9631791c766dcf9b5 Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 17:56:24 +0300 Subject: [PATCH 01/15] Update e2e-tests.yml --- .pipelines/templates/e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/templates/e2e-tests.yml b/.pipelines/templates/e2e-tests.yml index 7d89e96c8..6b150b577 100644 --- a/.pipelines/templates/e2e-tests.yml +++ b/.pipelines/templates/e2e-tests.yml @@ -9,7 +9,7 @@ parameters: type: string default: '' steps: - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Start Presidio Cluster inputs: action: Run services From 50a3e483b6cf52aa95745f4a88701e22479475e1 Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 18:00:48 +0300 Subject: [PATCH 02/15] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d424570f0..40981f829 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,7 +21,7 @@ stages: REGISTRY_NAME: '$(ACR_REGISTRY_NAME).azurecr.io/' TAG: ':$(Build.BuildId)' steps: - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build Presidio Images inputs: action: Build services From 6d84ed1d7350d09fcfd4418efc1fb47f89059977 Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 18:02:30 +0300 Subject: [PATCH 03/15] Update build-and-push-containers.yml --- .pipelines/templates/build-and-push-containers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/templates/build-and-push-containers.yml b/.pipelines/templates/build-and-push-containers.yml index 41b7da299..5716752f7 100644 --- a/.pipelines/templates/build-and-push-containers.yml +++ b/.pipelines/templates/build-and-push-containers.yml @@ -14,7 +14,7 @@ parameters: type: string default: 'docker-compose.yml' steps: - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Build Presidio Images inputs: action: Build services From 3ff50509d6c6e2134f945ae778550d32fbd32293 Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 18:03:35 +0300 Subject: [PATCH 04/15] Update azure-pipelines-ci.yml --- azure-pipelines-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml index 08a55230b..e37a83907 100644 --- a/azure-pipelines-ci.yml +++ b/azure-pipelines-ci.yml @@ -39,7 +39,7 @@ stages: REGISTRY_NAME: '$(ACR_REGISTRY_NAME).azurecr.io/' TAG: ':$(Build.BuildId)' steps: - - task: DockerCompose@0 + - task: DockerCompose@1 displayName: Pull Presidio Images from ACR inputs: action: Run a Docker Compose command From 2df5a60cdfedc15306102650cd321118952dd267 Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 18:04:20 +0300 Subject: [PATCH 05/15] Update test-docs.yml --- .pipelines/templates/test-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/templates/test-docs.yml b/.pipelines/templates/test-docs.yml index 0f3324943..49716d35b 100644 --- a/.pipelines/templates/test-docs.yml +++ b/.pipelines/templates/test-docs.yml @@ -16,7 +16,7 @@ steps: versionSpec: '>= 10.x' checkLatest: true -- task: DockerCompose@0 +- task: DockerCompose@1 displayName: 'Run service with docker compose' inputs: containerregistrytype: 'Azure Container Registry' From 290deb39bb9dfef02b172fc208453a9a4b1774df Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 22:11:09 +0300 Subject: [PATCH 06/15] Update build-and-push-containers.yml --- .pipelines/templates/build-and-push-containers.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.pipelines/templates/build-and-push-containers.yml b/.pipelines/templates/build-and-push-containers.yml index 5716752f7..686fe1609 100644 --- a/.pipelines/templates/build-and-push-containers.yml +++ b/.pipelines/templates/build-and-push-containers.yml @@ -23,13 +23,15 @@ steps: REGISTRY_NAME=${{ parameters.REGISTRY_NAME }} IMAGE_PREFIX=${{ parameters.IMAGE_PREFIX }} TAG=${{ parameters.TAG }} - - task: DockerCompose@0 + projectName: 'microsoft_presidio' + - task: DockerCompose@1 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 }} From 30d669838d277ab927ab5626da24d24ccf4b8af2 Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 22:14:12 +0300 Subject: [PATCH 07/15] Update e2e-tests.yml --- .pipelines/templates/e2e-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.pipelines/templates/e2e-tests.yml b/.pipelines/templates/e2e-tests.yml index 6b150b577..9be926573 100644 --- a/.pipelines/templates/e2e-tests.yml +++ b/.pipelines/templates/e2e-tests.yml @@ -9,7 +9,7 @@ parameters: type: string default: '' steps: - - task: DockerCompose@1 + - task: DockerCompose@0 displayName: Start Presidio Cluster inputs: action: Run services @@ -17,7 +17,8 @@ steps: buildImages: false # Start cluster when testing against remote cluster, when an external url is not provided. condition: eq('${{ parameters.anonymizer_base_url }}', '') - + projectName: 'microsoft_presidio' + - task: UsePythonVersion@0 inputs: versionSpec: '3.9' From 5bc970948b15994ba76355c8d3b9cbae199cbf07 Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 22:14:38 +0300 Subject: [PATCH 08/15] Update build-and-push-containers.yml --- .pipelines/templates/build-and-push-containers.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.pipelines/templates/build-and-push-containers.yml b/.pipelines/templates/build-and-push-containers.yml index 686fe1609..ec8215c91 100644 --- a/.pipelines/templates/build-and-push-containers.yml +++ b/.pipelines/templates/build-and-push-containers.yml @@ -14,7 +14,7 @@ parameters: type: string default: 'docker-compose.yml' steps: - - task: DockerCompose@1 + - task: DockerCompose@0 displayName: Build Presidio Images inputs: action: Build services @@ -24,7 +24,8 @@ steps: IMAGE_PREFIX=${{ parameters.IMAGE_PREFIX }} TAG=${{ parameters.TAG }} projectName: 'microsoft_presidio' - - task: DockerCompose@1 + + - task: DockerCompose@0 displayName: Push Presidio Images to ACR inputs: action: 'Push services' From a4a1afd2a401fa53892ecb7b209161aa40c9e765 Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 22:15:20 +0300 Subject: [PATCH 09/15] Update test-docs.yml --- .pipelines/templates/test-docs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.pipelines/templates/test-docs.yml b/.pipelines/templates/test-docs.yml index 49716d35b..f61d7c6af 100644 --- a/.pipelines/templates/test-docs.yml +++ b/.pipelines/templates/test-docs.yml @@ -16,8 +16,9 @@ steps: versionSpec: '>= 10.x' checkLatest: true -- task: DockerCompose@1 +- task: DockerCompose@0 displayName: 'Run service with docker compose' + projectName: 'microsoft_presidio' inputs: containerregistrytype: 'Azure Container Registry' dockerComposeFile: '**/docker-compose.yml' From 1b24796264cce731fbfcefacee9edf236acd7884 Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 22:18:05 +0300 Subject: [PATCH 10/15] Update azure-pipelines-ci.yml --- azure-pipelines-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml index e37a83907..ad498f3d6 100644 --- a/azure-pipelines-ci.yml +++ b/azure-pipelines-ci.yml @@ -39,8 +39,9 @@ stages: REGISTRY_NAME: '$(ACR_REGISTRY_NAME).azurecr.io/' TAG: ':$(Build.BuildId)' steps: - - task: DockerCompose@1 + - task: DockerCompose@0 displayName: Pull Presidio Images from ACR + projectName: 'microsoft_presidio' inputs: action: Run a Docker Compose command dockerComposeCommand: pull From a547286f525267d85622b78bc32b1345622ff003 Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 22:18:20 +0300 Subject: [PATCH 11/15] Update azure-pipelines.yml --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 40981f829..ac799ee34 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,8 +21,9 @@ stages: REGISTRY_NAME: '$(ACR_REGISTRY_NAME).azurecr.io/' TAG: ':$(Build.BuildId)' steps: - - task: DockerCompose@1 + - task: DockerCompose@0 displayName: Build Presidio Images + projectName: 'microsoft_presidio' inputs: action: Build services dockerComposeFile: docker-compose.yml From 0e93ed7312715237d9ad17f3abdbc28bff63cb2a Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 22:19:26 +0300 Subject: [PATCH 12/15] Update azure-pipelines.yml --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ac799ee34..9adc1e0a2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -23,9 +23,10 @@ stages: steps: - task: DockerCompose@0 displayName: Build Presidio Images - projectName: 'microsoft_presidio' + inputs: action: Build services + projectName: 'microsoft_presidio' dockerComposeFile: docker-compose.yml dockerComposeFileArgs: | REGISTRY_NAME=$(REGISTRY_NAME) From f1c5b89c8fefd12fb7a3a4aa15020fa7fa49449f Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 22:19:43 +0300 Subject: [PATCH 13/15] Update azure-pipelines-ci.yml --- azure-pipelines-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml index ad498f3d6..22200339a 100644 --- a/azure-pipelines-ci.yml +++ b/azure-pipelines-ci.yml @@ -41,9 +41,9 @@ stages: steps: - task: DockerCompose@0 displayName: Pull Presidio Images from ACR - projectName: 'microsoft_presidio' inputs: action: Run a Docker Compose command + projectName: 'microsoft_presidio' dockerComposeCommand: pull dockerComposeFile: docker-compose.yml containerregistrytype: 'Container Registry' From 4b6343d82615bc3ff8cf371bdddb24c38f4a35a1 Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 22:20:04 +0300 Subject: [PATCH 14/15] Update test-docs.yml --- .pipelines/templates/test-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/templates/test-docs.yml b/.pipelines/templates/test-docs.yml index f61d7c6af..08e9b9ef7 100644 --- a/.pipelines/templates/test-docs.yml +++ b/.pipelines/templates/test-docs.yml @@ -18,9 +18,9 @@ steps: - task: DockerCompose@0 displayName: 'Run service with docker compose' - projectName: 'microsoft_presidio' inputs: containerregistrytype: 'Azure Container Registry' + projectName: 'microsoft_presidio' dockerComposeFile: '**/docker-compose.yml' action: 'Run services' From b4c4695f2cd2cc1830ed0996d4753b051278dde0 Mon Sep 17 00:00:00 2001 From: Omri Mendels Date: Sun, 4 Aug 2024 22:20:40 +0300 Subject: [PATCH 15/15] Update e2e-tests.yml --- .pipelines/templates/e2e-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.pipelines/templates/e2e-tests.yml b/.pipelines/templates/e2e-tests.yml index 9be926573..02db382df 100644 --- a/.pipelines/templates/e2e-tests.yml +++ b/.pipelines/templates/e2e-tests.yml @@ -13,11 +13,11 @@ 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 }}', '') - projectName: 'microsoft_presidio' - task: UsePythonVersion@0 inputs: @@ -50,6 +50,7 @@ steps: - task: DockerCompose@0 displayName: Docker Logs inputs: + projectName: 'microsoft_presidio' dockerComposeCommand: logs dockerComposeFile: docker-compose.yml buildImages: false