From 713038872d24e4e280cae2419eed9d6f8c5c8032 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Tue, 9 Aug 2022 09:47:23 -0400
Subject: [PATCH] cleanup, fix mariadb driver name

Former-commit-id: d005502b82ee636664925b5b2ac9f596031ee602
---
 .../db_configs/{mariadb.yml => mariadb.application.yml}         | 2 +-
 .../smoke-test/db_configs/{mysql.yml => mysql.application.yml}  | 0
 .../db_configs/{postgres.yml => postgres.application.yml}       | 0
 .../db_configs/{sqlServer.yml => sqlServer.application.yml}     | 0
 testbed/smoke-test/setdb.sh                                     | 2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename testbed/smoke-test/db_configs/{mariadb.yml => mariadb.application.yml} (84%)
 rename testbed/smoke-test/db_configs/{mysql.yml => mysql.application.yml} (100%)
 rename testbed/smoke-test/db_configs/{postgres.yml => postgres.application.yml} (100%)
 rename testbed/smoke-test/db_configs/{sqlServer.yml => sqlServer.application.yml} (100%)

diff --git a/testbed/smoke-test/db_configs/mariadb.yml b/testbed/smoke-test/db_configs/mariadb.application.yml
similarity index 84%
rename from testbed/smoke-test/db_configs/mariadb.yml
rename to testbed/smoke-test/db_configs/mariadb.application.yml
index 9b64f680f..a42a5c8bc 100644
--- a/testbed/smoke-test/db_configs/mariadb.yml
+++ b/testbed/smoke-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 b/testbed/smoke-test/db_configs/mysql.application.yml
similarity index 100%
rename from testbed/smoke-test/db_configs/mysql.yml
rename to testbed/smoke-test/db_configs/mysql.application.yml
diff --git a/testbed/smoke-test/db_configs/postgres.yml b/testbed/smoke-test/db_configs/postgres.application.yml
similarity index 100%
rename from testbed/smoke-test/db_configs/postgres.yml
rename to testbed/smoke-test/db_configs/postgres.application.yml
diff --git a/testbed/smoke-test/db_configs/sqlServer.yml b/testbed/smoke-test/db_configs/sqlServer.application.yml
similarity index 100%
rename from testbed/smoke-test/db_configs/sqlServer.yml
rename to testbed/smoke-test/db_configs/sqlServer.application.yml
diff --git a/testbed/smoke-test/setdb.sh b/testbed/smoke-test/setdb.sh
index e4347a298..06821b37c 100755
--- 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"