From a2a4570865c715a8641f2f83cf93f5a92fe31705 Mon Sep 17 00:00:00 2001
From: Alexey Masterov <alexeymasterov@neon.tech>
Date: Wed, 22 Jan 2025 14:41:10 +0100
Subject: [PATCH 1/5] Add PGPASSWORD variable to enable connection from the
 `neon-test-extension` image

---
 docker-compose/docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 6e15fdbe0dde..4f0a887c2745 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -185,6 +185,8 @@ services:
   neon-test-extensions:
     profiles: ["test-extensions"]
     image: ${REPOSITORY:-neondatabase}/neon-test-extensions-v${PG_TEST_VERSION:-16}:${TAG:-latest}
+    environment:
+      - PGPASSWORD=cloud_admin
     entrypoint:
       - "/bin/bash"
       - "-c"

From 3d326ffc498ba3b5548c634cb7ac1272c84c4c05 Mon Sep 17 00:00:00 2001
From: Alexey Masterov <alexeymasterov@neon.tech>
Date: Wed, 22 Jan 2025 15:09:17 +0100
Subject: [PATCH 2/5] Fail the test if psql cannot connect to server

---
 docker-compose/docker_compose_test.sh | 1 -
 docker-compose/run-tests.sh           | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker-compose/docker_compose_test.sh b/docker-compose/docker_compose_test.sh
index 4f1ae64873b0..74e17cd83949 100755
--- a/docker-compose/docker_compose_test.sh
+++ b/docker-compose/docker_compose_test.sh
@@ -22,7 +22,6 @@ PSQL_OPTION="-h localhost -U cloud_admin -p 55433 -d postgres"
 cleanup() {
     echo "show container information"
     docker ps
-    docker compose --profile test-extensions -f $COMPOSE_FILE logs
     echo "stop containers..."
     docker compose --profile test-extensions -f $COMPOSE_FILE down
 }
diff --git a/docker-compose/run-tests.sh b/docker-compose/run-tests.sh
index 3fc0b90071fd..9873187b62c2 100644
--- a/docker-compose/run-tests.sh
+++ b/docker-compose/run-tests.sh
@@ -7,7 +7,10 @@ LIST=$( (echo -e "${SKIP//","/"\n"}"; ls -d -- *-src) | sort | uniq -u)
 for d in ${LIST}
 do
        [ -d "${d}" ] || continue
-    psql -c "select 1" >/dev/null || break
+       if ! psql -w -c "select 1" >/dev/null; then
+          FAILED="${d} ${FAILED}"
+          break
+       fi
        USE_PGXS=1 make -C "${d}" installcheck || FAILED="${d} ${FAILED}"
 done
 [ -z "${FAILED}" ] && exit 0

From f3fde68914b904bf46631ee958ea03d84015fccc Mon Sep 17 00:00:00 2001
From: Alexey Masterov <alexeymasterov@neon.tech>
Date: Wed, 22 Jan 2025 15:37:52 +0100
Subject: [PATCH 3/5] Add a profile for the cleanup step

---
 .github/workflows/build_and_test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 4fc81dccaae0..9fb2e5a629c4 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -820,8 +820,8 @@ jobs:
       - name: Print logs and clean up
         if: always()
         run: |
-          docker compose -f ./docker-compose/docker-compose.yml logs || 0
-          docker compose -f ./docker-compose/docker-compose.yml down
+          docker compose --profile test-extensions -f ./docker-compose/docker-compose.yml logs || true
+          docker compose --profile test-extensions -f ./docker-compose/docker-compose.yml down
 
   promote-images-dev:
     needs: [ check-permissions, tag, vm-compute-node-image, neon-image ]

From e3cbfb9eed792677d3e2247873580836c237901f Mon Sep 17 00:00:00 2001
From: Alexey Masterov <alexeymasterov@neon.tech>
Date: Wed, 22 Jan 2025 16:05:02 +0100
Subject: [PATCH 4/5] Revert "Add a profile for the cleanup step"

This reverts commit f3fde68914b904bf46631ee958ea03d84015fccc.
---
 .github/workflows/build_and_test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 9fb2e5a629c4..4fc81dccaae0 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -820,8 +820,8 @@ jobs:
       - name: Print logs and clean up
         if: always()
         run: |
-          docker compose --profile test-extensions -f ./docker-compose/docker-compose.yml logs || true
-          docker compose --profile test-extensions -f ./docker-compose/docker-compose.yml down
+          docker compose -f ./docker-compose/docker-compose.yml logs || 0
+          docker compose -f ./docker-compose/docker-compose.yml down
 
   promote-images-dev:
     needs: [ check-permissions, tag, vm-compute-node-image, neon-image ]

From 2f028e70e13258dc406be3e872afeb9d84ea8214 Mon Sep 17 00:00:00 2001
From: Alexey Masterov <alexeymasterov@neon.tech>
Date: Wed, 22 Jan 2025 16:06:02 +0100
Subject: [PATCH 5/5] Return logs printing

---
 docker-compose/docker_compose_test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose/docker_compose_test.sh b/docker-compose/docker_compose_test.sh
index 74e17cd83949..4f1ae64873b0 100755
--- a/docker-compose/docker_compose_test.sh
+++ b/docker-compose/docker_compose_test.sh
@@ -22,6 +22,7 @@ PSQL_OPTION="-h localhost -U cloud_admin -p 55433 -d postgres"
 cleanup() {
     echo "show container information"
     docker ps
+    docker compose --profile test-extensions -f $COMPOSE_FILE logs
     echo "stop containers..."
     docker compose --profile test-extensions -f $COMPOSE_FILE down
 }