cleanup, fix mariadb driver name

Former-commit-id: 66dc0ef9e2ccd5738b3b3308be366ed224276b78
TIER · Aug 9, 2022 · dc3c0e2 · dc3c0e2
1 parent 9fc79c1
commit dc3c0e2
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/testbed/smoke-test/db_configs/mariadb.yml → ...e-test/db_configs/mariadb.application.yml b/testbed/smoke-test/db_configs/mariadb.yml → ...e-test/db_configs/mariadb.application.yml
@@ -3,7 +3,7 @@ spring:
     include:
   datasource:
     platform: mysql
-    driver-class-name: com.mariadb.jdbc.Driver
+    driver-class-name: org.mariadb.jdbc.Driver
     url: jdbc:mariadb://database:3306/shibui
     username: shibui
     password: shibui

diff --git a/testbed/smoke-test/db_configs/mysql.yml → ...oke-test/db_configs/mysql.application.yml b/testbed/smoke-test/db_configs/mysql.yml → ...oke-test/db_configs/mysql.application.yml
diff --git a/testbed/smoke-test/db_configs/postgres.yml → ...-test/db_configs/postgres.application.yml b/testbed/smoke-test/db_configs/postgres.yml → ...-test/db_configs/postgres.application.yml
diff --git a/testbed/smoke-test/db_configs/sqlServer.yml → ...test/db_configs/sqlServer.application.yml b/testbed/smoke-test/db_configs/sqlServer.yml → ...test/db_configs/sqlServer.application.yml
diff --git a/testbed/smoke-test/setdb.sh b/testbed/smoke-test/setdb.sh
@@ -17,6 +17,6 @@ ln -s db_configs/$DB.docker-compose.override.yml docker-compose.override.yml
 fi
 
 rm -f shibui/application.yml
-cat shibui/application.yml.nodb db_configs/$DB.yml >> shibui/application.yml
+cat shibui/application.yml.nodb db_configs/$DB.application.yml >> shibui/application.yml
 
 echo "shibui will now use the $DB container"