From ae82059eb3a41aa0f0806aa4b302b42194a8862c Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 6 Sep 2020 14:19:28 -0500 Subject: [PATCH] =?UTF-8?q?build:=20=E2=99=BB=20misc=20build=20updates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.directory.migrations.tests.yml | 7 ------- services/directory/azure-pipelines.migrate.yaml | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/docker-compose.directory.migrations.tests.yml b/docker-compose.directory.migrations.tests.yml index e2b838427..8ed9a9316 100644 --- a/docker-compose.directory.migrations.tests.yml +++ b/docker-compose.directory.migrations.tests.yml @@ -6,8 +6,6 @@ services: context: ./services dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile target: test-migrations - networks: - - directory-migrations-tests volumes: - directory-migrations-tests-results:/app/tests/FilterLists.Infrastructure.Migrations.Tests/TestResults depends_on: @@ -15,16 +13,11 @@ services: directory-migrations-tests-db: image: postgres:alpine - networks: - - directory-migrations-tests environment: POSTGRES_USER: ${DIRECTORY_DB_USER} POSTGRES_PASSWORD: ${DIRECTORY_DB_PASSWORD} POSTGRES_DB: ${DIRECTORY_DB_DATABASE} -networks: - directory-migrations-tests: - volumes: directory-migrations-tests-results: external: true diff --git a/services/directory/azure-pipelines.migrate.yaml b/services/directory/azure-pipelines.migrate.yaml index b4a2dc50b..7d1272f5f 100644 --- a/services/directory/azure-pipelines.migrate.yaml +++ b/services/directory/azure-pipelines.migrate.yaml @@ -153,11 +153,11 @@ steps: dockerComposeCommand: build directory-migrations-tests - task: Docker@2 - displayName: create volume test-migrations-results + displayName: create volume directory-migrations-tests-results condition: and(eq(variables['abortJustMigrated.aborted'], 'false'), eq(variables['commitOrAbandon.committed'], 'true'), succeeded()) inputs: command: volume - arguments: create test-migrations-results + arguments: create directory-migrations-tests-results - task: DockerCompose@0 displayName: up test-migrations db