summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-22 15:37:02 +0000
committerGerrit Code Review <review@openstack.org>2016-08-22 15:37:02 +0000
commit38a5d0e2ab9f828fab13d7168705062dc18de06d (patch)
treebd7ae8ceda1d3c06b648e3e8dee46021ca4a8830
parenta78f4348f84dd470ba1f3b99d2c751fa2dd12d7a (diff)
parent3cac9b551cdecaf9148800cc6fd9b81fbb3149c5 (diff)
Merge "Switch to upstream fuel-web repository" into stable/mitaka
-rw-r--r--tox.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index fd8d423..4e1ebad 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,9 +4,9 @@ envlist = pep8,py27
4skipsdist = True 4skipsdist = True
5 5
6[base] 6[base]
7NAILGUN_REPO = git+https://github.com/zubchick/fuel-web.git 7NAILGUN_REPO = git+https://github.com/openstack/fuel-web.git
8NAILGUN_CONFIG = {toxinidir}/nailgun-test-settings.yaml 8NAILGUN_CONFIG = {toxinidir}/nailgun-test-settings.yaml
9NAILGUN_BRANCH={env:ZUUL_BRANCH:master} 9NAILGUN_BRANCH={env:ZUUL_BRANCH:stable/mitaka}
10 10
11[testenv] 11[testenv]
12deps = -r{toxinidir}/test-requirements.txt 12deps = -r{toxinidir}/test-requirements.txt