summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMateusz Pilat <m.pilat@partner.samsung.com>2020-05-20 14:58:50 +0200
committerMateusz Pilat <m.pilat@partner.samsung.com>2020-05-20 15:00:15 +0200
commitf030b067a4c7da273e5546c6e27b91682e95f6c3 (patch)
tree7ac5cd7e994c4198432d81e39479b3047a4ceb64
parent3e8a8868d7ef936ad85a360845d2c071d585c57b (diff)
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 <m.pilat@partner.samsung.com> Change-Id: Iebf8946c4a8b3eb3abd45402d6d573e403ac9ef2
-rw-r--r--.gitignore1
-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
-rwxr-xr-xoffline-installer-review.sh4
5 files changed, 10 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index f665d53f..ffef34ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
doc
/package.info
/ansible/log/
+/*.log
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
+
diff --git a/offline-installer-review.sh b/offline-installer-review.sh
index f839308a..f60beedd 100755
--- a/offline-installer-review.sh
+++ b/offline-installer-review.sh
@@ -48,10 +48,11 @@ function run_molecule() {
#######################################################################$
# MAIN #$
#######################################################################$
+echo "---------- ONAP OFFLINE INSTALLER - CHANGE VERIFICATION START ----------"
FAILED_ROLES=()
ALL_PLAYBOOKS=(`ls -d ansible/test/play-*`) # enumerate all playbook tests for later usage
# Setup environment
-prep_ubuntu_16_04_for_molecule
+prep_ubuntu_16_04_for_molecule > ubuntu_preparation.log
# Check for changes in Ansible roles
ROLE_CHANGES=(`git diff HEAD^ HEAD --name-only ansible/roles | cut -f 1-3 -d "/" | sort -u`)
@@ -135,3 +136,4 @@ else
echo "Verification failed for ${FAILED_ROLES[*]}"
exit 1
fi
+echo "---------- ONAP OFFLINE INSTALLER - CHANGE VERIFICATION END ----------"