- Fixing job-service integration tests

apache · Dec 8, 2022 · 929dd94 · 929dd94
1 parent 3d16dfb
commit 929dd94
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/...ommon/src/main/java/org/kie/kogito/index/testcontainers/DataIndexPostgreSqlContainer.java b/...ommon/src/main/java/org/kie/kogito/index/testcontainers/DataIndexPostgreSqlContainer.java
@@ -32,7 +32,6 @@ public void setPostgreSqlURL(String postgreSqlURL, String username, String passw
         addEnv("QUARKUS_DATASOURCE_PASSWORD", password);
         addEnv("QUARKUS_FLYWAY_MIGRATE_AT_START", "true");
         addEnv("QUARKUS_FLYWAY_BASELINE_ON_MIGRATE", "true");
-        addEnv("QUARKUS_FLYWAY_CLEAN_AT_START", "true");
     }
 
     @Override

diff --git a/...obs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java b/...obs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java
@@ -163,6 +163,9 @@ protected void configurePostgreSQLToService(Collection<GenericContainer<?>> cont
                                 service.addEnv("QUARKUS_DATASOURCE_USERNAME", username);
                                 service.addEnv("QUARKUS_DATASOURCE_PASSWORD", password);
                                 service.addEnv("QUARKUS_DATASOURCE_DB-KIND", "postgresql");
+                                service.addEnv("QUARKUS_FLYWAY_MIGRATE_AT_START", "true");
+                                service.addEnv("QUARKUS_FLYWAY_BASELINE_ON_MIGRATE", "true");
+                                service.addEnv("QUARKUS_FLYWAY_CLEAN_AT_START", "false");
                             });
                 });
     }

diff --git a/...s/src/main/java/org/kie/kogito/test/resources/JobServiceCompositeQuarkusTestResource.java b/...s/src/main/java/org/kie/kogito/test/resources/JobServiceCompositeQuarkusTestResource.java
@@ -57,7 +57,7 @@ public void init(JobServiceTestResource annotation) {
         if (annotation.dataIndexEnabled()) {
             DataIndexPostgreSqlContainer container = new DataIndexPostgreSqlContainer();
             container.addProtoFileFolder();
-            KogitoPostgreSqlContainer postgresql = new KogitoPostgreSqlContainer().withInitScript("data_index_postgresql_create.sql");
+            KogitoPostgreSqlContainer postgresql = new KogitoPostgreSqlContainer();
             resource.withServiceContainer("data-index", container, postgresql);
         }
     }

diff --git a/...ation-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml b/...ation-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml
@@ -65,24 +65,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>com.coderplus.maven.plugins</groupId>
-        <artifactId>copy-rename-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-postgresql-file</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <sourceFile>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql</sourceFile>
-              <destinationFile>${project.basedir}/target/classes/data_index_postgresql_create.sql</destinationFile>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>