ci: fix postgres flaky tests

eclipse-tractusx · Sep 23, 2024 · 7e63df3 · 7e63df3
1 parent 49c4d08
commit 7e63df3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
@@ -123,14 +123,6 @@ jobs:
 
  postgres-tests:
  runs-on: ubuntu-latest
- services:
- postgres:
- image: postgres:16.1
- ports:
- - 5432:5432
- env:
- POSTGRES_PASSWORD: password
-
  steps:
  - uses: actions/checkout@v4
  - uses: ./.github/actions/setup-java

diff --git a/...res/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/PgRuntimeExtension.java b/...res/src/testFixtures/java/org/eclipse/tractusx/edc/tests/runtimes/PgRuntimeExtension.java
@@ -19,12 +19,15 @@
 
 package org.eclipse.tractusx.edc.tests.runtimes;
 
+import com.github.dockerjava.api.model.ExposedPort;
+import org.eclipse.edc.util.io.Ports;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
 import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.util.List;
 import java.util.Map;
 
 import static java.lang.String.format;
@@ -45,10 +48,12 @@ public PgRuntimeExtension(String moduleName, String runtimeName, String bpn, Map
  this.dbName = runtimeName.toLowerCase();
  postgreSqlContainer = new PostgreSQLContainer<>(POSTGRES_IMAGE_NAME)
  .withLabel("runtime", dbName)
- .withExposedPorts(5432)
  .withUsername(USER)
  .withPassword(PASSWORD)
  .withDatabaseName(dbName);
+
+ postgreSqlContainer.setPortBindings(List.of("%d:5432".formatted(Ports.getFreePort())));
+
  }
 
  @Override