From 1a855f3e9cd54988b1fb2199c85a98fb718fcffd Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 23 Dec 2022 09:10:43 +1100
Subject: [PATCH] nl03 : reorganise labels

Reorganise these labels into x86_64, arm64 and vexxhost specific.  I
think grouping by arch is a more logical grouping of what is going on
for the usual operations on this file.

Change-Id: I4225a5d58e2988a3e2da4799c95df9f9e39fe1e2
---
 nodepool/nl03.opendev.org.yaml | 46 ++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml
index 894385aac3..2703a34a1e 100644
--- a/nodepool/nl03.opendev.org.yaml
+++ b/nodepool/nl03.opendev.org.yaml
@@ -18,41 +18,55 @@ zookeeper-servers:
 # Note this doesn't apply for labels that are only provided by this launcher;
 # e.g. *-arm64
 labels:
+  # x86_64
   - name: centos-7
   - name: centos-8-stream
   - name: centos-9-stream
-  - name: centos-8-stream-arm64
-  - name: centos-9-stream-arm64
-    min-ready: 0
   - name: debian-bullseye
-  - name: debian-bullseye-arm64
-    min-ready: 0
   - name: debian-buster
-  - name: debian-buster-arm64
-    min-ready: 0
   - name: fedora-35
   - name: fedora-36
   - name: gentoo-17-0-systemd
+  - name: openEuler-22-03-LTS
   - name: opensuse-15
   - name: rockylinux-8
   - name: rockylinux-9
+  - name: ubuntu-xenial
   - name: ubuntu-bionic
   - name: ubuntu-focal
   - name: ubuntu-jammy
-  - name: ubuntu-xenial
-  - name: openEuler-22-03-LTS
-  - name: ubuntu-focal-arm64
+
+  # arm64
+  - name: centos-8-stream-arm64
     min-ready: 0
-  - name: ubuntu-focal-arm64-16C-16GB
+  - name: centos-9-stream-arm64
     min-ready: 0
-  - name: ubuntu-jammy-arm64
+  - name: rockylinux-9-arm64
     min-ready: 0
-  - name: ubuntu-jammy-arm64-16C-16GB
+  - name: debian-bullseye-arm64
+    min-ready: 0
+  - name: debian-buster-arm64
     min-ready: 0
   - name: ubuntu-bionic-arm64
     min-ready: 0
+  - name: ubuntu-focal-arm64
+    min-ready: 0
+  - name: ubuntu-jammy-arm64
+    min-ready: 0
+
+  # arm64 larger types
+  - name: openEuler-22-03-LTS-arm64-16C-16GB
+    min-ready: 0
   - name: ubuntu-bionic-arm64-16C-16GB
     min-ready: 0
+  - name: ubuntu-focal-arm64-16C-16GB
+    min-ready: 0
+  - name: ubuntu-jammy-arm64-16C-16GB
+    min-ready: 0
+  - name: rockylinux-9-arm64-16C-16GB
+    min-ready: 0
+
+  # vexxhost specific node types
   - name: ubuntu-bionic-vexxhost
     min-ready: 0
   - name: ubuntu-bionic-expanded-vexxhost
@@ -79,12 +93,6 @@ labels:
     min-ready: 0
   - name: nested-virt-rockylinux-9
     min-ready: 0
-  - name: openEuler-22-03-LTS-arm64-16C-16GB
-    min-ready: 0
-  - name: rockylinux-9-arm64
-    min-ready: 0
-  - name: rockylinux-9-arm64-16C-16GB
-    min-ready: 0
 
 providers:
   - name: vexxhost-ca-ymq-1