From 54164b84abc2b6b8772d2ac083e11ce7c137cc7c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 21 Sep 2018 21:53:20 +0200 Subject: [build] Use python -m pip workaround pipenv depends on pip, which conflicts with some distro versions of pip, see bug [1]. While at it, workaround lib64 issues on CentOS by passing `--always-copy` when creating the venv [2]. [1] https://github.com/pyenv/pyenv/issues/1141 [2] https://github.com/pypa/pipenv/issues/1929 Change-Id: I6af1a5fdbe8d37f75ab8b09b050449ad432191ad Signed-off-by: Alexandru Avadanii --- ci/build.sh | 10 +++++----- 1 file 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 \ -- cgit 1.2.3-korg