Remove removed options of mgr-setup and readd missing service stop

susemanager/bin/mgr-setup

@@ -437,11 +437,10 @@ done
 
 do_setup
 
-if [ $EXTERNALDB = "0" ]; then
+if [ "$EXTERNALDB" = "0" ]; then
+    /usr/sbin/spacewalk-service stop
     /usr/bin/smdba system-check autotuning --max_connections=400
-fi
 
-if [ "$EXTERNALDB" = "0" ]; then
     # Find PostgreSQL service name.
     POSTGRESQLSERVICE=$(systemctl list-unit-files | grep -m 1 postgresql | cut -f1 -d. | tr -d '\n')
     systemctl restart $POSTGRESQLSERVICE

susemanager/susemanager.changes.oholecek.fix_ci_tests

@@ -0,0 +1 @@
+- readd missing service stop before db changes

testsuite/podman_runner/08_manager_setup.sh

@@ -4,7 +4,7 @@ set -xe
 src_dir=$(cd $(dirname "$0")/../.. && pwd -P)
 
 sudo -i podman exec server bash -c "/testsuite/podman_runner/provide-db-schema.sh"
-sudo -i podman exec -e CERT_O="test_org" -e CERT_OU="test_ou" -e CERT_CITY="test_city" -e CERT_STATE="test_state" -e CERT_COUNTRY="DE" -e CERT_EMAIL="[email protected]" -e CERT_CNAMES="server" -e CERT_PASS="spacewalk" -e UYUNI_FQDN="server" -e MANAGER_USER="admin" -e MANAGER_PASS="spacewalk" -e MANAGER_ADMIN_EMAIL="[email protected]" -e MANAGER_MAIL_FROM="[email protected]" -e MANAGER_ENABLE_TFTP="n" -e MANAGER_DB_NAME="manager" -e MANAGER_DB_HOST="localhost" -e MANAGER_DB_PORT="5432" -e MANAGER_DB_USER="manager" -e MANAGER_DB_PASS="manager" -e MANAGER_DB_PROTOCOL="TCP" -e REPORT_DB_NAME="reportdb" -e REPORT_DB_USER="pythia_susemanager" -e REPORT_DB_PASS="pythia_susemanager" -e EXTERNALDB_ADMIN_USER="" -e EXTERNALDB_ADMIN_PASS="" -e EXTERNALDB_PROVIDER="" -e ISS_PARENT="" -e ACTIVATE_SLP="" -e SCC_USER="" -e SCC_PASS="" server bash -c "/usr/lib/susemanager/bin/mgr-setup -l /var/log/susemanager_setup.log -s"
+sudo -i podman exec -e CERT_O="test_org" -e CERT_OU="test_ou" -e CERT_CITY="test_city" -e CERT_STATE="test_state" -e CERT_COUNTRY="DE" -e CERT_EMAIL="[email protected]" -e CERT_CNAMES="server" -e CERT_PASS="spacewalk" -e UYUNI_FQDN="server" -e MANAGER_USER="admin" -e MANAGER_PASS="spacewalk" -e MANAGER_ADMIN_EMAIL="[email protected]" -e MANAGER_MAIL_FROM="[email protected]" -e MANAGER_ENABLE_TFTP="n" -e MANAGER_DB_NAME="manager" -e MANAGER_DB_HOST="localhost" -e MANAGER_DB_PORT="5432" -e MANAGER_DB_USER="manager" -e MANAGER_DB_PASS="manager" -e MANAGER_DB_PROTOCOL="TCP" -e REPORT_DB_NAME="reportdb" -e REPORT_DB_USER="pythia_susemanager" -e REPORT_DB_PASS="pythia_susemanager" -e EXTERNALDB_ADMIN_USER="" -e EXTERNALDB_ADMIN_PASS="" -e EXTERNALDB_PROVIDER="" -e ISS_PARENT="" -e ACTIVATE_SLP="" -e SCC_USER="" -e SCC_PASS="" server bash -c /usr/lib/susemanager/bin/mgr-setup
 sudo -i podman exec server bash -c "/usr/bin/spacewalk-schema-upgrade -y"
 
 # Make sure latest sql migration scripts have been executed for both the main and the reporting database