summaryrefslogtreecommitdiffstats
path: root/ansible
diff options
context:
space:
mode:
authorTomáš Levora <t.levora@partner.samsung.com>2020-05-27 10:51:44 +0000
committerGerrit Code Review <gerrit@onap.org>2020-05-27 10:51:44 +0000
commit38cf0fdbf2f27a3b046c11bbd01331e4f609819e (patch)
tree1ccafc347303aab39dcc4171949b7c1adde980c8 /ansible
parent2e60d8e643a350cc529ef4e147c93b1b7032c401 (diff)
parentf030b067a4c7da273e5546c6e27b91682e95f6c3 (diff)
Merge "Fix: Fix docker cli version mismatch"
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/roles/prepare-docker-dind/tasks/rhel.yml5
3 files changed, 6 insertions, 3 deletions
diff --git a/ansible/test/bin/ci-molecule.sh b/ansible/test/bin/ci-molecule.sh
index 74296815..98e69c79 100755
--- a/ansible/test/bin/ci-molecule.sh
+++ b/ansible/test/bin/ci-molecule.sh
@@ -33,7 +33,7 @@ ROLE_PATH=$1
MOLECULE_CONTAINER=${MOLECULE_CONTAINER:-false}
echo "Build all pre-build images"
-${LOCAL_PATH}/../images/docker/build-all.sh
+${LOCAL_PATH}/../images/docker/build-all.sh > image_build.log
# Use Molecule container
if [ "${MOLECULE_CONTAINER}" == "true" ]; then
diff --git a/ansible/test/bin/install-molecule.sh b/ansible/test/bin/install-molecule.sh
index 72b07937..7857e0c8 100755
--- a/ansible/test/bin/install-molecule.sh
+++ b/ansible/test/bin/install-molecule.sh
@@ -41,5 +41,5 @@ source ${VENV_PATH}/bin/activate
# Install Molecule
if [ ! -z ${VIRTUAL_ENV} ]; then
echo "Activated virtual env in ${VIRTUAL_ENV}"
- pip install molecule==2.20 ansible==2.7.8 docker pyopenssl
+ pip -q install molecule==2.20 ansible==2.7.8 docker pyopenssl
fi
diff --git a/ansible/test/roles/prepare-docker-dind/tasks/rhel.yml b/ansible/test/roles/prepare-docker-dind/tasks/rhel.yml
index 4184ef05..820d6964 100644
--- a/ansible/test/roles/prepare-docker-dind/tasks/rhel.yml
+++ b/ansible/test/roles/prepare-docker-dind/tasks/rhel.yml
@@ -18,7 +18,10 @@
- name: "Install docker"
package:
- name: "docker-ce-{{ docker_version }}"
+ name:
+ - "docker-ce-{{ docker_version }}"
+ - "docker-ce-cli-{{ docker_version }}"
state: present
allow_downgrade: true
notify: Restart docker
+