Browse Source

Update tox.ini for new upper constraints strategy

The requirements team has defined a new strategy for handling
upper constraints[1]. This patch applies those strategies to
neutron-lbaas-dashboard.
This also pins the nodejs jobs to xenial.

[1] http://lists.openstack.org/pipermail/openstack-discuss/ \
    2019-May/006478.html

Change-Id: I970ff6a4f5cbb7ad1d2172285a5d84242e2c4ecf
changes/71/668271/3
Michael Johnson 2 months ago
parent
commit
ccf86210e5
2 changed files with 7 additions and 2 deletions
  1. 4
    0
      .zuul.yaml
  2. 3
    2
      tox.ini

+ 4
- 0
.zuul.yaml View File

@@ -6,11 +6,13 @@
6 6
     check:
7 7
       jobs:
8 8
         - nodejs-npm-run-lint:
9
+            nodeset: ubuntu-xenial
9 10
             vars:
10 11
               node_version: 4
11 12
             required-projects:
12 13
               - openstack/horizon
13 14
         - nodejs-npm-run-test:
15
+            nodeset: ubuntu-xenial
14 16
             vars:
15 17
               node_version: 4
16 18
             required-projects:
@@ -18,11 +20,13 @@
18 20
     gate:
19 21
       jobs:
20 22
         - nodejs-npm-run-lint:
23
+            nodeset: ubuntu-xenial
21 24
             vars:
22 25
               node_version: 4
23 26
             required-projects:
24 27
               - openstack/horizon
25 28
         - nodejs-npm-run-test:
29
+            nodeset: ubuntu-xenial
26 30
             vars:
27 31
               node_version: 4
28 32
             required-projects:

+ 3
- 2
tox.ini View File

@@ -5,7 +5,7 @@ skipsdist = True
5 5
 
6 6
 [testenv]
7 7
 usedevelop = True
8
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens} {opts} {packages}
8
+install_command = pip install {opts} {packages}
9 9
 setenv =
10 10
    VIRTUAL_ENV={envdir}
11 11
    NOSE_WITH_OPENSTACK=1
@@ -15,7 +15,8 @@ setenv =
15 15
    NOSE_OPENSTACK_SHOW_ELAPSED=1
16 16
    CLIENT_NAME=neutron-lbaas-dashboard
17 17
    DJANGO_SETTINGS_MODULE=neutron_lbaas_dashboard.tests.settings
18
-deps = -r{toxinidir}/requirements.txt
18
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/queens}
19
+       -r{toxinidir}/requirements.txt
19 20
        -r{toxinidir}/test-requirements.txt
20 21
        http://tarballs.openstack.org/horizon/horizon-stable-queens.tar.gz
21 22
 whitelist_externals = npm

Loading…
Cancel
Save