summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Pryc <mpryc@redhat.com>2016-11-24 11:58:38 +0100
committerMichal Pryc <mpryc@redhat.com>2016-11-24 11:59:10 +0100
commit9aef8b5b9c91e6ba0bc00c62206f0041df19e5de (patch)
treebaec1e6d8f8c8a435bcb7820055f977789532993
parent2600d963ff909578b796f4faa6d72382b4156261 (diff)
Use stable/newton branch in tox_install.sh and tox.ininewton-eol
This change modifies tox_install.sh wrapper to pick dependencies for the correct branch for stable/newton release. Adjust upper-constraints.txt in tox.ini to pick dependencies from stable/newton branch. Change-Id: I2e2680ab86dd8f0d63dcc73f4d7bac2288c76975
Notes
Notes (review): Verified+1: Murano CI Code-Review+2: Serg Melikyan <smelikyan@mirantis.com> Workflow+1: Serg Melikyan <smelikyan@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Sat, 26 Nov 2016 06:51:50 +0000 Reviewed-on: https://review.openstack.org/401968 Project: openstack/python-muranoclient Branch: refs/heads/stable/newton
-rwxr-xr-xtools/tox_install.sh2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
index 66b6710..56d7453 100755
--- a/tools/tox_install.sh
+++ b/tools/tox_install.sh
@@ -5,7 +5,7 @@
5# the constraints file before applying it for from-source installation. 5# the constraints file before applying it for from-source installation.
6 6
7ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner 7ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
8BRANCH_NAME=master 8BRANCH_NAME=stable/newton
9CLIENT_NAME=python-muranoclient 9CLIENT_NAME=python-muranoclient
10requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?) 10requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
11 11
diff --git a/tox.ini b/tox.ini
index 9b96cdf..f30c835 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ skipsdist = True
7usedevelop = True 7usedevelop = True
8whitelist_externals = bash 8whitelist_externals = bash
9install_command = 9install_command =
10 {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} 10 {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/newton} {opts} {packages}
11setenv = VIRTUAL_ENV={envdir} 11setenv = VIRTUAL_ENV={envdir}
12passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY 12passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
13deps = 13deps =