x
/
sahara-ci-config
Code Issues Proposed changes

Merge "Added upper constraints to install command"

This commit is contained in:
Jenkins 2016-12-21 08:21:05 +00:00 committed by Gerrit Code Review
parent ebf498530f 6c626a6e90
commit caa041595f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/nodepool/scripts/prepare_node.sh
View File

@ -57,7 +57,7 @@ sudo service mysql stop
sudo pip install -U $PIP_PACKAGES
git clone https://git.openstack.org/openstack/sahara /tmp/sahara
git clone https://git.openstack.org/openstack/sahara-tests /tmp/sahara-tests
sudo pip install -U -r /tmp/sahara/requirements.txt
sudo pip install -U -r /tmp/sahara/requirements.txt -c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt
git clone https://git.openstack.org/openstack-infra/project-config /tmp/project-config
sudo mkdir -p /usr/local/jenkins/
sudo mv /tmp/project-config/jenkins/scripts /usr/local/jenkins/slave_scripts

2
slave-scripts/gate-sahara.sh
View File

@ -42,7 +42,7 @@ case $plugin in
;;
esac
sudo pip install -r requirements.txt . --no-cache-dir
sudo pip install -U -c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt -r requirements.txt . --no-cache-dir
enable_pypi
write_sahara_main_conf "$sahara_conf_file" "$sahara_plugin"
write_tests_conf "$cluster_name" "$image_variable_name" "$image_name" "$scenario_conf_file"