CI: adjustments to MSSQL

igniterealtime · Aug 22, 2024 · 847bb12 · 847bb12
1 parent d107561
commit 847bb12
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/build/ci/compose/scripts/mssql.sh b/build/ci/compose/scripts/mssql.sh
@@ -5,8 +5,8 @@
 
 for i in {1..50};
 do
-    /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -d master -Q "CREATE DATABASE openfire;"
-    /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -d openfire -i /openfiredb/openfire_sqlserver.sql
+    /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P $SA_PASSWORD -d master -Q "CREATE DATABASE openfire;"
+    /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P $SA_PASSWORD -d openfire -i /openfiredb/openfire_sqlserver.sql
     if [ $? -eq 0 ]
     then
         echo "openfire sql import"
@@ -15,6 +15,11 @@ do
         echo "not ready yet..."
         sleep 1
     fi
+    if [ $i -eq 50 ]
+    then
+	echo "Aborting after 50 failed attempts"
+	exit 1
+    fi
 done
 
 sleep infinity # Keep the container running forever