Fix pip install for run-local-test

This currently fails with:
ERROR: Double requirement given:
mock (from -r molecule-requirements.txt (line 10))
(already in mock>=2.0.0 (from -r test-requirements.txt (line 3)), name='mock')

The tox linters job uses the same pip requirements files but doesn't hit this
because it also passes the openstack upper constraints files, so do the same in
run-local-test.

Change-Id: I12602801147b99a4c17a02cfd43239897ee049f3
This commit is contained in:
Oliver Walsh 2019-12-11 11:03:06 +00:00
parent cf7239e590
commit a691762a80
1 changed files with 2 additions and 0 deletions

View File

@ -25,11 +25,13 @@ set -xeuo
export PROJECT_DIR="$(dirname $(readlink -f ${BASH_SOURCE[0]}))/../" export PROJECT_DIR="$(dirname $(readlink -f ${BASH_SOURCE[0]}))/../"
export ROLE_NAME="${ROLE_NAME:-$1}" export ROLE_NAME="${ROLE_NAME:-$1}"
export TRIPLEO_JOB_ANSIBLE_ARGS=${TRIPLEO_JOB_ANSIBLE_ARGS:-"-v"} export TRIPLEO_JOB_ANSIBLE_ARGS=${TRIPLEO_JOB_ANSIBLE_ARGS:-"-v"}
export UPPER_CONSTRAINTS_FILE= ${UPPER_CONSTRAINTS_FILE:-"https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt"}
## Functions ----------------------------------------------------------------- ## Functions -----------------------------------------------------------------
function run_pip { function run_pip {
"${HOME}/test-python/bin/pip" install \ "${HOME}/test-python/bin/pip" install \
-c "${UPPER_CONSTRAINTS_FILE}" \
-r "${PROJECT_DIR}/requirements.txt" \ -r "${PROJECT_DIR}/requirements.txt" \
-r "${PROJECT_DIR}/test-requirements.txt" \ -r "${PROJECT_DIR}/test-requirements.txt" \
-r "${PROJECT_DIR}/molecule-requirements.txt" ${@:-} -r "${PROJECT_DIR}/molecule-requirements.txt" ${@:-}