From af5975eaf456d750897a3a15a167d55e9b578eb4 Mon Sep 17 00:00:00 2001 From: Renat Akhmerov Date: Fri, 20 May 2016 09:28:45 +0700 Subject: [PATCH] Enforcing upper constraints for tox test jobs Co-Authored-By: Lingxian Kong Change-Id: Ibe35586272f39d5c0bbf2cd4e3425b5f06e2b6ea --- tools/tox_install.sh | 52 ++++++++++++++++++++++++++++++++++++++++++++ tox.ini | 7 ++++-- 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100755 tools/tox_install.sh diff --git a/tools/tox_install.sh b/tools/tox_install.sh new file mode 100755 index 000000000..f916b9306 --- /dev/null +++ b/tools/tox_install.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +# Upper constraint file contains mistral version(used by tripleo-common) pin +# that is in conflict with installing mistral from source. We should replace +# the version pin in the constraints file before applying it for from-source +# installation. + +ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner +BRANCH_NAME=master +MODULE_NAME=mistral +requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?) + +set -e + +CONSTRAINTS_FILE=$1 +shift + +install_cmd="pip install" +if [ $CONSTRAINTS_FILE != "unconstrained" ]; then + + mydir=$(mktemp -dt "$MODULE_NAME-tox_install-XXXXXXX") + localfile=$mydir/upper-constraints.txt + if [[ $CONSTRAINTS_FILE != http* ]]; then + CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE + fi + curl $CONSTRAINTS_FILE -k -o $localfile + install_cmd="$install_cmd -c$localfile" + + if [ $requirements_installed -eq 0 ]; then + echo "ALREADY INSTALLED" > /tmp/tox_install.txt + echo "Requirements already installed; using existing package" + elif [ -x "$ZUUL_CLONER" ]; then + export ZUUL_BRANCH=${ZUUL_BRANCH-$BRANCH} + echo "ZUUL CLONER" > /tmp/tox_install.txt + pushd $mydir + $ZUUL_CLONER --cache-dir /opt/git --branch $BRANCH_NAME git://git.openstack.org openstack/requirements + cd openstack/requirements + $install_cmd -e . + popd + else + echo "PIP HARDCODE" > /tmp/tox_install.txt + if [ -z "$REQUIREMENTS_PIP_LOCATION" ]; then + REQUIREMENTS_PIP_LOCATION="git+https://git.openstack.org/openstack/requirements@$BRANCH_NAME#egg=requirements" + fi + $install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION} + fi + + edit-constraints $localfile -- $MODULE_NAME "-e file://$PWD#egg=$MODULE_NAME" +fi + +$install_cmd -U $* +exit $? diff --git a/tox.ini b/tox.ini index 43128bf55..ae8347592 100644 --- a/tox.ini +++ b/tox.ini @@ -4,9 +4,8 @@ minversion = 1.6 skipsdist = True [testenv] -sitepackages = True usedevelop = True -install_command = pip install -U --force-reinstall {opts} {packages} +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} PYTHONDONTWRITEBYTECODE = 1 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY @@ -41,6 +40,7 @@ commands = #set PYTHONHASHSEED=0 to prevent wsmeext.sphinxext from randomly failing. [testenv:venv] +install_command = pip install -U {opts} {packages} setenv = PYTHONHASHSEED=0 commands = {posargs} @@ -54,6 +54,9 @@ setenv = VIRTUAL_ENV={envdir} commands = bash tools/lintstack.sh [testenv:releasenotes] +# TODO(kong): Avoid 'Couldn't open file...upper-constraints.txt' error. Remove +# this line once infra supports constraints for this target. +install_command = pip install -U {opts} {packages} commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html #Skip PEP257 violation.