From aa6071f73f468b1b9a24708cf786a434dc896405 Mon Sep 17 00:00:00 2001 From: Fedor Dudinskiy Date: Thu, 5 May 2022 09:40:22 +0200 Subject: [PATCH] Fix failing tests Put postgres data dir to folder, where root access is not required Remove duplicated consul image --- .../ts/external/applications/OpenShiftWorkshopHeroesIT.java | 3 ++- .../ts/external/applications/OpenShiftWorkshopVillainsIT.java | 3 ++- pom.xml | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopHeroesIT.java b/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopHeroesIT.java index 795f65d7c..dd31f9558 100644 --- a/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopHeroesIT.java +++ b/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopHeroesIT.java @@ -49,7 +49,8 @@ public class OpenShiftWorkshopHeroesIT { //fixme https://github.com/quarkus-qe/quarkus-test-framework/issues/455 .withProperty("POSTGRES_USER", "user") .withProperty("POSTGRES_PASSWORD", "user") - .withProperty("POSTGRES_DB", "mydb"); + .withProperty("POSTGRES_DB", "mydb") + .withProperty("PGDATA", "/tmp/psql"); @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-workshops.git", branch = "5bb433fb7a2c8d80dda88dac9dcabc50f7494dc3", contextDir = "quarkus-workshop-super-heroes/super-heroes/rest-heroes", mavenArgs = "-Dquarkus.package.type=uber-jar -DskipTests -Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_VERSION}") static final RestService app = new RestService() diff --git a/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopVillainsIT.java b/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopVillainsIT.java index f77e20fe5..818801d43 100644 --- a/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopVillainsIT.java +++ b/external-applications/src/test/java/io/quarkus/ts/external/applications/OpenShiftWorkshopVillainsIT.java @@ -50,7 +50,8 @@ public class OpenShiftWorkshopVillainsIT { //fixme https://github.com/quarkus-qe/quarkus-test-framework/issues/455 .withProperty("POSTGRES_USER", "user") .withProperty("POSTGRES_PASSWORD", "user") - .withProperty("POSTGRES_DB", "mydb"); + .withProperty("POSTGRES_DB", "mydb") + .withProperty("PGDATA", "/tmp/psql"); @GitRepositoryQuarkusApplication(repo = "https://github.com/quarkusio/quarkus-workshops.git", contextDir = "quarkus-workshop-super-heroes/super-heroes/rest-villains", branch = "3d3425a15daacf1c774cb7f5bc24228c4a623256", mavenArgs = "-Dquarkus.package.type=uber-jar -DskipTests -Dquarkus.platform.group-id=${QUARKUS_PLATFORM_GROUP-ID} -Dquarkus.platform.version=${QUARKUS_VERSION}") static final RestService app = new RestService() diff --git a/pom.xml b/pom.xml index d4b11cd80..7199eac83 100644 --- a/pom.xml +++ b/pom.xml @@ -226,7 +226,6 @@ quay.io/ocpmetal/wiremock docker.io/bitnami/consul:1.12.0 - docker.io/library/consul:1.11 quay.io/infinispan/server:12.1 Infinispan Server.*started in quay.io/quarkusqeteam/spring-cloud-config-server:3.0