diff options
| author |   Tomáš Levora <t.levora@partner.samsung.com> | 2020-05-27 10:51:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-05-27 10:51:44 +0000 |
| commit | 38cf0fdbf2f27a3b046c11bbd01331e4f609819e (patch) | |
| tree | 1ccafc347303aab39dcc4171949b7c1adde980c8 | |
| parent | 2e60d8e643a350cc529ef4e147c93b1b7032c401 (diff) | |
| parent | f030b067a4c7da273e5546c6e27b91682e95f6c3 (diff) | |
Merge "Fix: Fix docker cli version mismatch"
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | ansible/test/bin/ci-molecule.sh | 2 | ||||
| -rwxr-xr-x | ansible/test/bin/install-molecule.sh | 2 | ||||
| -rw-r--r-- | ansible/test/roles/prepare-docker-dind/tasks/rhel.yml | 5 | ||||
| -rwxr-xr-x | offline-installer-review.sh | 4 |
5 files changed, 10 insertions, 4 deletions
@@ -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 ----------" |