Fixup smoke test

gocardless · Feb 20, 2025 · 4c1af58 · 4c1af58
1 parent 73f8c9f
commit 4c1af58
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,7 +18,6 @@ jobs:
           bundle exec rubocop --extra-details --display-style-guide --no-server --parallel
 
   smoke_test:
-    timeout-minutes: 5
     strategy:
       fail-fast: false
       matrix:
@@ -33,7 +32,20 @@ jobs:
           POSTGRES_USER: ubuntu
           POSTGRES_PASSWORD: password
         ports:
-          - 5432:5432
+          - 5435:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+      lock_database:
+        image: postgres:14.2
+        env:
+          POSTGRES_DB: lock-test
+          POSTGRES_USER: ubuntu
+          POSTGRES_PASSWORD: password
+        ports:
+          - 5436:5432
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -44,6 +56,12 @@ jobs:
       PGUSER: ubuntu
       PGPASSWORD: password
       PGHOST: localhost
+      PGPORT: 5435
+      LOCK_PGDATABASE: lock-test
+      LOCK_PGUSER: ubuntu
+      LOCK_PGPASSWORD: password
+      LOCK_PGHOST: localhost
+      LOCK_PGPORT: 5436
       RACK_VERSION: "${{ matrix.rack_version }}"
     steps:
       - uses: actions/checkout@v4
@@ -57,6 +75,7 @@ jobs:
           bundle exec rspec spec/smoke_tests/
 
   rspec:
+    timeout-minutes: 5
     strategy:
       fail-fast: false
       matrix: