Тестовое окружение отделено от основного, упрощены билды для контейнеров MariaDB и RabbitMQ, написаны скрипты для быстрого прогона тестов

This commit is contained in:
ErickSkrauch
2016-07-15 01:03:13 +03:00
parent 06f83bd52f
commit 23d44c1d0d
19 changed files with 166 additions and 299 deletions

View File

@@ -1,13 +1,3 @@
FROM mariadb:10.0
COPY mariadb.cnf /etc/mysql/conf.d
# Add script to create default users / vhosts
ADD init.sh /init.sh
ADD run.sh /run.sh
# Run rabbitmq, execute init configuration and then shutdown
RUN chmod +x /init.sh /run.sh \
&& /init.sh
ENTRYPOINT "/run.sh"

View File

@@ -1,34 +0,0 @@
#!/bin/bash
# Копипаста. Я не знаю, что тут происходит
set -e
set -x
mysql_install_db
# Start the MySQL daemon in the background.
/usr/sbin/mysqld &
mysql_pid=$!
until mysqladmin ping &>/dev/null; do
echo -n "."; sleep 0.2
done
# Конец рандомной копипасты
# Устаналиваем беспарольный доступ для рута
mysql -e "GRANT ALL ON *.* TO root@'%' IDENTIFIED BY '' WITH GRANT OPTION"
# Создаём базу данных для приложения и для тестов
mysql -e "CREATE DATABASE IF NOT EXISTS ely_accounts CHARACTER SET utf8 COLLATE utf8_general_ci"
mysql -e "CREATE DATABASE IF NOT EXISTS ely_accounts_test CHARACTER SET utf8 COLLATE utf8_general_ci"
# Tell the MySQL daemon to shutdown.
mysqladmin shutdown
# Wait for the MySQL daemon to exit.
wait $mysql_pid
# Сохраняем состояние базы данных
tar czvf default_mysql.tar.gz /var/lib/mysql

View File

@@ -1,9 +0,0 @@
#!/bin/bash
set -e
set -x
# first, if the /var/lib/mysql directory is empty, unpack it from our predefined db
[ "$(ls -A /var/lib/mysql)" ] && echo "Running with existing database in /var/lib/mysql" || ( echo 'Populate initial db'; tar xpzvf default_mysql.tar.gz )
/usr/sbin/mysqld

View File

@@ -3,8 +3,3 @@ FROM rabbitmq:3.6
RUN rabbitmq-plugins enable rabbitmq_management \
&& rabbitmq-plugins enable rabbitmq_web_stomp \
&& rabbitmq-plugins enable rabbitmq_mqtt
# Add script to create default users / vhosts
ADD init.sh /init.sh
RUN chmod +x /init.sh

View File

@@ -1,44 +0,0 @@
#!/bin/sh
#( sleep 10 ; \
#
## Create users
#rabbitmqctl add_user ely-accounts-app app-password ; \
#rabbitmqctl add_user ely-accounts-tester tester-password ; \
#
## Set user rights
#rabbitmqctl set_user_tags ely-accounts-app administrator ; \
#rabbitmqctl set_user_tags ely-accounts-tester administrator ; \
#
## Create vhosts
#rabbitmqctl add_vhost /account.ely.by ; \
#rabbitmqctl add_vhost /account.ely.by/tests ; \
#
## Set vhost permissions
#rabbitmqctl set_permissions -p /account.ely.by ely-accounts-app ".*" ".*" ".*" ; \
#rabbitmqctl set_permissions -p /account.ely.by/tests ely-accounts-tester ".*" ".*" ".*" ; \
#) &
#rabbitmq-server $@
#service rabbitmq-server start
# Create users
rabbitmqctl add_user ely-accounts-app app-password
rabbitmqctl add_user ely-accounts-tester tester-password
# Set user rights
rabbitmqctl set_user_tags ely-accounts-app administrator
rabbitmqctl set_user_tags ely-accounts-tester administrator
# Create vhosts
rabbitmqctl add_vhost /account.ely.by
rabbitmqctl add_vhost /account.ely.by/tests
# Set vhost permissions
rabbitmqctl set_permissions -p /account.ely.by ely-accounts-app ".*" ".*" ".*"
rabbitmqctl set_permissions -p /account.ely.by/tests ely-accounts-tester ".*" ".*" ".*"
#service rabbitmq-server stop
# Сохраняем состояние рэбита
#tar czvf default_rabbitmq.tar.gz /var/lib/rabbitmq/mnesia

View File

@@ -1,8 +0,0 @@
#!/bin/bash
set -e
set -x
[ "$(ls -A /var/lib/rabbitmq/mnesia)" ] && echo "Running with existing rabbitmq in /var/lib/rabbitmq" || ( echo 'Populate initial rabbitmq'; tar xpzvf default_rabbitmq.tar.gz )
rabbitmq-server

View File

@@ -1,18 +1,15 @@
#!/usr/bin/env bash
# Use this script to test if a given TCP host/port are available
# https://github.com/jlordiales/wait-for-it (fork of original source)
cmdname=$(basename $0)
echoerr() { if [[ $QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
usage()
{
usage() {
cat << USAGE >&2
Usage:
$cmdname host:port [-s] [-t timeout] [-- command args]
-h HOST | --host=HOST Host or IP under test
-p PORT | --port=PORT TCP port under test
Alternatively, you specify the host and port as host:port
-s | --strict Only execute subcommand if the test succeeds
-q | --quiet Don't output any status messages
-t TIMEOUT | --timeout=TIMEOUT
@@ -22,21 +19,22 @@ USAGE
exit 1
}
wait_for()
{
wait_for() {
local wait_host=$1
local wait_port=$2
if [[ $TIMEOUT -gt 0 ]]; then
echoerr "$cmdname: waiting $TIMEOUT seconds for $HOST:$PORT"
echoerr "$cmdname: waiting $TIMEOUT seconds for $wait_host:$wait_port"
else
echoerr "$cmdname: waiting for $HOST:$PORT without a timeout"
echoerr "$cmdname: waiting for $wait_host:$wait_port without a timeout"
fi
start_ts=$(date +%s)
local start_ts=$(date +%s)
while :
do
(echo > /dev/tcp/$HOST/$PORT) >/dev/null 2>&1
result=$?
(echo > /dev/tcp/$wait_host/$wait_port) >/dev/null 2>&1
local result=$?
if [[ $result -eq 0 ]]; then
end_ts=$(date +%s)
echoerr "$cmdname: $HOST:$PORT is available after $((end_ts - start_ts)) seconds"
local end_ts=$(date +%s)
echoerr "$cmdname: $wait_host:$wait_port is available after $((end_ts - start_ts)) seconds"
break
fi
sleep 1
@@ -44,111 +42,109 @@ wait_for()
return $result
}
wait_for_wrapper()
{
wait_for_wrapper() {
local wait_host=$1
local wait_port=$2
# In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
if [[ $QUIET -eq 1 ]]; then
timeout $TIMEOUT $0 --quiet --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
timeout $TIMEOUT $0 $wait_host:$wait_port --quiet --child --timeout=$TIMEOUT &
else
timeout $TIMEOUT $0 --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
timeout $TIMEOUT $0 $wait_host:$wait_port --child --timeout=$TIMEOUT &
fi
PID=$!
trap "kill -INT -$PID" INT
wait $PID
RESULT=$?
if [[ $RESULT -ne 0 ]]; then
echoerr "$cmdname: timeout occurred after waiting $TIMEOUT seconds for $HOST:$PORT"
echoerr "$cmdname: timeout occurred after waiting $TIMEOUT seconds for $wait_host:$wait_port"
fi
return $RESULT
}
# process arguments
while [[ $# -gt 0 ]]
do
case "$1" in
*:* )
hostport=(${1//:/ })
HOST=${hostport[0]}
PORT=${hostport[1]}
shift 1
;;
--child)
CHILD=1
shift 1
;;
-q | --quiet)
QUIET=1
shift 1
;;
-s | --strict)
STRICT=1
shift 1
;;
-h)
HOST="$2"
if [[ $HOST == "" ]]; then break; fi
shift 2
;;
--host=*)
HOST="${1#*=}"
shift 1
;;
-p)
PORT="$2"
if [[ $PORT == "" ]]; then break; fi
shift 2
;;
--port=*)
PORT="${1#*=}"
shift 1
;;
-t)
TIMEOUT="$2"
if [[ $TIMEOUT == "" ]]; then break; fi
shift 2
;;
--timeout=*)
TIMEOUT="${1#*=}"
shift 1
;;
--)
shift
CLI="$@"
break
;;
--help)
usage
;;
*)
echoerr "Unknown argument: $1"
usage
;;
esac
done
parse_arguments() {
local index=0
while [[ $# -gt 0 ]]
do
case "$1" in
*:* )
hostport=(${1//:/ })
HOST[$index]=${hostport[0]}
PORT[$index]=${hostport[1]}
shift 1
;;
--child)
CHILD=1
shift 1
;;
-q | --quiet)
QUIET=1
shift 1
;;
-s | --strict)
STRICT=1
shift 1
;;
-t)
TIMEOUT="$2"
if [[ $TIMEOUT == "" ]]; then break; fi
shift 2
;;
--timeout=*)
TIMEOUT="${1#*=}"
shift 1
;;
--)
shift
CLI="$@"
break
;;
--help)
usage
;;
*)
echoerr "Unknown argument: $1"
usage
;;
esac
let index+=1
done
if [[ ${#HOST[@]} -eq 0 || ${#PORT[@]} -eq 0 ]]; then
echoerr "Error: you need to provide a host and port to test."
usage
fi
}
if [[ "$HOST" == "" || "$PORT" == "" ]]; then
echoerr "Error: you need to provide a host and port to test."
usage
fi
iterate_hosts() {
local result=0
local index=0
local wait_function=$1
while [[ $result -eq 0 && $index -lt ${#HOST[@]} ]]; do
($wait_function ${HOST[$index]} ${PORT[$index]})
result=$?
let index+=1
done
echo $result
}
TIMEOUT=${TIMEOUT:-15}
STRICT=${STRICT:-0}
CHILD=${CHILD:-0}
QUIET=${QUIET:-0}
wait_for_services() {
TIMEOUT=${TIMEOUT:-15}
STRICT=${STRICT:-0}
CHILD=${CHILD:-0}
QUIET=${QUIET:-0}
if [[ $CHILD -gt 0 ]]; then
wait_for
RESULT=$?
exit $RESULT
else
if [[ $TIMEOUT -gt 0 ]]; then
wait_for_wrapper
RESULT=$?
else
wait_for
RESULT=$?
fi
fi
if [[ $CHILD -gt 0 ]]; then
exit $(iterate_hosts wait_for)
else
if [[ $TIMEOUT -gt 0 ]]; then
RESULT=$(iterate_hosts wait_for_wrapper)
else
RESULT=$(iterate_hosts wait_for)
fi
fi
}
parse_arguments "$@"
wait_for_services
if [[ $CLI != "" ]]; then
if [[ $RESULT -ne 0 && $STRICT -eq 1 ]]; then