Merge pull request #1164 from michalvavrik/feature/enable-pg-oc-test

Enable PG service binding tests as upstream issue is fixed
quarkus-qe · Apr 21, 2023 · 8b702fe · 8b702fe
2 parents 42b2043 + 9084d69
commit 8b702fe
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 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
@@ -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
@@ -1 +1 @@
-INSERT INTO todo(id, title, completed) VALUES (nextval('hibernate_sequence'), 'Finish the blog post', false);
+INSERT INTO todo(id, title, completed) VALUES (nextval('todo_seq'), 'Finish the blog post', false);
diff --git a/...ql-crunchy-classic/src/test/java/io/quarkus/ts/sb/postgresql/OpenShiftPostgreSqlSbIT.java b/...ql-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
@@ -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
@@ -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
@@ -1 +1 @@
-INSERT INTO todo(id, title, completed) VALUES (nextval('hibernate_sequence'), 'Finish the blog post', false);
+INSERT INTO todo(id, title, completed) VALUES (nextval('todo_seq'), 'Finish the blog post', false);
diff --git a/...chy-reactive/src/test/java/io/quarkus/ts/sb/reactive/OpenShiftPostgreSqlReactiveSbIT.java b/...chy-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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		INSERT INTO todo(id, title, completed) VALUES (nextval('hibernate_sequence'), 'Finish the blog post', false);
		INSERT INTO todo(id, title, completed) VALUES (nextval('todo_seq'), 'Finish the blog post', false);