Merge "Update ubuntu-xenial-2-node to match centos-7-2-node"

2017-09-29 23:56:20 +00:00 · 2017-09-29 23:56:20 +00:00 · 61be8d2be9
commit 61be8d2be9
parent 06d8eca742 2c2f0e11cc
2 changed files with 12 additions and 4 deletions
--- a/tox.ini
+++ b/tox.ini
@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = linters
+envlist = linters,bindep

 [testenv]
 basepython = python3
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@ -91,8 +91,12 @@
    nodes:
      - name: primary
        label: ubuntu-xenial
-      - name: subnodes
+      - name: secondary
        label: ubuntu-xenial
+    groups:
+      - name: subnodes
+        nodes:
+          - secondary

 - nodeset:
    name: ubuntu-xenial-3-node
@ -201,8 +205,12 @@
    nodes:
      - name: primary
        label: ubuntu-xenial
-      - name: subnodes
+      - name: secondary
        label: ubuntu-xenial
+    groups:
+      - name: subnodes
+        nodes:
+          - secondary

 - nodeset:
    name: legacy-ubuntu-xenial-3-node
@ -217,4 +225,4 @@
      - name: subnodes
        nodes:
          - secondary-1
-          - secondary-2
+          - secondary-2