aboutsummaryrefslogtreecommitdiff
path: root/tests/setup_docker.sh
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@redhat.com>2015-03-28 10:08:33 -0700
committerJeff Peeler <jpeeler@redhat.com>2015-05-13 15:38:07 -0400
commit21cd478cbd0bf14f9522e088c99399886a8fcf28 (patch)
treed36311fc82581e22db62b8993a1e1a8243ea0c28 /tests/setup_docker.sh
parentabe4a9ccb25b171122f424e548215fe20eff459e (diff)
downloadkolla-21cd478cbd0bf14f9522e088c99399886a8fcf28.tar.gz
kolla-21cd478cbd0bf14f9522e088c99399886a8fcf28.zip
Add functional tests to tox
This adds functional tests to tox, along with a number of prerequisite steps. Since this is primarily a bash project, pbr usage has been avoided. Tests are to be written in python and put in the tests directory. Running tox -e setupenv will execute a setup script (tests/setup_docker.sh) to ensure the running instance of docker meets the minimum version requirement. Running tox -e images will execute the image building script (tools/build-all-docker-images) and will parse the resulting output to report failures. Running tox -e startenv will generate the environment file, run "tools/kolla start", and run first time initialization (eventually). Running tox -e functional is for actually testing the deployed OpenStack environment via a series of tests utilizing the client APIs. Change-Id: Iff6dfdca43f0c44d471e7540a7836e56a0de4507
Diffstat (limited to 'tests/setup_docker.sh')
-rwxr-xr-xtests/setup_docker.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/setup_docker.sh b/tests/setup_docker.sh
index d5878c681..6be1ebeec 100755
--- a/tests/setup_docker.sh
+++ b/tests/setup_docker.sh
@@ -50,12 +50,15 @@ function start_docker() {
function create_group() {
getent group docker
- if [ $? -eq 2 ]; then # 2: key could not be found in database
+ result=$?
+ if [ $result -eq 0 ]; then # 0: key already exists, nothing to do
+ return
+ elif [ $result -eq 2 ]; then # 2: key could not be found in database
groupadd docker
chown root:docker /var/run/docker.sock
usermod -a -G docker ${SUDO_USER:-$USER}
else
- echo Unexpected failure: $?
+ echo Unexpected failure: $result
exit
fi
}