diff options
author | drebs <drebs@leap.se> | 2017-04-19 10:18:27 +0200 |
---|---|---|
committer | drebs <drebs@leap.se> | 2017-04-19 11:49:42 +0200 |
commit | 40f2cb8b1f07b1346e01ff69b57e14c492f1cd0b (patch) | |
tree | 9cab2f54014ffb7a56e1d75fd5ef0a70369afd63 /scripts/docker/helper | |
parent | a4558ea4874e0de3561f228b41ef0a94a2e4c326 (diff) |
[test] remove docker scripts from this repo
Docker scripts are only used for CI and do not need to be in this
repository. Beause of that, we decided to moved the docker scripts to a
private repository where dockerfiles for other parts of leap also live.
Diffstat (limited to 'scripts/docker/helper')
-rwxr-xr-x | scripts/docker/helper/get-container-ip.sh | 18 | ||||
-rwxr-xr-x | scripts/docker/helper/run-test.sh | 75 | ||||
-rwxr-xr-x | scripts/docker/helper/run-until-error.sh | 12 |
3 files changed, 0 insertions, 105 deletions
diff --git a/scripts/docker/helper/get-container-ip.sh b/scripts/docker/helper/get-container-ip.sh deleted file mode 100755 index 2b392350..00000000 --- a/scripts/docker/helper/get-container-ip.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -# Print the IP of a container to stdout, given its id. Check the output for -# the `docker inspect` commmand for more details: -# -# https://docs.docker.com/engine/reference/commandline/inspect/ - -if [ ${#} -ne 1 ]; then - echo "Usage: ${0} container_id" - exit 1 -fi - -container_id=${1} - -/usr/bin/docker \ - inspect \ - --format='{{.NetworkSettings.IPAddress}}' \ - ${container_id} diff --git a/scripts/docker/helper/run-test.sh b/scripts/docker/helper/run-test.sh deleted file mode 100755 index 9b3ec0c9..00000000 --- a/scripts/docker/helper/run-test.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh - -# Run 2 docker images, one with soledad server and another with a soledad -# client running a test. -# -# As there are many possible, tests, you have to pass an argument to the -# script saying which test you want to run. Currently, possible values are -# "connect" and "perf". -# -# After launching the server container, the script waits for TIMEOUT seconds -# for it to come up. If we fail to detect the server, the script exits with -# nonzero status. - -# seconds to wait before giving up waiting from server -TIMEOUT=20 - -# parse command -if [ ${#} -lt 1 -o ${#} -gt 2 ]; then - echo "Usage: ${0} perf|bootstrap" - exit 1 -fi - -test=${1} -if [ "${test}" != "perf" -a "${test}" != "bootstrap" ]; then - echo "Usage: ${0} perf|bootstrap" - exit 1 -fi - -branch="" -if [ ${#} -eq 2 ]; then - branch="SOLEDAD_BRANCH=${2}" -fi - -# make sure the image is up to date -make image - -# get script name and path -script=$(readlink -f "$0") -scriptpath=$(dirname "${script}") - -# run the server -tempfile=`mktemp -u` -make run-server CONTAINER_ID_FILE=${tempfile} ${branch} - -# wait for server until timeout -container_id=`cat ${tempfile}` -server_ip=`${scriptpath}/get-container-ip.sh ${container_id}` -start=`date +%s` -elapsed=0 - -echo "Waiting for soledad server container to come up..." - -while [ ${elapsed} -lt ${TIMEOUT} ]; do - curl -s http://${server_ip}:2424 > /dev/null - if [ ${?} -eq 0 ]; then - echo "Soledad server container is up!" - break - else - sleep 1 - fi - now=`date +%s` - elapsed=`expr ${now} - ${start}` -done - -# exit with an error code if timed out waiting for server -if [ ${elapsed} -ge ${TIMEOUT} ]; then - echo "Error: server unreachable at ${server_ip} after ${TIMEOUT} seconds." - exit 1 -fi - -set -e - -# run the test -make run-client-${test} CONTAINER_ID_FILE=${tempfile} ${branch} -rm -r ${tempfile} diff --git a/scripts/docker/helper/run-until-error.sh b/scripts/docker/helper/run-until-error.sh deleted file mode 100755 index a4cab6ec..00000000 --- a/scripts/docker/helper/run-until-error.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -status=0 -runs=10 - -while [ ${status} -eq 0 -a ${runs} -gt 0 ]; do - echo "=== RUN ${runs}" - make rm-all-containers - make run-perf-test - status=${?} - runs=`expr ${runs} - 1` -done |