From 8fd1f09ca64f1619a6c4d220b8a2eb65ba55dffb Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 9 Sep 2017 09:48:26 -0500
Subject: [PATCH] Add nodesets for all of the nodepool v2 node entries

To ease transition, make a nodeset for each of the values used in v2.
This lets the migration script transfer node designations directly

Change-Id: I94ee3145b48837feabcea2793626123daa2336d4
---
 zuul.yaml | 134 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 116 insertions(+), 18 deletions(-)

diff --git a/zuul.yaml b/zuul.yaml
index 684d5ef6..cb9ac630 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -16,44 +16,32 @@
 - job:
     name: base-integration-centos-7
     parent: base-integration
-    nodes:
-      - name: centos-7
-        label: centos-7
+    nodes: centos-7
 
 - job:
     name: base-integration-debian-jessie
     parent: base-integration
-    nodes:
-      - name: debian-jessie
-        label: debian-jessie
+    nodes: debian-jessie
 
 - job:
     name: base-integration-fedora-26
     parent: base-integration
-    nodes:
-      - name: fedora-26
-        label: fedora-26
+    nodes: fedora-26
 
 - job:
     name: base-integration-opensuse423
     parent: base-integration
-    nodes:
-      - name: opensuse-423
-        label: opensuse-423
+    nodes: opensuse-423
 
 - job:
     name: base-integration-ubuntu-trusty
     parent: base-integration
-    nodes:
-      - name: ubuntu-trusty
-        label: ubuntu-trusty
+    nodes: ubuntu-trusty
 
 - job:
     name: base-integration-ubuntu-xenial
     parent: base-integration
-    nodes:
-      - name: ubuntu-xenial
-        label: ubuntu-xenial
+    nodes: ubuntu-xenial
 
 - job:
     name: openstack-doc-build
@@ -178,6 +166,116 @@
     required-projects:
       - openstack-infra/release-tools
 
+- nodeset:
+    name: centos-7
+    nodes:
+      - name: centos-7
+        label: centos-7
+
+- nodeset:
+    name: debian-jessie
+    nodes:
+      - name: debian-jessie
+        label: debian-jessie
+
+- nodeset:
+    name: fedora-26
+    nodes:
+      - name: fedora-26
+        label: fedora-26
+
+- nodeset:
+    name: opensuse-423
+    nodes:
+      - name: opensuse-423
+        label: opensuse-423
+
+- nodeset:
+    name: tripleo-centos-7
+    nodes:
+      - name: tripleo-centos-7
+        label: tripleo-centos-7
+
+- nodeset:
+    name: ubuntu-trusty
+    nodes:
+      - name: ubuntu-trusty
+        label: ubuntu-trusty
+
+- nodeset:
+    name: ubuntu-xenial
+    nodes:
+      - name: ubuntu-xenial
+        label: ubuntu-xenial
+
+- nodeset:
+    name: centos-7-2-node
+    nodes:
+      - name: primary
+        label: centos-7
+      - name: secondary
+        label: centos-7
+    groups:
+      - name: subnodes
+        nodes:
+          - secondary
+
+- nodeset:
+    name: centos-7-3-node
+    nodes:
+      - name: primary
+        label: centos-7
+      - name: secondary-1
+        label: centos-7
+      - name: secondary-2
+        label: centos-7
+    groups:
+      - name: subnodes
+        nodes:
+          - secondary-1
+          - secondary-2
+
+- nodeset:
+    name: centos-7-4-node
+    nodes:
+      - name: primary
+        label: centos-7
+      - name: secondary-1
+        label: centos-7
+      - name: secondary-2
+        label: centos-7
+      - name: secondary-3
+        label: centos-7
+    groups:
+      - name: subnodes
+        nodes:
+          - secondary-1
+          - secondary-2
+          - secondary-3
+
+- nodeset:
+    name: ubuntu-xenial-2-node
+    nodes:
+      - name: primary
+        label: ubuntu-xenial
+      - name: subnodes
+        label: ubuntu-xenial
+
+- nodeset:
+    name: ubuntu-xenial-3-node
+    nodes:
+      - name: primary
+        label: ubuntu-xenial
+      - name: secondary-1
+        label: ubuntu-xenial
+      - name: secondary-2
+        label: ubuntu-xenial
+    groups:
+      - name: subnodes
+        nodes:
+          - secondary-1
+          - secondary-2
+
 - project-template:
     name: publish-openstack-python-docs
     post: