From 0f22a09d371069aa10d081fc3834765c3ec00598 Mon Sep 17 00:00:00 2001
From: Josef Smrcka <jsmrcka@redhat.com>
Date: Mon, 30 Jan 2023 12:43:44 +0100
Subject: [PATCH] Remove PostgreSQL image workaround

Removes workaround for a failure reported in
https://github.com/quarkus-qe/quarkus-test-framework/issues/641 and
observed in https://github.com/quarkus-qe/quarkus-test-suite/pull/971.
---
 pom.xml                                                         | 2 --
 .../src/test/java/io/quarkus/ts/sqldb/sqlapp/XAPostgresIT.java  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 30cbb058d6..29db1d1a61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,8 +226,6 @@
                                 <ts.global.s2i.quarkus.native.builder.image>${ts.global.s2i.quarkus.native.builder.image}</ts.global.s2i.quarkus.native.builder.image>
                                 <!-- Services used in test suite -->
                                 <postgresql.latest.image>${postgresql.latest.image}</postgresql.latest.image>
-                                <!-- FIXME: if the same image name is used in two test classes, the second one fails -->
-                                <postgresql.also.latest.image>docker.io/library/postgres:15.1</postgresql.also.latest.image>
                                 <!-- TODO: investigate further in https://github.com/quarkus-qe/quarkus-test-suite/issues/627 -->
                                 <elastic.71.image>docker.io/bitnami/elasticsearch:7.17.6</elastic.71.image>
                                 <!--TODO change into 5.7 when this fixed https://github.com/docker-library/mysql/issues/844 -->
diff --git a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/XAPostgresIT.java b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/XAPostgresIT.java
index 5bef73a9ac..19d2a804ef 100644
--- a/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/XAPostgresIT.java
+++ b/sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/XAPostgresIT.java
@@ -11,7 +11,7 @@ public class XAPostgresIT extends AbstractSqlDatabaseIT {
 
     static final int POSTGRESQL_PORT = 5432;
 
-    @Container(image = "${postgresql.also.latest.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
+    @Container(image = "${postgresql.latest.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
     static PostgresqlService database = new PostgresqlService()
             .withUser("user")
             .withPassword("user")