summaryrefslogtreecommitdiffstats
path: root/ansible
diff options
context:
space:
mode:
authorSamuli Silvius <s.silvius@partner.samsung.com>2019-05-09 16:13:36 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-09 16:13:36 +0000
commitb7f4912590d581d2a2e77e0126a487f428e8e5bd (patch)
tree5ab70ed6ee77510f7e2175c133191dbbe83d2c0b /ansible
parentf57c79c20558284dc3515eba0e229b1661a33e90 (diff)
parentb0f546ad82bcb427bc5f724150063d239f3a306d (diff)
Merge "Extending molecule test to playbooks"
Diffstat (limited to 'ansible')
-rwxr-xr-xansible/test/bin/ci-molecule.sh2
-rwxr-xr-xansible/test/bin/install-molecule.sh2
-rw-r--r--ansible/test/molecule-docker/Dockerfile2
3 files changed, 3 insertions, 3 deletions
diff --git a/ansible/test/bin/ci-molecule.sh b/ansible/test/bin/ci-molecule.sh
index be598a48..7859c8dc 100755
--- a/ansible/test/bin/ci-molecule.sh
+++ b/ansible/test/bin/ci-molecule.sh
@@ -30,7 +30,7 @@ SCRIPT_DIR=$(dirname "${0}")
LOCAL_PATH=$(readlink -f "$SCRIPT_DIR")
ROLE_PATH=$1
-MOLECULE_CONTAINER=${MOLECULE_CONTAINER:-true}
+MOLECULE_CONTAINER=${MOLECULE_CONTAINER:-false}
echo "Build all pre-build images"
${LOCAL_PATH}/../images/docker/build-all.sh
diff --git a/ansible/test/bin/install-molecule.sh b/ansible/test/bin/install-molecule.sh
index f5350df6..72b07937 100755
--- a/ansible/test/bin/install-molecule.sh
+++ b/ansible/test/bin/install-molecule.sh
@@ -33,7 +33,7 @@
VENV_PATH=${VENV_PATH:-~/molecule_venv}
# Create virtual env
-python3 -m venv ${VENV_PATH}
+python3.6 -m venv ${VENV_PATH}
# Activate virtual env
source ${VENV_PATH}/bin/activate
diff --git a/ansible/test/molecule-docker/Dockerfile b/ansible/test/molecule-docker/Dockerfile
index 61817317..5c2343c9 100644
--- a/ansible/test/molecule-docker/Dockerfile
+++ b/ansible/test/molecule-docker/Dockerfile
@@ -14,7 +14,7 @@ RUN if [ ${USER_ID:-0} -ne 0 ] && [ ${GROUP_ID:-0} -ne 0 ]; then \
addgroup -g ${GROUP_ID} ${DOCKER_USER} && \
adduser -D -u ${USER_ID} -G ${DOCKER_USER} ${DOCKER_USER} && \
# Add user to same docker group as in docker_host to be able to use docker driver as sudo
- groupadd docker-host -g ${DOCKER_GROUP_ID} && \
+ groupadd docker-host -f -g ${DOCKER_GROUP_ID} && \
usermod -aG ${DOCKER_GROUP_ID} ${DOCKER_USER} \
;fi