From 952cbc0f1e18288660725a5ecb0a1b8c4e9ecf69 Mon Sep 17 00:00:00 2001
From: Neil Hanlon <neil@shrug.pw>
Date: Tue, 15 Mar 2022 12:23:17 -0400
Subject: [PATCH] Use the short form nodeset definition once it's merged
 upstream

Depends-On: https://review.opendev.org/c/opendev/base-jobs/+/828436
Signed-off-by: Neil Hanlon <neil@shrug.pw>
Change-Id: I4dcaa786c641c4230f0cdb2431bb82f7f02547b7
---
 zuul.d/jobs.yaml | 85 ++++++++++--------------------------------------
 1 file changed, 17 insertions(+), 68 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index acb95dc8aa..9bfd7144ee 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -478,142 +478,91 @@
 - job:
     name: openstack-ansible-deploy-aio_lxc-rockylinux-8
     parent: openstack-ansible-deploy-aio
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
 
 - job:
     name: openstack-ansible-deploy-infra_lxc-rockylinux-8
     parent: openstack-ansible-deploy-aio-infra
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
 
 - job:
     name: openstack-ansible-deploy-hosts_distro_lxc-rockylinux-8
     parent: openstack-ansible-deploy-aio-hosts
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
 
 - job:
     name: openstack-ansible-deploy-hosts_lxc-rockylinux-8
     parent: openstack-ansible-deploy-aio-hosts
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
 
 - job:
     name: openstack-ansible-deploy-hosts_metal-rockylinux-8
     parent: openstack-ansible-deploy-aio-hosts
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
 
 - job:
     name: openstack-ansible-deploy-aio_distro_lxc-rockylinux-8
     parent: openstack-ansible-deploy-aio-distro
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
 
 - job:
     name: openstack-ansible-deploy-aio_ceph-rockylinux-8
     parent: openstack-ansible-deploy-aio
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
 
 - job:
     name: openstack-ansible-deploy-aio_nfs-rockylinux-8
     parent: openstack-ansible-deploy-aio
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
 
 - job:
     name: openstack-ansible-deploy-aio_distro_ceph-rockylinux-8
     parent: openstack-ansible-deploy-aio-distro
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
 
 - job:
     name: openstack-ansible-upgrade-aio_lxc-rockylinux-8
     parent: openstack-ansible-deploy-aio
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
     timeout: 10800
 
 - job:
     name: openstack-ansible-upgrade-infra_lxc-rockylinux-8
     parent: openstack-ansible-deploy-aio-infra
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
     timeout: 10800
 
 - job:
     name: openstack-ansible-deploy-aio_metal-rockylinux-8
     parent: openstack-ansible-deploy-aio
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
 
 - job:
     name: openstack-ansible-deploy-aio_telemetry_metal-rockylinux-8
     parent: openstack-ansible-deploy-aio
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
 
 - job:
     name: openstack-ansible-deploy-aio_distro_metal-rockylinux-8
     parent: openstack-ansible-deploy-aio-distro
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
     voting: false
 
 - job:
     name: openstack-ansible-deploy-aio_nspawn-rockylinux-8
     parent: openstack-ansible-deploy-aio
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
 
 - job:
     name: openstack-ansible-upgrade-aio_ceph-rockylinux-8
     parent: openstack-ansible-deploy-aio
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
     timeout: 10800
 
 - job:
     name: openstack-ansible-upgrade-aio_metal-rockylinux-8
     parent: openstack-ansible-deploy-aio
-    nodeset:
-      nodes:
-        - label: rockylinux-8
-          name: rockylinux-8
+    nodeset: rockylinux-8
     timeout: 10800
  
 # debian bullseye