- changed script locations

- fixing test containers
apache · Sep 25, 2024 · bcf611f · bcf611f
1 parent 4397509
commit bcf611f
Show file tree

Hide file tree

Showing 46 changed files with 27 additions and 28 deletions.
diff --git a/...-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java b/...-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java
@@ -32,6 +32,7 @@ public JobServiceContainer() {
         waitingFor(Wait.forHttp("/q/health/live").forStatusCode(200)).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
         addEnv("QUARKUS_HTTP_PORT", Integer.toString(PORT));
         addEnv("QUARKUS_LOG_CATEGORY__ORG_KIE_KOGITO_JOBS_SERVICE__LEVEL", "DEBUG");
+        addEnv("KIE_FLYWAY_ENABLED", "true");
         withAccessToHost(true);
     }
 

diff --git a/...jpa/kogito-addons-data-audit-jpa-common/src/main/resources/META-INF/kie-flyway.properties b/...jpa/kogito-addons-data-audit-jpa-common/src/main/resources/META-INF/kie-flyway.properties
@@ -19,5 +19,5 @@
 
 module.name=data-audit
 
-module.locations.h2=classpath:db/data-audit/h2
-module.locations.postgresql=classpath:db/data-audit/postgresql
+module.locations.h2=classpath:kie-flyway/db/data-audit/h2
+module.locations.postgresql=classpath:kie-flyway/db/data-audit/postgresql
diff --git a/...t/h2/V1.0.0__CREATE DATA AUDIT SCHEMA.sql → ...t/h2/V1.0.0__CREATE DATA AUDIT SCHEMA.sql b/...t/h2/V1.0.0__CREATE DATA AUDIT SCHEMA.sql → ...t/h2/V1.0.0__CREATE DATA AUDIT SCHEMA.sql
diff --git a/...__Add Query audit dynamic registering.sql → ...__Add Query audit dynamic registering.sql b/...__Add Query audit dynamic registering.sql → ...__Add Query audit dynamic registering.sql
diff --git a/...t/h2/V1.2.0__Add migration event type.sql → ...t/h2/V1.2.0__Add migration event type.sql b/...t/h2/V1.2.0__Add migration event type.sql → ...t/h2/V1.2.0__Add migration event type.sql
diff --git a/...esql/V1.0.0__CREATE DATA AUDIT SCHEMA.sql → ...esql/V1.0.0__CREATE DATA AUDIT SCHEMA.sql b/...esql/V1.0.0__CREATE DATA AUDIT SCHEMA.sql → ...esql/V1.0.0__CREATE DATA AUDIT SCHEMA.sql
diff --git a/...__Add Query audit dynamic registering.sql → ...__Add Query audit dynamic registering.sql b/...__Add Query audit dynamic registering.sql → ...__Add Query audit dynamic registering.sql
diff --git a/...esql/V1.2.0__Add migration event type.sql → ...esql/V1.2.0__Add migration event type.sql b/...esql/V1.2.0__Add migration event type.sql → ...esql/V1.2.0__Add migration event type.sql
diff --git a/data-index/data-index-storage/data-index-storage-jpa/.gitignore b/data-index/data-index-storage/data-index-storage-jpa/.gitignore
@@ -1 +1 @@
-/src/main/resources/db/data-index/postgresql/*
+/src/main/resources/kie-flyway/db/data-index/postgresql/*
diff --git a/data-index/data-index-storage/data-index-storage-jpa/pom.xml b/data-index/data-index-storage/data-index-storage-jpa/pom.xml
@@ -34,7 +34,7 @@
 
   <properties>
     <path.to.postgresql.storage>../data-index-storage-postgresql</path.to.postgresql.storage>
-    <path.to.script.folder>src/main/resources/db/</path.to.script.folder>
+    <path.to.script.folder>src/main/resources/kie-flyway/db/</path.to.script.folder>
     <path.to.migration.scripts.from>${path.to.postgresql.storage}/${path.to.script.folder}/data-index/postgresql</path.to.migration.scripts.from>
     <path.to.migration.scripts.to>${path.to.script.folder}/data-index/postgresql</path.to.migration.scripts.to>
     <java.module.name>org.kie.kogito.index.jpa</java.module.name>

diff --git a/...ta-index-storage/data-index-storage-jpa/src/main/resources/META-INF/kie-flyway.properties b/...ta-index-storage/data-index-storage-jpa/src/main/resources/META-INF/kie-flyway.properties
@@ -19,5 +19,5 @@
 
 module.name=data-index
 
-module.locations.postgresql=classpath:db/data-index/postgresql,classpath:db/persistence-common/postgresql
-module.locations.default=classpath:db/data-index/ansi,classpath:db/persistence-common/ansi
+module.locations.postgresql=classpath:kie-flyway/db/data-index/postgresql,classpath:kie-flyway/db/persistence-common/postgresql
+module.locations.default=classpath:kie-flyway/db/data-index/ansi,classpath:kie-flyway/db/persistence-common/ansi
diff --git a/...index/ansi/V1.33.0__data_index_create.sql → ...index/ansi/V1.33.0__data_index_create.sql b/...index/ansi/V1.33.0__data_index_create.sql → ...index/ansi/V1.33.0__data_index_create.sql
diff --git a/.../ansi/V1.44.0__data_index_definitions.sql → .../ansi/V1.44.0__data_index_definitions.sql b/.../ansi/V1.44.0__data_index_definitions.sql → .../ansi/V1.44.0__data_index_definitions.sql
diff --git a/...1.45.0.0__data_index_node_definitions.sql → ...1.45.0.0__data_index_node_definitions.sql b/...1.45.0.0__data_index_node_definitions.sql → ...1.45.0.0__data_index_node_definitions.sql
diff --git a/...0.1__add_identity_to_process_instance.sql → ...0.1__add_identity_to_process_instance.sql b/...0.1__add_identity_to_process_instance.sql → ...0.1__add_identity_to_process_instance.sql
diff --git a/....2__data_index_definitions_add_colums.sql → ....2__data_index_definitions_add_colums.sql b/....2__data_index_definitions_add_colums.sql → ....2__data_index_definitions_add_colums.sql
diff --git a/...ta-index/ansi/V1.45.0.3__add_fk_index.sql → ...ta-index/ansi/V1.45.0.3__add_fk_index.sql b/...ta-index/ansi/V1.45.0.3__add_fk_index.sql → ...ta-index/ansi/V1.45.0.3__add_fk_index.sql
diff --git a/...si/V1.45.0.4__increase_varchar_length.sql → ...si/V1.45.0.4__increase_varchar_length.sql b/...si/V1.45.0.4__increase_varchar_length.sql → ...si/V1.45.0.4__increase_varchar_length.sql
diff --git a/...x-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties b/...x-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties
@@ -19,4 +19,4 @@
 
 module.name=data-index
 
-module.locations.postgresql=classpath:db/data-index/postgresql,classpath:db/persistence-common/postgresql
+module.locations.postgresql=classpath:kie-flyway/db/data-index/postgresql,classpath:kie-flyway/db/persistence-common/postgresql
diff --git a/...postgresql/V1.32.0__data_index_create.sql → ...postgresql/V1.32.0__data_index_create.sql b/...postgresql/V1.32.0__data_index_create.sql → ...postgresql/V1.32.0__data_index_create.sql
diff --git a/...resql/V1.44.0__data_index_definitions.sql → ...resql/V1.44.0__data_index_definitions.sql b/...resql/V1.44.0__data_index_definitions.sql → ...resql/V1.44.0__data_index_definitions.sql
diff --git a/...1.45.0.0__data_index_node_definitions.sql → ...1.45.0.0__data_index_node_definitions.sql b/...1.45.0.0__data_index_node_definitions.sql → ...1.45.0.0__data_index_node_definitions.sql
diff --git a/...0.1__add_identity_to_process_instance.sql → ...0.1__add_identity_to_process_instance.sql b/...0.1__add_identity_to_process_instance.sql → ...0.1__add_identity_to_process_instance.sql
diff --git a/...2__data_index_definitions_add_columns.sql → ...2__data_index_definitions_add_columns.sql b/...2__data_index_definitions_add_columns.sql → ...2__data_index_definitions_add_columns.sql
diff --git a/...ex/postgresql/V1.45.0.3__add_fk_index.sql → ...ex/postgresql/V1.45.0.3__add_fk_index.sql b/...ex/postgresql/V1.45.0.3__add_fk_index.sql → ...ex/postgresql/V1.45.0.3__add_fk_index.sql
diff --git a/...ql/V1.45.0.4__increase_varchar_length.sql → ...ql/V1.45.0.4__increase_varchar_length.sql b/...ql/V1.45.0.4__increase_varchar_length.sql → ...ql/V1.45.0.4__increase_varchar_length.sql
diff --git a/...urces/db/data-index/postgresql/readme.txt → ...lyway/db/data-index/postgresql/readme.txt b/...urces/db/data-index/postgresql/readme.txt → ...lyway/db/data-index/postgresql/readme.txt
diff --git a/...tils/src/main/java/org/kie/kogito/index/test/containers/DataIndexPostgreSqlContainer.java b/...tils/src/main/java/org/kie/kogito/index/test/containers/DataIndexPostgreSqlContainer.java
@@ -35,9 +35,7 @@ public void setPostgreSqlURL(String postgreSqlURL, String username, String passw
     }
 
     public void migrateDB() {
-        addEnv("QUARKUS_FLYWAY_MIGRATE_AT_START", "true");
-        addEnv("QUARKUS_FLYWAY_BASELINE_ON_MIGRATE", "true");
-        addEnv("QUARKUS_FLYWAY_TABLE", "data-index-flyway");
+        addEnv("KIE_FLYWAY_ENABLED", "true");
     }
 
     @Override

diff --git a/...-service/jobs-service-postgresql-common/src/main/resources/META-INF/kie-flyway.properties b/...-service/jobs-service-postgresql-common/src/main/resources/META-INF/kie-flyway.properties
@@ -19,4 +19,4 @@
 
 module.name=jobs-service
 
-module.locations.postgresql=classpath:db/jobs-service/postgresql
+module.locations.postgresql=classpath:kie-flyway/db/jobs-service/postgresql
diff --git a/...rvice/postgresql/V2.0.0__Create_Table.sql → ...rvice/postgresql/V2.0.0__Create_Table.sql b/...rvice/postgresql/V2.0.0__Create_Table.sql → ...rvice/postgresql/V2.0.0__Create_Table.sql
diff --git a/...0.1__job_details_increase_job_id_size.sql → ...0.1__job_details_increase_job_id_size.sql b/...0.1__job_details_increase_job_id_size.sql → ...0.1__job_details_increase_job_id_size.sql
diff --git a/...V2.0.2__job_details_add_fire_time_col.sql → ...V2.0.2__job_details_add_fire_time_col.sql b/...V2.0.2__job_details_add_fire_time_col.sql → ...V2.0.2__job_details_add_fire_time_col.sql
diff --git a/...resql/V2.0.3__Create_Table_Management.sql → ...resql/V2.0.3__Create_Table_Management.sql b/...resql/V2.0.3__Create_Table_Management.sql → ...resql/V2.0.3__Create_Table_Management.sql
diff --git a/...stgresql/V3.0.0__Create_Jobs_Table_V2.sql → ...stgresql/V3.0.0__Create_Jobs_Table_V2.sql b/...stgresql/V3.0.0__Create_Jobs_Table_V2.sql → ...stgresql/V3.0.0__Create_Jobs_Table_V2.sql
diff --git a/...l/V3.0.1__Migrate_Jobs_v1_to_v2_Table.sql → ...l/V3.0.1__Migrate_Jobs_v1_to_v2_Table.sql b/...l/V3.0.1__Migrate_Jobs_v1_to_v2_Table.sql → ...l/V3.0.1__Migrate_Jobs_v1_to_v2_Table.sql
diff --git a/...sql/V3.0.2__Add_Execution_Timeout_Col.sql → ...sql/V3.0.2__Add_Execution_Timeout_Col.sql b/...sql/V3.0.2__Add_Execution_Timeout_Col.sql → ...sql/V3.0.2__Add_Execution_Timeout_Col.sql
diff --git a/...ce/postgresql/V3.0.3__Add_Created_Col.sql → ...ce/postgresql/V3.0.3__Add_Created_Col.sql b/...ce/postgresql/V3.0.3__Add_Created_Col.sql → ...ce/postgresql/V3.0.3__Add_Created_Col.sql
diff --git a/jobs-service/jobs-service-storage-jpa/.gitignore b/jobs-service/jobs-service-storage-jpa/.gitignore
@@ -1 +1 @@
-/src/main/resources/db/jobs-service/postgresql/*
+/src/main/resources/kie-flyway/db/jobs-service/postgresql/*
diff --git a/jobs-service/jobs-service-storage-jpa/src/main/resources/META-INF/kie-flyway.properties b/jobs-service/jobs-service-storage-jpa/src/main/resources/META-INF/kie-flyway.properties
@@ -19,5 +19,5 @@
 
 module.name=jobs-service
 
-module.locations.postgresql=classpath:db/jobs-service/postgresql
-module.locations.default=classpath:db/jobs-service/ansi
+module.locations.postgresql=classpath:kie-flyway/db/jobs-service/postgresql
+module.locations.default=classpath:kie-flyway/db/jobs-service/ansi
diff --git a/...bs-service/ansi/V2.0.0__Create_Tables.sql → ...bs-service/ansi/V2.0.0__Create_Tables.sql b/...bs-service/ansi/V2.0.0__Create_Tables.sql → ...bs-service/ansi/V2.0.0__Create_Tables.sql
diff --git a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml
@@ -38,14 +38,14 @@
     <fileSets>
         <!-- Persistence Commons -->
         <fileSet>
-            <directory>${project.root.dir}/persistence-commons/persistence-commons-jpa/src/main/resources/db/persistence-commons/ansi</directory>
+            <directory>${project.root.dir}/persistence-commons/persistence-commons-jpa/src/main/resources/kie-flyway/db/persistence-commons/ansi</directory>
             <outputDirectory>h2/persistence-commons</outputDirectory>
             <includes>
                 <include>*.sql</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.root.dir}/persistence-commons/persistence-commons-postgresql/src/main/resources/db/persistence-commons/postgresql</directory>
+            <directory>${project.root.dir}/persistence-commons/persistence-commons-postgresql/src/main/resources/kie-flyway/db/persistence-commons/postgresql</directory>
             <outputDirectory>postgresql/persistence-commons</outputDirectory>
             <includes>
                 <include>*.sql</include>
@@ -54,14 +54,14 @@
 
         <!-- Data Index -->
         <fileSet>
-            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi</directory>
+            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi</directory>
             <outputDirectory>h2/data-index</outputDirectory>
             <includes>
                 <include>*.sql</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql</directory>
+            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql</directory>
             <outputDirectory>postgresql/data-index</outputDirectory>
             <includes>
                 <include>*.sql</include>
@@ -70,14 +70,14 @@
 
         <!-- Data Audit -->
         <fileSet>
-            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/h2</directory>
+            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/h2</directory>
             <outputDirectory>h2/data-audit</outputDirectory>
             <includes>
                 <include>*.sql</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/postgresql</directory>
+            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/postgresql</directory>
             <outputDirectory>postgresql/data-audit</outputDirectory>
             <includes>
                 <include>*.sql</include>
@@ -86,14 +86,14 @@
 
         <!-- Job Service -->
         <fileSet>
-            <directory>${project.root.dir}/jobs-service/jobs-service-storage-jpa/src/main/resources/db/jobs-service/ansi</directory>
+            <directory>${project.root.dir}/jobs-service/jobs-service-storage-jpa/src/main/resources/kie-flyway/db/jobs-service/ansi</directory>
             <outputDirectory>h2/jobs-service</outputDirectory>
             <includes>
                 <include>*.sql</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql</directory>
+            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql</directory>
             <outputDirectory>postgresql/jobs-service</outputDirectory>
             <includes>
                 <include>*.sql</include>

diff --git a/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml
@@ -38,7 +38,7 @@
     <fileSets>
         <!-- Persistence Commons -->
         <fileSet>
-            <directory>${project.root.dir}/persistence-commons/persistence-commons-postgresql/src/main/resources/db/persistence-commons/postgresql</directory>
+            <directory>${project.root.dir}/persistence-commons/persistence-commons-postgresql/src/main/resources/kie-flyway/db/persistence-commons/postgresql</directory>
             <outputDirectory>postgresql/persistence-commons</outputDirectory>
             <includes>
                 <include>*.sql</include>
@@ -47,7 +47,7 @@
 
         <!-- Data Index -->
         <fileSet>
-            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql</directory>
+            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql</directory>
             <outputDirectory>postgresql/data-index</outputDirectory>
             <includes>
                 <include>*.sql</include>
@@ -56,7 +56,7 @@
 
         <!-- Data Audit -->
         <fileSet>
-            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/postgresql</directory>
+            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/postgresql</directory>
             <outputDirectory>postgresql/data-audit</outputDirectory>
             <includes>
                 <include>*.sql</include>
@@ -65,7 +65,7 @@
 
         <!-- Job Service -->
         <fileSet>
-            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql</directory>
+            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql</directory>
             <outputDirectory>postgresql/jobs-service</outputDirectory>
             <includes>
                 <include>*.sql</include>

diff --git a/persistence-commons/persistence-commons-jpa/.gitignore b/persistence-commons/persistence-commons-jpa/.gitignore
@@ -1 +1 @@
-/src/main/resources/db/persistence-commons/postgresql/*
+/src/main/resources/kie-flyway/db/persistence-commons/postgresql/*
diff --git a/persistence-commons/persistence-commons-jpa/pom.xml b/persistence-commons/persistence-commons-jpa/pom.xml
@@ -34,7 +34,7 @@
 
   <properties>
     <path.to.postgresql.storage>../persistence-commons-postgresql</path.to.postgresql.storage>
-    <path.to.script.folder>src/main/resources/db/</path.to.script.folder>
+    <path.to.script.folder>src/main/resources/kie-flyway/db/</path.to.script.folder>
     <path.to.migration.scripts.from>${path.to.postgresql.storage}/${path.to.script.folder}/persistence-commons/postgresql</path.to.migration.scripts.from>
     <path.to.migration.scripts.to>${path.to.script.folder}/persistence-commons/postgresql</path.to.migration.scripts.to>
     <java.module.name>org.kie.kogito.persistence.jpa</java.module.name>

diff --git a/..._kogito_apps_create_kogito_data_cache.sql → ..._kogito_apps_create_kogito_data_cache.sql b/..._kogito_apps_create_kogito_data_cache.sql → ..._kogito_apps_create_kogito_data_cache.sql
diff --git a/..._kogito_apps_create_kogito_data_cache.sql → ..._kogito_apps_create_kogito_data_cache.sql b/..._kogito_apps_create_kogito_data_cache.sql → ..._kogito_apps_create_kogito_data_cache.sql