From f030b067a4c7da273e5546c6e27b91682e95f6c3 Mon Sep 17 00:00:00 2001 From: Mateusz Pilat Date: Wed, 20 May 2020 14:58:50 +0200 Subject: Fix: Fix docker cli version mismatch Docker cli version is different than docker engine version & Improve output of verification job Issue-ID: OOM-2415 Signed-off-by: Mateusz Pilat Change-Id: Iebf8946c4a8b3eb3abd45402d6d573e403ac9ef2 --- ansible/test/bin/ci-molecule.sh | 2 +- ansible/test/bin/install-molecule.sh | 2 +- ansible/test/roles/prepare-docker-dind/tasks/rhel.yml | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'ansible/test') 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 + -- cgit 1.2.3-korg