Replace mariadb with mysql8

cloudfoundry · Sep 1, 2022 · 390d5d7 · 390d5d7
1 parent adc49e0
commit 390d5d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 49 deletions.
diff --git a/scripts/ci/initialize_mysql.sh b/scripts/ci/initialize_mysql.sh
@@ -4,20 +4,6 @@ function initialize_mysql {
   cat << EOF > /etc/my.cnf
 [mysqld]
 sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
-EOF
-  datadir=/mysql-datadir
-  escaped_datadir=${datadir/\//\\\/}
-  mkdir $datadir
-  mount -t tmpfs -o size=2g tmpfs $datadir
-  rsync -av --progress /var/lib/mysql/ $datadir
-  sed -i "s/#datadir.*/datadir=${escaped_datadir}/g" /etc/mysql/mariadb.conf.d/50-server.cnf
-  service mariadb start
-}
-
-function initialize_mysql8 {
-  cat << EOF > /etc/my.cnf
-[mysqld]
-sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
 EOF
   datadir=/mysql-datadir
   escaped_datadir=${datadir/\//\\\/}
@@ -28,14 +14,6 @@ EOF
   service mysql start
 }
 
-function cleanup_mysql {
-  service mariadb stop
-}
-
-function cleanup_mysql8 {
-  service mysql stop
-}
-
 function bootDB {
   db=$1
 

diff --git a/scripts/ci/run_inigo b/scripts/ci/run_inigo
@@ -3,7 +3,6 @@
 dir=$(dirname $0)
 
 source $dir/setup_inigo
-trap cleanup EXIT
 
 nodes_flag=""
 if [ "$GINKGO_PARALLEL" = "true" ]; then

diff --git a/scripts/ci/setup_inigo b/scripts/ci/setup_inigo
@@ -169,32 +169,21 @@ setup_database() {
   chmod 0600 "$cert_file"
   chmod 0600 "$key_file"
 
-  if [ "${SQL_FLAVOR}" = "mysql" ] || [ "${SQL_FLAVOR}" = "mysql8" ]; then
+  if [ "${SQL_FLAVOR}" = "mysql" ]; then
     source ${GOPATH_ROOT}/scripts/ci/initialize_mysql.sh
 
     chown mysql:mysql "$ca_file"
     chown mysql:mysql "$cert_file"
     chown mysql:mysql "$key_file"
 
-    if [ "${SQL_FLAVOR}" = "mysql8" ]; then
-      server_cnf_path="/etc/mysql/mysql.conf.d/mysqld.cnf"
-
-      sed -i 's/# max_connections.*= 151/max_connections = 2000/g' "${server_cnf_path}"
-      echo "ssl-cert = $cert_file" >> "${server_cnf_path}"
-      echo "ssl-key = $key_file" >> "${server_cnf_path}"
-      echo "ssl-ca = $ca_file" >> "${server_cnf_path}"
+    server_cnf_path="/etc/mysql/mysql.conf.d/mysqld.cnf"
 
-      initialize_mysql8
-    else
-      server_cnf_path="/etc/mysql/mariadb.conf.d/50-server.cnf"
+    sed -i 's/# max_connections.*= 151/max_connections = 2000/g' "${server_cnf_path}"
+    echo "ssl-cert = $cert_file" >> "${server_cnf_path}"
+    echo "ssl-key = $key_file" >> "${server_cnf_path}"
+    echo "ssl-ca = $ca_file" >> "${server_cnf_path}"
 
-      sed -i 's/#max_connections.*= 100/max_connections = 2000/g' "${server_cnf_path}"
-      sed -i "s%#ssl-cert = /etc/mysql/server-cert.pem%ssl-cert = $cert_file%g" "${server_cnf_path}"
-      sed -i "s%#ssl-key = /etc/mysql/server-key.pem%ssl-key = $key_file%g" "${server_cnf_path}"
-      sed -i "s%#ssl-ca = /etc/mysql/cacert.pem%ssl-ca = $ca_file%g" "${server_cnf_path}"
-
-      initialize_mysql
-    fi
+    initialize_mysql
   else
     sed -i 's/max_connections = 100/max_connections = 2000/g' /etc/postgresql/9.4/main/postgresql.conf
 
@@ -211,14 +200,6 @@ setup_database() {
   fi
 }
 
-cleanup() {
-  if [ "${SQL_FLAVOR}" = "mysql" ]; then
-    cleanup_mysql
-  elif [ "${SQL_FLAVOR}" = "mysql8" ]; then
-    cleanup_mysql8
-  fi
-}
-
 rm -rf $PWD/diego-release/src/code.cloudfoundry.org/guardian/vendor/github.com/onsi/{ginkgo,gomega}
 
 setup_dnsmasq