avniproject/avni-infra#41 | Fix minor issues with integration test db…

… setup
avniproject · Nov 11, 2024 · a9b7a3e · a9b7a3e
1 parent f967551
commit a9b7a3e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -69,7 +69,7 @@ build-db-schema:
 	psql -h localhost -p $(dbPort) -U avni_int -d avni_int < integration-data/src/main/resources/db/util/superadmin.sql;
 
 build-test-db-schema:
-	./gradlew --stacktrace :integration-data:migrateDb
+	./gradlew --stacktrace :integration-data:migrateTestDb
 	psql -h localhost -p $(dbPort) -U avni_int -d avni_int_test < integration-data/src/main/resources/db/util/superadmin.sql;
 
 drop-db:

diff --git a/integration-data/src/test/resources/application.properties b/integration-data/src/test/resources/application.properties
@@ -15,3 +15,18 @@ avni.impl.user.id=-1
 app.config.tx.rollback=true
 
 spring.datasource.url=jdbc:postgresql://localhost:5432/avni_int_test
+
+# Database
+avni.int.database=${AVNI_INT_DATABASE:avni_int_test}
+avni.int.database.port=${AVNI_INT_DATABASE_PORT:5432}
+spring.datasource.username=${AVNI_INT_DB_USER:avni_int}
+spring.datasource.password=${AVNI_INT_DB_PASSWORD:password}
+spring.datasource.driverClassName=org.postgresql.Driver
+
+#Flyway
+spring.flyway.enabled=${FLYWAY_ENABLED:true}
+spring.flyway.locations=classpath:/db/migration
+spring.flyway.outOfOrder=true
+spring.flyway.ignoreMissingMigrations=true
+
+app.config.location=${INT_CONFIG_LOCATION:dummy}