зеркало из https://github.com/nextcloud/server.git
add actual check if mysql is up already
This commit is contained in:
Родитель
b6439da128
Коммит
11cc8903bb
|
@ -127,7 +127,6 @@ pipeline:
|
|||
mysql-php5.6:
|
||||
image: nextcloudci/php5.6:php5.6-2
|
||||
commands:
|
||||
- sleep 15 # gives the database enough time to initialize
|
||||
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
|
||||
when:
|
||||
matrix:
|
||||
|
|
13
autotest.sh
13
autotest.sh
|
@ -191,14 +191,6 @@ function execute_tests {
|
|||
-d mysql)
|
||||
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
|
||||
|
||||
echo "Waiting for MySQL initialisation ..."
|
||||
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
|
||||
echo "[ERROR] Waited 600 seconds, no response" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "MySQL is up."
|
||||
|
||||
else
|
||||
if [ -z "$DRONE" ] ; then # no need to drop the DB when we are on CI
|
||||
if [ "mysql" != "$(mysql --version | grep -o mysql)" ] ; then
|
||||
|
@ -211,6 +203,11 @@ function execute_tests {
|
|||
DATABASEHOST=127.0.0.1
|
||||
fi
|
||||
fi
|
||||
echo "Waiting for MySQL initialisation ..."
|
||||
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
|
||||
echo "[ERROR] Waited 600 seconds, no response" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
if [ "$DB" == "mariadb" ] ; then
|
||||
if [ ! -z "$USEDOCKER" ] ; then
|
||||
|
|
Загрузка…
Ссылка в новой задаче