From 9084d6910967ec95268c91e738d1c16ddebc03ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= Date: Thu, 20 Apr 2023 21:22:03 +0200 Subject: [PATCH] Enable PG service binding tests as upstream issue is fixed --- .../src/main/resources/application.properties | 2 +- .../postgresql-crunchy-classic/src/main/resources/import.sql | 2 +- .../io/quarkus/ts/sb/postgresql/OpenShiftPostgreSqlSbIT.java | 2 -- .../src/test/resources/pg-cluster.yml | 2 +- .../src/main/resources/application.properties | 2 +- .../postgresql-crunchy-reactive/src/main/resources/import.sql | 2 +- .../quarkus/ts/sb/reactive/OpenShiftPostgreSqlReactiveSbIT.java | 2 -- .../src/test/resources/pg-cluster.yml | 2 +- 8 files changed, 6 insertions(+), 10 deletions(-) diff --git a/service-binding/postgresql-crunchy-classic/src/main/resources/application.properties b/service-binding/postgresql-crunchy-classic/src/main/resources/application.properties index 522166d77..7d26e1eea 100644 --- a/service-binding/postgresql-crunchy-classic/src/main/resources/application.properties +++ b/service-binding/postgresql-crunchy-classic/src/main/resources/application.properties @@ -1,6 +1,6 @@ quarkus.kubernetes-service-binding.services.postgresql.api-version=postgres-operator.crunchydata.com/v1beta1 quarkus.kubernetes-service-binding.services.postgresql.kind=PostgresCluster -quarkus.kubernetes-service-binding.services.postgresql.name=hippo +quarkus.kubernetes-service-binding.services.postgresql.name=postgresql quarkus.datasource.db-kind=postgresql quarkus.hibernate-orm.database.generation=drop-and-create diff --git a/service-binding/postgresql-crunchy-classic/src/main/resources/import.sql b/service-binding/postgresql-crunchy-classic/src/main/resources/import.sql index 15fcdb859..6f0f465e0 100644 --- a/service-binding/postgresql-crunchy-classic/src/main/resources/import.sql +++ b/service-binding/postgresql-crunchy-classic/src/main/resources/import.sql @@ -1 +1 @@ -INSERT INTO todo(id, title, completed) VALUES (nextval('hibernate_sequence'), 'Finish the blog post', false); \ No newline at end of file +INSERT INTO todo(id, title, completed) VALUES (nextval('todo_seq'), 'Finish the blog post', false); \ No newline at end of file diff --git a/service-binding/postgresql-crunchy-classic/src/test/java/io/quarkus/ts/sb/postgresql/OpenShiftPostgreSqlSbIT.java b/service-binding/postgresql-crunchy-classic/src/test/java/io/quarkus/ts/sb/postgresql/OpenShiftPostgreSqlSbIT.java index 7b45a81c4..156706aeb 100644 --- a/service-binding/postgresql-crunchy-classic/src/test/java/io/quarkus/ts/sb/postgresql/OpenShiftPostgreSqlSbIT.java +++ b/service-binding/postgresql-crunchy-classic/src/test/java/io/quarkus/ts/sb/postgresql/OpenShiftPostgreSqlSbIT.java @@ -11,7 +11,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.quarkus.test.bootstrap.RestService; @@ -22,7 +21,6 @@ import io.quarkus.test.utils.Command; @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) -@Disabled("https://github.com/quarkusio/quarkus/issues/30682") public class OpenShiftPostgreSqlSbIT { @Inject diff --git a/service-binding/postgresql-crunchy-classic/src/test/resources/pg-cluster.yml b/service-binding/postgresql-crunchy-classic/src/test/resources/pg-cluster.yml index b4cf24331..e3f3468ee 100644 --- a/service-binding/postgresql-crunchy-classic/src/test/resources/pg-cluster.yml +++ b/service-binding/postgresql-crunchy-classic/src/test/resources/pg-cluster.yml @@ -1,7 +1,7 @@ apiVersion: postgres-operator.crunchydata.com/v1beta1 kind: PostgresCluster metadata: - name: hippo + name: postgresql spec: openshift: true image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.2-1 diff --git a/service-binding/postgresql-crunchy-reactive/src/main/resources/application.properties b/service-binding/postgresql-crunchy-reactive/src/main/resources/application.properties index 522166d77..7d26e1eea 100644 --- a/service-binding/postgresql-crunchy-reactive/src/main/resources/application.properties +++ b/service-binding/postgresql-crunchy-reactive/src/main/resources/application.properties @@ -1,6 +1,6 @@ quarkus.kubernetes-service-binding.services.postgresql.api-version=postgres-operator.crunchydata.com/v1beta1 quarkus.kubernetes-service-binding.services.postgresql.kind=PostgresCluster -quarkus.kubernetes-service-binding.services.postgresql.name=hippo +quarkus.kubernetes-service-binding.services.postgresql.name=postgresql quarkus.datasource.db-kind=postgresql quarkus.hibernate-orm.database.generation=drop-and-create diff --git a/service-binding/postgresql-crunchy-reactive/src/main/resources/import.sql b/service-binding/postgresql-crunchy-reactive/src/main/resources/import.sql index 15fcdb859..6f0f465e0 100644 --- a/service-binding/postgresql-crunchy-reactive/src/main/resources/import.sql +++ b/service-binding/postgresql-crunchy-reactive/src/main/resources/import.sql @@ -1 +1 @@ -INSERT INTO todo(id, title, completed) VALUES (nextval('hibernate_sequence'), 'Finish the blog post', false); \ No newline at end of file +INSERT INTO todo(id, title, completed) VALUES (nextval('todo_seq'), 'Finish the blog post', false); \ No newline at end of file diff --git a/service-binding/postgresql-crunchy-reactive/src/test/java/io/quarkus/ts/sb/reactive/OpenShiftPostgreSqlReactiveSbIT.java b/service-binding/postgresql-crunchy-reactive/src/test/java/io/quarkus/ts/sb/reactive/OpenShiftPostgreSqlReactiveSbIT.java index b630fa7c0..c70d59a8c 100644 --- a/service-binding/postgresql-crunchy-reactive/src/test/java/io/quarkus/ts/sb/reactive/OpenShiftPostgreSqlReactiveSbIT.java +++ b/service-binding/postgresql-crunchy-reactive/src/test/java/io/quarkus/ts/sb/reactive/OpenShiftPostgreSqlReactiveSbIT.java @@ -12,7 +12,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.quarkus.test.bootstrap.RestService; @@ -23,7 +22,6 @@ import io.quarkus.test.utils.Command; @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtensionAndDockerBuildStrategy) -@Disabled("https://github.com/quarkusio/quarkus/issues/30682") public class OpenShiftPostgreSqlReactiveSbIT { private static final String PG_CLUSTER_YML = "pg-cluster.yml"; diff --git a/service-binding/postgresql-crunchy-reactive/src/test/resources/pg-cluster.yml b/service-binding/postgresql-crunchy-reactive/src/test/resources/pg-cluster.yml index 3521cc9b7..c8df556d6 100644 --- a/service-binding/postgresql-crunchy-reactive/src/test/resources/pg-cluster.yml +++ b/service-binding/postgresql-crunchy-reactive/src/test/resources/pg-cluster.yml @@ -1,7 +1,7 @@ apiVersion: postgres-operator.crunchydata.com/v1beta1 kind: PostgresCluster metadata: - name: hippo + name: postgresql spec: openshift: true image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.2-1