summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-25 12:08:28 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-25 12:08:28 +0000
commit1310f75e2b3eeecace62e7e565346f97996bfbda (patch)
tree012a680bd426b4d669e81f5e1a76d2d442cb4b5d
parent746793886ea7ddfe9dece93d5e5d386946fa443d (diff)
parenta358cae56f621b5e0ef97c2bcda9e69dade79ad8 (diff)
Merge "[build] Use python -m pip workaround" into stable/gambia
-rwxr-xr-xci/build.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/ci/build.sh b/ci/build.sh
index f15c52951..ec0040e7d 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -62,17 +62,17 @@ PYTHON_BIN_PATH="$(python -m site --user-base)/bin"
PATH="$PATH:$PYTHON_BIN_PATH"
notify "[NOTE] Installing required build-time distro and pip pkgs" 2
jumpserver_pkg_install 'build'
-pip install pipenv --user
+python -m pip install --upgrade pipenv --user
docker_install
popd > /dev/null
pushd "${DOCKER_DIR}" > /dev/null
-pipenv --two
-pipenv install
-pipenv install invoke
+python -m pipenv --two
+env VIRTUALENV_ALWAYS_COPY=1 python -m pipenv install
+env VIRTUALENV_ALWAYS_COPY=1 python -m pipenv install invoke
# shellcheck disable=SC2086
-pipenv run \
+python -m pipenv run \
invoke build saltmaster-reclass \
--require 'salt salt-formulas opnfv reclass tini-saltmaster' \
--dist=ubuntu \