From 72865f82b54cd554d8f8b3ad4e30c24e6d146b61 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Tue, 4 Feb 2025 16:19:59 -0800
Subject: [PATCH] Add more flavors

We're looking to expand the available flavors to include flavors
with more ram.  Since we are also beginning to test zuul-launcher
with the zuul project, let's add some flavors to the zuul-launcher
side of the house and let the zuul project drive a small amount
of workload on those flavors to identify any issues before rolling
it out to the rest of opendev.

This adds 4 and 16gb flavors as well as the standard 8gb.  We can
probably run linter jobs on 4gb flavors, so let's try that.  It
might help even out our usage (assuming we have enough ip addrs,
etc).

Change-Id: I70a7814bca455ca24ba3e812f65fa46d346a5d93
---
 zuul.d/flavors.yaml   |  9 +++++++++
 zuul.d/labels.yaml    | 15 +++++++++++++++
 zuul.d/providers.yaml | 23 +++++++++++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/zuul.d/flavors.yaml b/zuul.d/flavors.yaml
index 88376a5..9b1f65a 100644
--- a/zuul.d/flavors.yaml
+++ b/zuul.d/flavors.yaml
@@ -1,2 +1,11 @@
 - flavor:
     name: normal
+
+- flavor:
+    name: 4GB
+
+- flavor:
+    name: 8GB
+
+- flavor:
+    name: 16GB
diff --git a/zuul.d/labels.yaml b/zuul.d/labels.yaml
index 0612a41..07496b6 100644
--- a/zuul.d/labels.yaml
+++ b/zuul.d/labels.yaml
@@ -5,3 +5,18 @@
     name: niz-debian-bullseye-normal
     image: debian-bullseye
     flavor: normal
+
+- label:
+    name: niz-debian-bullseye-4GB
+    image: debian-bullseye
+    flavor: 4GB
+
+- label:
+    name: niz-debian-bullseye-8GB
+    image: debian-bullseye
+    flavor: 8GB
+
+- label:
+    name: niz-debian-bullseye-16GB
+    image: debian-bullseye
+    flavor: 16GB
diff --git a/zuul.d/providers.yaml b/zuul.d/providers.yaml
index 17bd5f1..2898ddf 100644
--- a/zuul.d/providers.yaml
+++ b/zuul.d/providers.yaml
@@ -9,7 +9,17 @@
       - opendevzuul-network1
     flavors:
       - name: normal
+        description: 4vcpu, 8GB ram, 80GB disk
         flavor-name: gp.0.4.8
+      - name: 4GB
+        description: 4vcpu, 4GB ram, 80GB disk
+        flavor-name: gp.0.4.4
+      - name: 8GB
+        description: 4vcpu, 8GB ram, 80GB disk
+        flavor-name: gp.0.4.8
+      - name: 16GB
+        description: 4vcpu, 16GB ram, 80GB disk
+        flavor-name: gp.0.4.16
     images:
       - name: debian-bullseye
 
@@ -24,6 +34,12 @@
     labels:
       - name: niz-debian-bullseye-normal
         key-name: infra-root-keys-2024-04-08
+      - name: niz-debian-bullseye-4GB
+        key-name: infra-root-keys-2024-04-08
+      - name: niz-debian-bullseye-8GB
+        key-name: infra-root-keys-2024-04-08
+      - name: niz-debian-bullseye-16GB
+        key-name: infra-root-keys-2024-04-08
 
 # Vexxhost
 - section:
@@ -32,6 +48,10 @@
     connection: vexxhost
     boot-timeout: 120
     launch-timeout: 600
+    flavors:
+      - name: 16GB
+        description: 4vcpu, 16GB ram, 80GB disk
+        flavor-name: v3-standard-4
     images:
       - name: debian-bullseye
 
@@ -43,3 +63,6 @@
 - provider:
     name: vexxhost-ca-ymq-1-main
     section: vexxhost-ca-ymq-1
+    labels:
+      - name: niz-debian-bullseye-16GB
+        key-name: infra-root-keys-2024-04-08