openstack/kayobe
Code Issues Proposed changes

Merge "Install python-openstackclient using upper constraints"

Browse Source
This commit is contained in:
Zuul 2020-04-02 20:07:52 +00:00 committed by Gerrit Code Review
commit 7110477bcb
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev/config.sh
View File

@ -23,3 +23,6 @@
# Additional arguments to pass to kayobe commands. # Additional arguments to pass to kayobe commands.
#export KAYOBE_EXTRA_ARGS= #export KAYOBE_EXTRA_ARGS=
# Upper constraints to use when installing Python packages.
#export UPPER_CONSTRAINTS_FILE=

19
dev/functions
View File

@ -41,6 +41,21 @@ function config_defaults {
# Additional arguments to pass to kayobe commands. # Additional arguments to pass to kayobe commands.
export KAYOBE_EXTRA_ARGS=${KAYOBE_EXTRA_ARGS:-} export KAYOBE_EXTRA_ARGS=${KAYOBE_EXTRA_ARGS:-}
# Use .gitreview as the key to determine the appropriate branch to clone
# for tests. Inspired by OSA code.
PARENT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
if [ -f "${PARENT}/../.gitreview" ]; then
BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' "${PARENT}/../.gitreview")
if [[ "${BRANCH}" == "" ]]; then
SERIES="master"
else
SERIES="$(echo ${BRANCH} | sed 's|stable/||')"
fi
# Upper constraints to use when installing Python packages.
export UPPER_CONSTRAINTS_FILE="${UPPER_CONSTRAINTS_FILE:-https://releases.openstack.org/constraints/upper/${SERIES}}"
fi
# Path to the Tenks virtual environment. # Path to the Tenks virtual environment.
export TENKS_VENV_PATH="${TENKS_VENV_PATH:-${HOME}/tenks-test-venv}" export TENKS_VENV_PATH="${TENKS_VENV_PATH:-${HOME}/tenks-test-venv}"
@ -395,7 +410,11 @@ function overcloud_test_init {
echo "Performing overcloud test init" echo "Performing overcloud test init"
environment_setup environment_setup
if [[ ! -z "$UPPER_CONSTRAINTS_FILE" ]]; then
pip install python-openstackclient -c "$UPPER_CONSTRAINTS_FILE"
else
pip install python-openstackclient pip install python-openstackclient
fi
source "${KOLLA_CONFIG_PATH:-/etc/kolla}/admin-openrc.sh" source "${KOLLA_CONFIG_PATH:-/etc/kolla}/admin-openrc.sh"
# This guards init-runonce from running more than once # This guards init-runonce from running more than once