opendev/system-config
Code Issues Proposed changes

Change how we gate requirements installs

Browse Source 
dev-requirements may conflict with the other two files... so install
them first, then install dev-requirements.txt

Change-Id: I16698b35b90639297a75c1fed84acf6e3497ec66
This commit is contained in:
Monty Taylor 2013-07-31 15:01:13 -04:00
parent a16059c112
commit 9370e68f55
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml
View File

@ -9,7 +9,7 @@
/usr/local/jenkins/slave_scripts/select-mirror.sh openstack requirements /usr/local/jenkins/slave_scripts/select-mirror.sh openstack requirements
virtualenv --clear .venv virtualenv --clear .venv
PIP_ARGS="" PIP_ARGS=""
REQ_FILES="tools/pip-requires tools/test-requires requirements.txt test-requirements.txt dev-requirements.txt" REQ_FILES="tools/pip-requires tools/test-requires requirements.txt test-requirements.txt"
for FILE in $REQ_FILES for FILE in $REQ_FILES
do do
if [ -e $FILE ] if [ -e $FILE ]
@ -21,6 +21,9 @@
done done
# Run the same basic pip command that the mirror script runs. # Run the same basic pip command that the mirror script runs.
.venv/bin/pip install -M -U --exists-action=w $PIP_ARGS .venv/bin/pip install -M -U --exists-action=w $PIP_ARGS
if [ -e dev-requirements.txt ] ; then
.venv/bin/pip install -M -U --exists-action=w dev-requirements.txt
fi
publishers: publishers:
- console-log - console-log