fix: mysql & pg ci problem (#1641)

apache · Nov 10, 2021 · 417c73c · 417c73c
1 parent cc509f9
commit 417c73c
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,8 +20,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        BACKEND: [memory, cassandra, scylladb, hbase, rocksdb]
+        BACKEND: [memory, cassandra, scylladb, hbase, rocksdb, mysql, postgresql]
         JAVA_VERSION: ['8']
+
     steps:
       - name: Install JDK ${{ matrix.JAVA_VERSION }}
         uses: actions/setup-java@v2
@@ -49,6 +50,19 @@ jobs:
         run: |
           $TRAVIS_DIR/install-backend.sh ${{ matrix.BACKEND }}
 
+      - name: Init Mysql Env
+        uses: mirromutth/[email protected]
+        with:
+          host port: 3306 # Optional, default value is 3306. The port of host
+          container port: 3306 # Optional, default value is 3306. The port of container
+          character set server: 'utf8mb4' # Optional, default value is 'utf8mb4'. The '--character-set-server' option for mysqld
+          collation server: 'utf8mb4_general_ci' # Optional, default value is 'utf8mb4_general_ci'. The '--collation-server' option for mysqld
+          mysql version: '5.7' # Optional, default value is "latest". The version of the MySQL
+          mysql database: 'test' # Optional, default value is "test". The specified database which will be create
+          mysql root password: "******" # Required if "mysql user" is empty, default is empty. The root superuser password
+          #mysql user: 'root' # Required if "mysql root password" is empty, default is empty. The superuser for the specified database. Can use secrets, too
+          #mysql password: ${{ secrets.DatabasePassword }} # Required if "mysql user" exists. The password for the "mysql user"
+
       - name: Run test
         run: |
           mvn test -P core-test,${{ matrix.BACKEND }}

diff --git a/hugegraph-dist/src/assembly/travis/install-backend.sh b/hugegraph-dist/src/assembly/travis/install-backend.sh
@@ -8,27 +8,27 @@ if [[ $# -ne 1 ]]; then
 fi
 
 BACKEND=$1
-TRAVIS_DIR=`dirname $0`
+TRAVIS_DIR=$(dirname "$0")
 
-if [ ! -d $HOME/downloads ]; then
-    mkdir $HOME/downloads
+if [ ! -d "$HOME"/downloads ]; then
+    mkdir "$HOME"/downloads
 fi
 
 case $BACKEND in
     cassandra)
-        $TRAVIS_DIR/install-cassandra.sh
+        "$TRAVIS_DIR"/install-cassandra.sh
         ;;
     scylladb)
-        $TRAVIS_DIR/install-scylladb.sh
+        "$TRAVIS_DIR"/install-scylladb.sh
         ;;
     hbase)
-        $TRAVIS_DIR/install-hbase.sh
+        "$TRAVIS_DIR"/install-hbase.sh
         ;;
     mysql)
-        $TRAVIS_DIR/install-mysql-via-docker.sh
+        "$TRAVIS_DIR"/install-mysql-via-docker.sh
         ;;
     postgresql)
-        $TRAVIS_DIR/install-postgresql-via-docker.sh
+        "$TRAVIS_DIR"/install-postgresql-via-docker.sh
         ;;
     *)
         # don't need to install for other backends

diff --git a/hugegraph-dist/src/assembly/travis/install-mysql-via-docker.sh b/hugegraph-dist/src/assembly/travis/install-mysql-via-docker.sh
@@ -2,15 +2,18 @@
 
 set -ev
 
-TRAVIS_DIR=`dirname $0`
+TRAVIS_DIR=$(dirname "$0")
 
 # Need speed up it
 CONF=hugegraph-test/src/main/resources/hugegraph.properties
 MYSQL_USERNAME=root
-MYSQL_PASSWORD=123456
+
 # Set MySQL configurations
 sed -i "s/jdbc.username=.*/jdbc.username=$MYSQL_USERNAME/" $CONF
-sed -i "s/jdbc.password=.*/jdbc.password=$MYSQL_PASSWORD/" $CONF
+sed -i "s/jdbc.reconnect_max_times=.*/jdbc.reconnect_max_times=10/" $CONF
+sed -i "s/jdbc.reconnect_interval=.*/jdbc.reconnect_interval=5/" $CONF
+
 
-docker pull mysql:5.7
-docker run -p 3306:3306 --name mysql -e MYSQL_ROOT_PASSWORD=123456 -d mysql:5.7
+# Keep for upgrade in future
+#docker pull mysql:5.7
+#docker run -p 3306:3306 --name mysql -e MYSQL_ROOT_PASSWORD="******" -d mysql:5.7
diff --git a/hugegraph-dist/src/assembly/travis/install-mysql.sh b/hugegraph-dist/src/assembly/travis/install-mysql.sh
@@ -2,7 +2,7 @@
 
 set -ev
 
-TRAVIS_DIR=`dirname $0`
+TRAVIS_DIR=$(dirname "$0")
 #MYSQL_DOWNLOAD_ADDRESS="http://dev.MySQL.com/get/Downloads"
 #MYSQL_VERSION="MySQL-5.7"
 #MYSQL_PACKAGE="mysql-5.7.11-Linux-glibc2.5-x86_64"
@@ -15,7 +15,7 @@ if [ -d /var/lib/mysql ]; then
     sudo mount -t tmpfs -o size=1024m tmpfs /mnt/ramdisk
     sudo mv /var/lib/mysql /mnt/ramdisk
     sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
-    sudo cp $TRAVIS_DIR/mysql.cnf /etc/mysql/conf.d/mysql.cnf
+    sudo cp "$TRAVIS_DIR"/mysql.cnf /etc/mysql/conf.d/mysql.cnf
     sudo service mysql restart
 else
     echo "Please install mysql firstly."

diff --git a/hugegraph-dist/src/assembly/travis/install-postgresql-via-docker.sh b/hugegraph-dist/src/assembly/travis/install-postgresql-via-docker.sh
@@ -2,22 +2,20 @@
 
 set -ev
 
-TRAVIS_DIR=`dirname $0`
+TRAVIS_DIR=$(dirname "$0")
 CONF=hugegraph-test/src/main/resources/hugegraph.properties
 
 POSTGRESQL_DRIVER=org.postgresql.Driver
 POSTGRESQL_URL=jdbc:postgresql://localhost:5432/
 POSTGRESQL_USERNAME=postgres
-POSTGRESQL_PASSWORD=123456
 
 # Set PostgreSQL configurations
 sed -i "s/jdbc.driver=.*/jdbc.driver=$POSTGRESQL_DRIVER/" $CONF
 sed -i "s?jdbc.url=.*?jdbc.url=$POSTGRESQL_URL?" $CONF
 sed -i "s/jdbc.username=.*/jdbc.username=$POSTGRESQL_USERNAME/" $CONF
-sed -i "s/jdbc.password=.*/jdbc.password=$POSTGRESQL_PASSWORD/" $CONF
 
 sudo service postgresql stop 9.2
 
 docker pull postgres:9.6
 docker volume create pgdata
-docker run --rm -v pgdata:/var/lib/postgresql/data -p 5432:5432 -e POSTGRES_PASSWORD=123456 -d postgres:9.6
+docker run --rm -v pgdata:/var/lib/postgresql/data -p 5432:5432 -e POSTGRES_PASSWORD="******" -d postgres:9.6
diff --git a/hugegraph-dist/src/assembly/travis/install-postgresql.sh b/hugegraph-dist/src/assembly/travis/install-postgresql.sh
@@ -2,7 +2,7 @@
 
 set -ev
 
-TRAVIS_DIR=`dirname $0`
+TRAVIS_DIR=$(dirname "$0")
 CONF=hugegraph-test/src/main/resources/hugegraph.properties
 
 POSTGRESQL_DRIVER=org.postgresql.Driver

diff --git a/hugegraph-dist/src/assembly/travis/start-server.sh b/hugegraph-dist/src/assembly/travis/start-server.sh
@@ -2,8 +2,8 @@
 
 set -ev
 
-HOME_DIR=`pwd`
-TRAVIS_DIR=`dirname $0`
+HOME_DIR=$(pwd)
+TRAVIS_DIR=$(dirname $0)
 BASE_DIR=$1
 BACKEND=$2
 BIN=$BASE_DIR/bin

diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlOptions.java b/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlOptions.java
@@ -70,7 +70,7 @@ public static synchronized MysqlOptions instance() {
                     "jdbc.password",
                     "The password corresponding to jdbc.username.",
                     null,
-                    ""
+                    "******"
             );
 
     public static final ConfigOption<Integer> JDBC_RECONNECT_MAX_TIMES =

diff --git a/hugegraph-test/src/main/resources/hugegraph.properties b/hugegraph-test/src/main/resources/hugegraph.properties
@@ -44,7 +44,7 @@ hbase.znode_parent=/hbase
 jdbc.driver=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://127.0.0.1:3306
 jdbc.username=root
-jdbc.password=
+jdbc.password=******
 jdbc.reconnect_max_times=3
 jdbc.reconnect_interval=3
 jdbc.sslmode=disable