Add mariadb tests
This commit is contained in:
Philipp Holzer
parent
dbff9d7fab
commit
5b5c993335
176
.drone.yml
176
.drone.yml
|
|
@ -1,13 +1,13 @@
|
|||
kind: pipeline
|
||||
name: mysql-php7.1
|
||||
name: mysql8.0-php7.1
|
||||
|
||||
steps:
|
||||
- name: mysql-php7.1
|
||||
- name: mysql8.0-php7.1
|
||||
image: friendicaci/php7.1:php7.1.32
|
||||
commands:
|
||||
- phpenmod xdebug
|
||||
- sleep 20
|
||||
- ./autotest.sh
|
||||
- ./autotest.sh mysql
|
||||
- wget https://codecov.io/bash -O codecov.sh
|
||||
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi"
|
||||
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi"
|
||||
|
|
@ -39,13 +39,13 @@ services:
|
|||
# - push
|
||||
---
|
||||
kind: pipeline
|
||||
name: mysql-php7.2
|
||||
name: mysql8.0-php7.2
|
||||
|
||||
steps:
|
||||
- name: mysql-php7.2
|
||||
- name: mysql8.0-php7.2
|
||||
image: friendicaci/php7.2:php7.2.22
|
||||
commands:
|
||||
- NOCOVERAGE=true ./autotest.sh
|
||||
- NOCOVERAGE=true ./autotest.sh mysql
|
||||
environment:
|
||||
MYSQL_USERNAME: friendica
|
||||
MYSQL_PASSWORD: friendica
|
||||
|
|
@ -74,13 +74,13 @@ services:
|
|||
# - push
|
||||
---
|
||||
kind: pipeline
|
||||
name: mysql-php7.3
|
||||
name: mysql8.0-php7.3
|
||||
|
||||
steps:
|
||||
- name: mysql-php7.3
|
||||
- name: mysql8.0-php7.3
|
||||
image: friendicaci/php7.3:php7.3.9
|
||||
commands:
|
||||
- NOCOVERAGE=true ./autotest.sh
|
||||
- NOCOVERAGE=true ./autotest.sh mysql
|
||||
environment:
|
||||
MYSQL_USERNAME: friendica
|
||||
MYSQL_PASSWORD: friendica
|
||||
|
|
@ -88,7 +88,7 @@ steps:
|
|||
MYSQL_HOST: mysql
|
||||
|
||||
services:
|
||||
- name: mysql
|
||||
- name: mysql
|
||||
image: mysql:8.0
|
||||
command: [ "--default-authentication-plugin=mysql_native_password" ]
|
||||
environment:
|
||||
|
|
@ -99,6 +99,108 @@ services:
|
|||
tmpfs:
|
||||
- /var/lib/mysql
|
||||
|
||||
#trigger:
|
||||
# branch:
|
||||
# - master
|
||||
# - develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
# - pull_request
|
||||
# - push
|
||||
---
|
||||
kind: pipeline
|
||||
name: mariadb10.1-php7.1
|
||||
|
||||
steps:
|
||||
- name: mariadb10.1-php7.1
|
||||
image: friendicaci/php7.1:php7.1.32
|
||||
commands:
|
||||
- NOCOVERAGE=true ./autotest.sh mariadb
|
||||
environment:
|
||||
MYSQL_USER: friendica
|
||||
MYSQL_PASSWORD: friendica
|
||||
MYSQL_DATABASE: friendica
|
||||
MYSQL_HOST: mariadb
|
||||
|
||||
services:
|
||||
- name: mariadb
|
||||
image: mariadb:10.1
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: friendica
|
||||
MYSQL_USER: friendica
|
||||
MYSQL_PASSWORD: friendica
|
||||
MYSQL_DATABASE: friendica
|
||||
tmpfs:
|
||||
- /var/lib/mysql
|
||||
|
||||
#trigger:
|
||||
# branch:
|
||||
# - master
|
||||
# - develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
# - pull_request
|
||||
# - push
|
||||
---
|
||||
kind: pipeline
|
||||
name: mariadb10.1-php7.2
|
||||
|
||||
steps:
|
||||
- name: mariadb10.1-php7.2
|
||||
image: friendicaci/php7.2:php7.2.22
|
||||
commands:
|
||||
- NOCOVERAGE=true ./autotest.sh mariadb
|
||||
environment:
|
||||
MYSQL_USER: friendica
|
||||
MYSQL_PASSWORD: friendica
|
||||
MYSQL_DATABASE: friendica
|
||||
MYSQL_HOST: mariadb
|
||||
|
||||
services:
|
||||
- name: mariadb
|
||||
image: mariadb:10.1
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: friendica
|
||||
MYSQL_USER: friendica
|
||||
MYSQL_PASSWORD: friendica
|
||||
MYSQL_DATABASE: friendica
|
||||
tmpfs:
|
||||
- /var/lib/mysql
|
||||
|
||||
#trigger:
|
||||
# branch:
|
||||
# - master
|
||||
# - develop
|
||||
# - "*-rc"
|
||||
# event:
|
||||
# - pull_request
|
||||
# - push
|
||||
---
|
||||
kind: pipeline
|
||||
name: mariadb10.1-php7.3
|
||||
|
||||
steps:
|
||||
- name: mariadb10.1-php7.3
|
||||
image: friendicaci/php7.3:php7.3.9
|
||||
commands:
|
||||
- NOCOVERAGE=true ./autotest.sh mariadb
|
||||
environment:
|
||||
MYSQL_USER: friendica
|
||||
MYSQL_PASSWORD: friendica
|
||||
MYSQL_DATABASE: friendica
|
||||
MYSQL_HOST: mariadb
|
||||
|
||||
services:
|
||||
- name: mariadb
|
||||
image: mariadb:10.1
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: friendica
|
||||
MYSQL_USER: friendica
|
||||
MYSQL_PASSWORD: friendica
|
||||
MYSQL_DATABASE: friendica
|
||||
tmpfs:
|
||||
- /var/lib/mysql
|
||||
|
||||
#trigger:
|
||||
# branch:
|
||||
# - master
|
||||
|
|
@ -112,12 +214,12 @@ kind: pipeline
|
|||
name: redis-php7.1
|
||||
|
||||
steps:
|
||||
- name: redis-php7.1
|
||||
- name: redis-php7.1
|
||||
image: friendicaci/php7.1:php7.1.32
|
||||
commands:
|
||||
- phpenmod xdebug
|
||||
- sleep 20
|
||||
- NOINSTALL=true TEST_SELECTION=REDIS ./autotest.sh
|
||||
- NOINSTALL=true TEST_SELECTION=REDIS ./autotest.sh mysql
|
||||
- wget https://codecov.io/bash -O codecov.sh
|
||||
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi"
|
||||
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi"
|
||||
|
|
@ -125,7 +227,7 @@ steps:
|
|||
REDIS_HOST: redis
|
||||
|
||||
services:
|
||||
- name: redis
|
||||
- name: redis
|
||||
image: redis
|
||||
|
||||
#trigger:
|
||||
|
|
@ -141,15 +243,15 @@ kind: pipeline
|
|||
name: redis-php7.2
|
||||
|
||||
steps:
|
||||
- name: redis-php7.2
|
||||
- name: redis-php7.2
|
||||
image: friendicaci/php7.2:php7.2.22
|
||||
commands:
|
||||
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=REDIS ./autotest.sh
|
||||
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=REDIS ./autotest.sh mysql
|
||||
environment:
|
||||
REDIS_HOST: redis
|
||||
|
||||
services:
|
||||
- name: redis
|
||||
- name: redis
|
||||
image: redis
|
||||
|
||||
#trigger:
|
||||
|
|
@ -165,15 +267,15 @@ kind: pipeline
|
|||
name: redis-php7.3
|
||||
|
||||
steps:
|
||||
- name: redis-php7.3
|
||||
- name: redis-php7.3
|
||||
image: friendicaci/php7.3:php7.3.9
|
||||
commands:
|
||||
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=REDIS ./autotest.sh
|
||||
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=REDIS ./autotest.sh mysql
|
||||
environment:
|
||||
REDIS_HOST: redis
|
||||
|
||||
services:
|
||||
- name: redis
|
||||
- name: redis
|
||||
image: redis
|
||||
|
||||
#trigger:
|
||||
|
|
@ -190,12 +292,12 @@ kind: pipeline
|
|||
name: memcache-php7.1
|
||||
|
||||
steps:
|
||||
- name: memcache-php7.1
|
||||
- name: memcache-php7.1
|
||||
image: friendicaci/php7.1:php7.1.32
|
||||
commands:
|
||||
- phpenmod xdebug
|
||||
- sleep 20
|
||||
- NOINSTALL=true TEST_SELECTION=MEMCACHE ./autotest.sh
|
||||
- NOINSTALL=true TEST_SELECTION=MEMCACHE ./autotest.sh mysql
|
||||
- wget https://codecov.io/bash -O codecov.sh
|
||||
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi"
|
||||
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi"
|
||||
|
|
@ -203,7 +305,7 @@ steps:
|
|||
MEMCACHE_HOST: memcached
|
||||
|
||||
services:
|
||||
- name: memcached
|
||||
- name: memcached
|
||||
image: memcached
|
||||
|
||||
#trigger:
|
||||
|
|
@ -219,15 +321,15 @@ kind: pipeline
|
|||
name: memcache-php7.2
|
||||
|
||||
steps:
|
||||
- name: memcache-php7.2
|
||||
- name: memcache-php7.2
|
||||
image: friendicaci/php7.2:php7.2.22
|
||||
commands:
|
||||
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHE ./autotest.sh
|
||||
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHE ./autotest.sh mysql
|
||||
environment:
|
||||
MEMCACHE_HOST: memcached
|
||||
|
||||
services:
|
||||
- name: memcached
|
||||
- name: memcached
|
||||
image: memcached
|
||||
|
||||
#trigger:
|
||||
|
|
@ -243,15 +345,15 @@ kind: pipeline
|
|||
name: memcache-php7.3
|
||||
|
||||
steps:
|
||||
- name: memcache-php7.3
|
||||
- name: memcache-php7.3
|
||||
image: friendicaci/php7.3:php7.3.9
|
||||
commands:
|
||||
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHE ./autotest.sh
|
||||
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHE ./autotest.sh mysql
|
||||
environment:
|
||||
MEMCACHE_HOST: memcached
|
||||
|
||||
services:
|
||||
- name: memcached
|
||||
- name: memcached
|
||||
image: memcached
|
||||
|
||||
#trigger:
|
||||
|
|
@ -269,12 +371,12 @@ kind: pipeline
|
|||
name: memcached-php7.1
|
||||
|
||||
steps:
|
||||
- name: memcached-php7.1
|
||||
- name: memcached-php7.1
|
||||
image: friendicaci/php7.1:php7.1.32
|
||||
commands:
|
||||
- phpenmod xdebug
|
||||
- sleep 20
|
||||
- NOINSTALL=true TEST_SELECTION=MEMCACHED ./autotest.sh
|
||||
- NOINSTALL=true TEST_SELECTION=MEMCACHED ./autotest.sh mysql
|
||||
- wget https://codecov.io/bash -O codecov.sh
|
||||
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi"
|
||||
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 2f4b253b-ca17-41d7-96e3-81623581c97d -f tests/autotest-clover.xml; fi"
|
||||
|
|
@ -282,7 +384,7 @@ steps:
|
|||
MEMCACHED_HOST: memcached
|
||||
|
||||
services:
|
||||
- name: memcached
|
||||
- name: memcached
|
||||
image: memcached
|
||||
|
||||
#trigger:
|
||||
|
|
@ -298,15 +400,15 @@ kind: pipeline
|
|||
name: memcached-php7.2
|
||||
|
||||
steps:
|
||||
- name: memcached-php7.2
|
||||
- name: memcached-php7.2
|
||||
image: friendicaci/php7.2:php7.2.22
|
||||
commands:
|
||||
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHED ./autotest.sh
|
||||
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHED ./autotest.sh mysql
|
||||
environment:
|
||||
MEMCACHED_HOST: memcached
|
||||
|
||||
services:
|
||||
- name: memcached
|
||||
- name: memcached
|
||||
image: memcached
|
||||
|
||||
#trigger:
|
||||
|
|
@ -322,15 +424,15 @@ kind: pipeline
|
|||
name: memcached-php7.3
|
||||
|
||||
steps:
|
||||
- name: memcached-php7.3
|
||||
- name: memcached-php7.3
|
||||
image: friendicaci/php7.3:php7.3.9
|
||||
commands:
|
||||
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHED ./autotest.sh
|
||||
- NOCOVERAGE=true NOINSTALL=true TEST_SELECTION=MEMCACHED ./autotest.sh mysql
|
||||
environment:
|
||||
MEMCACHED_HOST: memcached
|
||||
|
||||
services:
|
||||
- name: memcached
|
||||
- name: memcached
|
||||
image: memcached
|
||||
|
||||
#trigger:
|
||||
|
|
|
|||
83
autotest.sh
83
autotest.sh
|
|
@ -5,6 +5,8 @@ DATABASEUSER=${MYSQL_USERNAME:-friendica}
|
|||
DATABASEHOST=${MYSQL_HOST:-localhost}
|
||||
BASEDIR=$PWD
|
||||
|
||||
DBCONFIGS="mysql mariadb"
|
||||
|
||||
export MYSQL_DATABASE="$DATABASENAME"
|
||||
export MYSQL_USERNAME="$DATABASEUSER"
|
||||
export MYSQL_PASSWORD="friendica"
|
||||
|
|
@ -45,6 +47,20 @@ if ! [ \( -w config -a ! -f config/local.config.php \) -o \( -f config/local.con
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$1" ]; then
|
||||
FOUND=0
|
||||
for DBCONFIG in $DBCONFIGS; do
|
||||
if [ "$1" = "$DBCONFIG" ]; then
|
||||
FOUND=1
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [ $FOUND = 0 ]; then
|
||||
echo -e "Unknown database config name \"$1\"\n" >&2
|
||||
exit 2
|
||||
fi
|
||||
fi
|
||||
|
||||
# Back up existing (dev) config if one exists and backup not already there
|
||||
if [ -f config/local.config.php ] && [ ! -f config/local.config-autotest-backup.php ]; then
|
||||
mv config/local.config.php config/local.config-autotest-backup.php
|
||||
|
|
@ -70,7 +86,8 @@ function cleanup_config {
|
|||
trap cleanup_config EXIT
|
||||
|
||||
function execute_tests {
|
||||
echo "Setup environment for MariaDB testing ..."
|
||||
DB=$1
|
||||
echo "Setup environment for $DB testing ..."
|
||||
# back to root folder
|
||||
cd "$BASEDIR"
|
||||
|
||||
|
|
@ -80,6 +97,8 @@ function execute_tests {
|
|||
fi
|
||||
|
||||
if [ -z "$NOINSTALL" ]; then
|
||||
#drop database
|
||||
if [ "$DB" == "mysql" ]; then
|
||||
if [ -n "$USEDOCKER" ]; then
|
||||
echo "Fire up the mysql docker"
|
||||
DOCKER_CONTAINER_ID=$(docker run \
|
||||
|
|
@ -89,6 +108,7 @@ function execute_tests {
|
|||
-e MYSQL_DATABASE="$DATABASENAME" \
|
||||
-d mysql)
|
||||
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
|
||||
|
||||
else
|
||||
if [ -z "$DRONE" ]; then # no need to drop the DB when we are on CI
|
||||
if [ "mysql" != "$(mysql --version | grep -o mysql)" ]; then
|
||||
|
|
@ -96,8 +116,8 @@ function execute_tests {
|
|||
echo "To use the docker container set the USEDOCKER environment variable"
|
||||
exit 3
|
||||
fi
|
||||
mysql -u "$DATABASEUSER" -pfriendica -e "DROP DATABASE IF EXISTS $DATABASENAME"
|
||||
mysql -u "$DATABASEUSER" -pfriendica -e "CREATE DATABASE $DATABASENAME DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci"
|
||||
mysql -u "$DATABASEUSER" -pfriendica -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
|
||||
mysql -u "$DATABASEUSER" -pfriendica -e "CREATE DATABASE $DATABASENAME DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h $DATABASEHOST
|
||||
else
|
||||
DATABASEHOST=mysql
|
||||
fi
|
||||
|
|
@ -109,6 +129,42 @@ function execute_tests {
|
|||
exit 1
|
||||
fi
|
||||
|
||||
echo "MySQL is up."
|
||||
fi
|
||||
if [ "$DB" == "mariadb" ]; then
|
||||
if [ -n "$USEDOCKER" ]; then
|
||||
echo "Fire up the mariadb docker"
|
||||
DOCKER_CONTAINER_ID=$(docker run \
|
||||
-e MYSQL_ROOT_PASSWORD=friendica \
|
||||
-e MYSQL_USER="$DATABASEUSER" \
|
||||
-e MYSQL_PASSWORD=friendica \
|
||||
-e MYSQL_DATABASE="$DATABASENAME" \
|
||||
-d mariadb)
|
||||
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
|
||||
|
||||
else
|
||||
if [ -z "$DRONE" ]; then # no need to drop the DB when we are on CI
|
||||
if [ "MariaDB" != "$(mysql --version | grep -o MariaDB)" ]; then
|
||||
echo "Your mysql binary is not provided by mysql"
|
||||
echo "To use the docker container set the USEDOCKER environment variable"
|
||||
exit 3
|
||||
fi
|
||||
mysql -u "$DATABASEUSER" -pfriendica -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
|
||||
mysql -u "$DATABASEUSER" -pfriendica -e "CREATE DATABASE $DATABASENAME DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h $DATABASEHOST
|
||||
else
|
||||
DATABASEHOST=mariadb
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Waiting for MariaDB $DATABASEHOST initialization..."
|
||||
if ! bin/wait-for-connection $DATABASEHOST 3306 300; then
|
||||
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "MariaDB is up."
|
||||
fi
|
||||
|
||||
if [ -n "$USEDOCKER" ]; then
|
||||
echo "Initialize database..."
|
||||
docker exec $DOCKER_CONTAINER_ID mysql -u root -pfriendica -e 'CREATE DATABASE IF NOT EXISTS $DATABASENAME;'
|
||||
|
|
@ -155,12 +211,12 @@ function execute_tests {
|
|||
fi
|
||||
|
||||
INPUT="$BASEDIR/tests"
|
||||
if [ -n "$1" ]; then
|
||||
INPUT="$INPUT/$1"
|
||||
if [ -n "$2" ]; then
|
||||
INPUT="$INPUT/$2"
|
||||
fi
|
||||
|
||||
echo "${PHPUNIT[@]}" --configuration tests/phpunit.xml $GROUP $COVER --log-junit "autotest-results.xml" "$INPUT" "$2"
|
||||
"${PHPUNIT[@]}" --configuration tests/phpunit.xml $GROUP $COVER --log-junit "autotest-results.xml" "$INPUT" "$2"
|
||||
echo "${PHPUNIT[@]}" --configuration tests/phpunit.xml $GROUP $COVER --log-junit "autotest-results.xml" "$INPUT" "$3"
|
||||
"${PHPUNIT[@]}" --configuration tests/phpunit.xml $GROUP $COVER --log-junit "autotest-results.xml" "$INPUT" "$3"
|
||||
RESULT=$?
|
||||
|
||||
if [ -n "$DOCKER_CONTAINER_ID" ]; then
|
||||
|
|
@ -174,8 +230,15 @@ function execute_tests {
|
|||
#
|
||||
# Start the test execution
|
||||
#
|
||||
if [ -n "$1" ] && [ ! -f "tests/$FILENAME" ] && [ "${FILENAME:0:2}" != "--" ]; then
|
||||
execute_tests "$FILENAME" "$2"
|
||||
if [ -z "$1" ] && [ -n "$TEST_SELECTION" ]; then
|
||||
# run all known database configs
|
||||
for DBCONFIG in $DBCONFIGS; do
|
||||
execute_tests "$DBCONFIG"
|
||||
done
|
||||
else
|
||||
execute_tests
|
||||
FILENAME="$2"
|
||||
if [ -n "$2" ] && [ ! -f "tests/$FILENAME" ] && [ "${FILENAME:0:2}" != "--" ]; then
|
||||
FILENAME="../$FILENAME"
|
||||
fi
|
||||
execute_tests "$1" "$FILENAME" "$3"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user