From b0f546ad82bcb427bc5f724150063d239f3a306d Mon Sep 17 00:00:00 2001
From: Mateusz Pilat <m.pilat@partner.samsung.com>
Date: Wed, 8 May 2019 13:33:46 +0200
Subject: Extending molecule test to playbooks

Review should also execute molecule tests for ansible/test/play-xxx when anything in /ansible/test has been changed

Change-Id: I9a106a1c141b1053db6ac892e2dcecd4e646fd5b
Issue-ID: OOM-1801
Signed-off-by: Mateusz Pilat <m.pilat@partner.samsung.com>
---
 ansible/test/bin/ci-molecule.sh         | 2 +-
 ansible/test/bin/install-molecule.sh    | 2 +-
 ansible/test/molecule-docker/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ansible/test')

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
 
-- 
cgit 1.2.3-korg