From eeaa3496109f2275a82e696ce48824e618f0b6ae Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 2 Aug 2017 18:07:21 +0900 Subject: [PATCH] Change the way to install horizon This fixes the following error during ./stack.sh. Could not satisfy constraints for 'horizon': installation from path or url cannot be constrained to a version Also, having it in (test-)requirements.txt doesn't work well for Depends-On etc. tox_install.sh was copied from neutron-vpnaas-dashboard. Closes-Bug: #1708124 Change-Id: Iafd79e0b7db437863b65af6b94ccf74632e537be --- test-requirements.txt | 2 - tools/tox_install.sh | 87 +++++++++++++++++++++++++++++++++++++++++++ tox.ini | 9 ++++- 3 files changed, 94 insertions(+), 4 deletions(-) create mode 100755 tools/tox_install.sh diff --git a/test-requirements.txt b/test-requirements.txt index 92f3bf0..076df0d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -27,5 +27,3 @@ sphinx!=1.3b1,<1.3,>=1.2.1 # BSD testtools>=1.4.0 # MIT # This also needs xvfb library installed on your OS xvfbwrapper>=0.1.3 #license: MIT -# Include horizon as test requirement -http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon diff --git a/tools/tox_install.sh b/tools/tox_install.sh new file mode 100755 index 0000000..b551287 --- /dev/null +++ b/tools/tox_install.sh @@ -0,0 +1,87 @@ +#!/usr/bin/env bash + +# Client constraint file contains this client version pin that is in conflict +# with installing the client from source. We should remove the version pin in +# the constraints file before applying it for from-source installation. +# The script also has a secondary purpose to install certain special +# dependencies directly from git. + +# Wrapper for pip install that always uses constraints. +function pip_install() { + pip install -c"$localfile" -U "$@" +} + +# Grab the library from git using either zuul-cloner or pip. The former is +# there to a take advantage of the setup done by the gate infrastructure +# and honour any/all Depends-On headers in the commit message +function install_from_git() { + ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner + GIT_HOST=git.openstack.org + PROJ=$1 + EGG=$2 + + edit-constraints "$localfile" -- "$EGG" + if [ -x "$ZUUL_CLONER" ]; then + SRC_DIR="$VIRTUAL_ENV/src" + mkdir -p "$SRC_DIR" + cd "$SRC_DIR" >/dev/null + ZUUL_CACHE_DIR=${ZUUL_CACHE_DIR:-/opt/git} $ZUUL_CLONER \ + --branch "$BRANCH_NAME" \ + "git://$GIT_HOST" "$PROJ" + pip_install -e "$PROJ/." + cd - >/dev/null + else + SRC_DIR="$VIRTUAL_ENV/src/$PROJ" + git clone --depth 1 --branch $BRANCH_NAME https://$GIT_HOST/$PROJ $SRC_DIR + pip_install -e $SRC_DIR + fi +} + + + +CONSTRAINTS_FILE="$1" +shift 1 + +# This script will either complete with a return code of 0 or the return code +# of whatever failed. +set -e + +# NOTE(tonyb): Place this in the tox environment's log dir so it will get +# published to logs.openstack.org for easy debugging. +mkdir -p "$VIRTUAL_ENV/log/" +localfile="$VIRTUAL_ENV/log/upper-constraints.txt" + +if [[ "$CONSTRAINTS_FILE" != http* ]]; then + CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE" +fi +# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep +curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile" + +pip_install openstack-requirements + +# This is the main purpose of the script: Allow local installation of +# the current repo. It is listed in constraints file and thus any +# install will be constrained and we need to unconstrain it. +edit-constraints "$localfile" -- "$CLIENT_NAME" + +declare -a passthrough_args +while [ $# -gt 0 ] ; do + case "$1" in + # If we have any special os: deps then process them + os:*) + declare -a pkg_spec + IFS=: pkg_spec=($1) + install_from_git "${pkg_spec[1]}" "${pkg_spec[2]}" + ;; + # Otherwise just pass the other deps through to the constrained pip install + *) + passthrough_args+=("$1") + ;; + esac + shift 1 +done + +# If *only* had special args then then isn't any need to run pip. +if [ -n "$passthrough_args" ] ; then + pip_install "${passthrough_args[@]}" +fi diff --git a/tox.ini b/tox.ini index 5e1d3c1..2888100 100644 --- a/tox.ini +++ b/tox.ini @@ -5,15 +5,18 @@ skipsdist = True [testenv] usedevelop = True +install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} setenv = VIRTUAL_ENV={envdir} + BRANCH_NAME=master + CLIENT_NAME=tap-as-a-service-dashboard NOSE_WITH_OPENSTACK=1 NOSE_OPENSTACK_COLOR=1 NOSE_OPENSTACK_RED=0.05 NOSE_OPENSTACK_YELLOW=0.025 NOSE_OPENSTACK_SHOW_ELAPSED=1 -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt + os:openstack/horizon:horizon commands = python manage.py test {posargs} --settings=neutron_taas_dashboard.test.settings [testenv:pep8] @@ -56,7 +59,9 @@ commands = echo "nexecute `npm run test`" [testenv:docs] -setenv = DJANGO_SETTINGS_MODULE=neutron_taas_dashboard.test.settings +setenv = + {[testenv]setenv} + DJANGO_SETTINGS_MODULE=neutron_taas_dashboard.test.settings commands = python setup.py build_sphinx [testenv:releasenotes]