From 52f6d37cc7817153481bd18d3989447b01d7231e Mon Sep 17 00:00:00 2001 From: KonstantAnxiety Date: Thu, 19 Dec 2024 18:52:55 +0300 Subject: [PATCH 1/9] test: BI-0 increase US healthcheck start_period in tests --- lib/testenv-common/docker-compose.common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/testenv-common/docker-compose.common.yml b/lib/testenv-common/docker-compose.common.yml index 0f93668b3..d91d657e5 100644 --- a/lib/testenv-common/docker-compose.common.yml +++ b/lib/testenv-common/docker-compose.common.yml @@ -16,7 +16,7 @@ services: test: ["CMD", "pg_isready", "-d", "us-db-ci_purgeable"] interval: 5s retries: 10 - start_period: 3s + start_period: 15s us: labels: From 302551dde22559948bb01ecb9005776607e2eea9 Mon Sep 17 00:00:00 2001 From: KonstantAnxiety Date: Thu, 19 Dec 2024 19:13:40 +0300 Subject: [PATCH 2/9] remove -d --- ci/execute_test_with_docker_compose.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/execute_test_with_docker_compose.sh b/ci/execute_test_with_docker_compose.sh index 2af19d0e4..46817b72b 100644 --- a/ci/execute_test_with_docker_compose.sh +++ b/ci/execute_test_with_docker_compose.sh @@ -29,7 +29,7 @@ if [ "$(do-we-need-compose "/src" $TARGET_PATH)" == "1" ]; then cat "docker-compose.fixed.yml" docker compose -f "docker-compose.fixed.yml" build --pull - docker compose -f "docker-compose.fixed.yml" up --force-recreate -d + docker compose -f "docker-compose.fixed.yml" up --force-recreate fi # echo "0" > _debug From a820fe63db9bb8428c5541a857096ef229cd7f92 Mon Sep 17 00:00:00 2001 From: KonstantAnxiety Date: Thu, 19 Dec 2024 19:48:03 +0300 Subject: [PATCH 3/9] Update docker-compose.yml --- lib/dl_file_uploader_api_lib/docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/dl_file_uploader_api_lib/docker-compose.yml b/lib/dl_file_uploader_api_lib/docker-compose.yml index 6f13199cf..550093fa2 100644 --- a/lib/dl_file_uploader_api_lib/docker-compose.yml +++ b/lib/dl_file_uploader_api_lib/docker-compose.yml @@ -42,6 +42,9 @@ services: extends: file: ../testenv-common/docker-compose.common.yml service: us + depends_on: + pg-us: + condition: service_healthy ports: - 51400:8083 From 88251afb5a055c3244d7b92fc3570893edf47d82 Mon Sep 17 00:00:00 2001 From: KonstantAnxiety Date: Thu, 19 Dec 2024 19:48:11 +0300 Subject: [PATCH 4/9] Update docker-compose.yml --- lib/dl_api_lib/docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/dl_api_lib/docker-compose.yml b/lib/dl_api_lib/docker-compose.yml index 2550081f3..708c15fc6 100644 --- a/lib/dl_api_lib/docker-compose.yml +++ b/lib/dl_api_lib/docker-compose.yml @@ -29,5 +29,8 @@ services: extends: file: ../testenv-common/docker-compose.common.yml service: us + depends_on: + pg-us: + condition: service_healthy ports: - "52500:8083" From 4cfeaba56bf0ead0881fd630f17932bdd886235f Mon Sep 17 00:00:00 2001 From: KonstantAnxiety Date: Thu, 19 Dec 2024 19:48:17 +0300 Subject: [PATCH 5/9] Update docker-compose.yml --- lib/dl_file_uploader_worker_lib/docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/dl_file_uploader_worker_lib/docker-compose.yml b/lib/dl_file_uploader_worker_lib/docker-compose.yml index 0ca78e692..fd2780e62 100644 --- a/lib/dl_file_uploader_worker_lib/docker-compose.yml +++ b/lib/dl_file_uploader_worker_lib/docker-compose.yml @@ -42,6 +42,9 @@ services: extends: file: ../testenv-common/docker-compose.common.yml service: us + depends_on: + pg-us: + condition: service_healthy ports: - 51500:8083 From 00fda7c6c51929fee4400febb429dce54389dc26 Mon Sep 17 00:00:00 2001 From: KonstantAnxiety Date: Thu, 19 Dec 2024 19:48:23 +0300 Subject: [PATCH 6/9] Update docker-compose.yml --- lib/dl_connector_greenplum/docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/dl_connector_greenplum/docker-compose.yml b/lib/dl_connector_greenplum/docker-compose.yml index 858fdb1b6..6d7f05859 100644 --- a/lib/dl_connector_greenplum/docker-compose.yml +++ b/lib/dl_connector_greenplum/docker-compose.yml @@ -25,6 +25,9 @@ services: extends: file: ../testenv-common/docker-compose.common.yml service: us + depends_on: + pg-us: + condition: service_healthy ports: - "52311:8083" From f12b5c189e5965eba855d9a14033ed842a8d0ae9 Mon Sep 17 00:00:00 2001 From: KonstantAnxiety Date: Thu, 19 Dec 2024 22:32:37 +0300 Subject: [PATCH 7/9] add hc --- lib/dl_file_uploader_api_lib/docker-compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/dl_file_uploader_api_lib/docker-compose.yml b/lib/dl_file_uploader_api_lib/docker-compose.yml index 550093fa2..c3a6f5b17 100644 --- a/lib/dl_file_uploader_api_lib/docker-compose.yml +++ b/lib/dl_file_uploader_api_lib/docker-compose.yml @@ -35,6 +35,12 @@ services: extends: file: ../testenv-common/docker-compose.common.yml service: pg-us + healthcheck: + test: ["CMD", "pg_isready", "-d", "us-db-ci_purgeable"] + # test: ["CMD", "pg_isready", "-d", "us-db-ci_purgeable", "&&", "sleep", "5"] + interval: 5s + retries: 10 + start_period: 30s ports: - 51409:5432 From b813438d0c871a193d90bb8728ab2478543ac15d Mon Sep 17 00:00:00 2001 From: KonstantAnxiety Date: Fri, 20 Dec 2024 13:37:33 +0300 Subject: [PATCH 8/9] Update docker-compose.yml --- lib/dl_api_lib/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/dl_api_lib/docker-compose.yml b/lib/dl_api_lib/docker-compose.yml index 708c15fc6..12575d358 100644 --- a/lib/dl_api_lib/docker-compose.yml +++ b/lib/dl_api_lib/docker-compose.yml @@ -32,5 +32,6 @@ services: depends_on: pg-us: condition: service_healthy + restart: true ports: - "52500:8083" From 513d255cc7c6ba4d4e4c73ebfd71e20f5cf6308c Mon Sep 17 00:00:00 2001 From: KonstantAnxiety Date: Fri, 20 Dec 2024 13:37:51 +0300 Subject: [PATCH 9/9] Update docker-compose.common.yml --- lib/testenv-common/docker-compose.common.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/testenv-common/docker-compose.common.yml b/lib/testenv-common/docker-compose.common.yml index d91d657e5..b04a2671a 100644 --- a/lib/testenv-common/docker-compose.common.yml +++ b/lib/testenv-common/docker-compose.common.yml @@ -27,6 +27,7 @@ services: depends_on: pg-us: condition: service_healthy + restart: true environment: POSTGRES_DSN_LIST: "postgres://us:us@pg-us:5432/us-db-ci_purgeable" AUTH_POLICY: "required"