diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build.sh | 3 | ||||
| -rwxr-xr-x | ci/deploy.sh | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ci/build.sh b/ci/build.sh index fde0cfe4e..f15c52951 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -71,6 +71,7 @@ pushd "${DOCKER_DIR}" > /dev/null pipenv --two pipenv install pipenv install invoke +# shellcheck disable=SC2086 pipenv run \ invoke build saltmaster-reclass \ --require 'salt salt-formulas opnfv reclass tini-saltmaster' \ @@ -79,7 +80,7 @@ pipenv run \ --formula-rev=nightly \ --opnfv-tag="${DOCKER_TAG}" \ --salt='stable 2017.7' \ - "${DOCKER_PUSH}" + ${DOCKER_PUSH} popd > /dev/null diff --git a/ci/deploy.sh b/ci/deploy.sh index 0e084d295..4b6b916ac 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -305,12 +305,16 @@ elif [ ${USE_EXISTING_INFRA} -gt 0 ]; then else prepare_vms "${base_image}" "${MCP_STORAGE_DIR}" "${virtual_repos_pkgs}" \ "${virtual_nodes[@]}" - prepare_containers "${MCP_STORAGE_DIR}" create_networks "${OPNFV_BRIDGES[@]}" do_sysctl_cfg do_udev_cfg create_vms "${MCP_STORAGE_DIR}" "${virtual_nodes_data}" "${OPNFV_BRIDGES[@]}" start_vms "${virtual_nodes[@]}" + + # https://github.com/docker/libnetwork/issues/1743 + # rm -f /var/lib/docker/network/files/local-kv.db + sudo systemctl restart docker + prepare_containers "${MCP_STORAGE_DIR}" fi start_containers "${MCP_STORAGE_DIR}" |