Browse Source
add actual check if mysql is up already
pull/1400/head
Morris Jobke
10 years ago
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
2 changed files with
5 additions and
9 deletions
-
.drone.yml
-
autotest.sh
|
|
|
@ -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: |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
