From 2ccc5241c839f333c08d7feef1fd4da13da729f6 Mon Sep 17 00:00:00 2001
From: Neil Hanlon <neil@rockylinux.org>
Date: Tue, 8 Feb 2022 17:56:23 -0500
Subject: [PATCH] Add rockylinux-8 to nodepool configuration

Signed-off-by: Neil Hanlon <neil@rockylinux.org>
Change-Id: Ic3344bc47ca56c27f7ec3427a0865bd6ce3349d3
Depends-On: https://review.opendev.org/c/openstack/project-config/+/829405
Depends-On: https://review.opendev.org/c/openstack/project-config/+/829712
---
 grafana/create-nodepool-dib.sh |  1 +
 grafana/nodepool-dib.yaml      | 52 ++++++++++++++++++++++++++++++++++
 nodepool/nl01.opendev.org.yaml | 10 +++++++
 nodepool/nl02.opendev.org.yaml |  9 ++++++
 nodepool/nl03.opendev.org.yaml |  9 ++++++
 nodepool/nodepool.yaml         | 16 ++++++++++-
 6 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/grafana/create-nodepool-dib.sh b/grafana/create-nodepool-dib.sh
index ab0a038cdb..e5ec8b8be3 100755
--- a/grafana/create-nodepool-dib.sh
+++ b/grafana/create-nodepool-dib.sh
@@ -22,6 +22,7 @@ create "Centos 7" "centos-7"
 create "Centos 8 Stream" "centos-8-stream"
 create "Centos 9 Stream" "centos-9-stream"
 create "Fedora 35" "fedora-35"
+create "Rocky Linux 8" "rockylinux-8"
 create "Debian Bullseye" "debian-bullseye"
 create "Debian Buster" "debian-buster"
 create "Gentoo" "gentoo-17-0-systemd"
diff --git a/grafana/nodepool-dib.yaml b/grafana/nodepool-dib.yaml
index 8904547cbd..f1b5cc0664 100644
--- a/grafana/nodepool-dib.yaml
+++ b/grafana/nodepool-dib.yaml
@@ -383,6 +383,58 @@ dashboard:
           targets:
             - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.fedora-35.status.duration.mean, 'None'), "Time")
               refId: A
+# AUTOGENERATED : Rocky Linux 8
+
+    - title: Rocky Linux 8
+      showTitle: true
+      height: 200px
+      panels:
+        - title: Build status
+          colorBackground: true
+          type: singlestat
+          valueName: current
+          valueMaps:
+            - value: 0
+              text: "OK"
+            - value: 1
+              text: "FAILED"
+          thresholds: 0.1,0.9
+          span: 2
+          targets:
+            - target: "stats.gauges.nodepool.dib_image_build.rockylinux-8.status.rc"
+          valueFontSize: "50%"
+
+        - title: Last build
+          type: singlestat
+          span: 2
+          format: dateTimeFromNow
+          targets:
+            - target: "stats.gauges.nodepool.dib_image_build.rockylinux-8.status.last_build"
+          valueFontSize: "50%"
+
+        - title: Image size
+          type: graph
+          span: 3
+          yaxes:
+            - format: decbytes
+              min: 0
+            - format: decbytes
+              min: 0
+          targets:
+            - target: aliasByNode(stats.gauges.nodepool.dib_image_build.rockylinux-8.*.size, 5)
+              refId: A
+
+        - title: Build duration
+          type: graph
+          span: 3
+          yaxes:
+            - format: ms
+              min: 0
+            - format: ms
+              min: 0
+          targets:
+            - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.rockylinux-8.status.duration.mean, 'None'), "Time")
+              refId: A
 # AUTOGENERATED : Debian Bullseye
 
     - title: Debian Bullseye
diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml
index 7c07f2fe1a..d6fbbc1ff3 100644
--- a/nodepool/nl01.opendev.org.yaml
+++ b/nodepool/nl01.opendev.org.yaml
@@ -31,6 +31,8 @@ labels:
     min-ready: 1
   - name: opensuse-15
     min-ready: 1
+  - name: rockylinux-8
+    min-ready: 0
   - name: ubuntu-bionic
     # Common job platform
     min-ready: 10
@@ -65,6 +67,8 @@ providers:
         config-drive: true
       - name: opensuse-15
         config-drive: true
+      - name: rockylinux-8
+        config-drive: true
       - name: ubuntu-bionic
         config-drive: true
       - name: ubuntu-focal
@@ -117,6 +121,11 @@ providers:
             flavor-name: 'Performance'
             diskimage: opensuse-15
             key-name: infra-root-keys-2020-05-13
+          - name: rockylinux-8
+            min-ram: 8192
+            flavor-name: 'Performance'
+            diskimage: rockylinux-8
+            key-name: infra-root-keys-2020-05-13
           - name: ubuntu-bionic
             min-ram: 8192
             flavor-name: 'Performance'
@@ -171,6 +180,7 @@ diskimages:
   - name: fedora-35
   - name: gentoo-17-0-systemd
   - name: opensuse-15
+  - name: rockylinux-8
   - name: ubuntu-bionic
   - name: ubuntu-focal
   - name: ubuntu-xenial
diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml
index ad42cea55c..60a25c5f1c 100644
--- a/nodepool/nl02.opendev.org.yaml
+++ b/nodepool/nl02.opendev.org.yaml
@@ -23,6 +23,7 @@ labels:
   - name: fedora-35
   - name: gentoo-17-0-systemd
   - name: opensuse-15
+  - name: rockylinux-8
   - name: ubuntu-bionic
   - name: ubuntu-bionic-limestone-debug
   - name: ubuntu-focal
@@ -76,6 +77,8 @@ providers:
         config-drive: true
       - name: opensuse-15
         config-drive: true
+      - name: rockylinux-8
+        config-drive: true
       - name: ubuntu-bionic
         config-drive: true
       - name: ubuntu-focal
@@ -126,6 +129,11 @@ providers:
             flavor-name: 'nodepool.0'
             diskimage: opensuse-15
             key-name: infra-root-keys-2020-05-13
+          - name: rockylinux-8
+            min-ram: 8000
+            flavor-name: 'nodepool.0'
+            diskimage: rockylinux-8
+            key-name: infra-root-keys-2020-05-13
           - name: ubuntu-bionic
             min-ram: 8000
             flavor-name: 'nodepool.0'
@@ -339,6 +347,7 @@ diskimages:
   - name: fedora-35
   - name: gentoo-17-0-systemd
   - name: opensuse-15
+  - name: rockylinux-8
   - name: ubuntu-bionic
   - name: ubuntu-focal
   - name: ubuntu-xenial
diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml
index 5224654980..0f6ba2530e 100644
--- a/nodepool/nl03.opendev.org.yaml
+++ b/nodepool/nl03.opendev.org.yaml
@@ -32,6 +32,7 @@ labels:
   - name: fedora-35
   - name: gentoo-17-0-systemd
   - name: opensuse-15
+  - name: rockylinux-8
   - name: ubuntu-bionic
   - name: ubuntu-focal
   - name: ubuntu-xenial
@@ -94,6 +95,8 @@ providers:
         config-drive: true
       - name: opensuse-15
         config-drive: true
+      - name: rockylinux-8
+        config-drive: true
       - name: ubuntu-bionic
         config-drive: true
       - name: ubuntu-focal
@@ -144,6 +147,11 @@ providers:
             flavor-name: 'A1.8'
             diskimage: opensuse-15
             key-name: infra-root-keys-2020-05-13
+          - name: rockylinux-8
+            min-ram: 8000
+            flavor-name: 'A1.8'
+            diskimage: rockylinux-8
+            key-name: infra-root-keys-2020-05-13
           - name: ubuntu-bionic
             min-ram: 8000
             flavor-name: 'A1.8'
@@ -470,6 +478,7 @@ diskimages:
   - name: fedora-35
   - name: gentoo-17-0-systemd
   - name: opensuse-15
+  - name: rockylinux-8
   - name: ubuntu-bionic
   - name: ubuntu-bionic-arm64
   - name: ubuntu-focal
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 6e83086921..85062b1df7 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -33,6 +33,8 @@ providers:
         config-drive: true
       - name: opensuse-15
         config-drive: true
+      - name: rockylinux-8
+        config-drive: true
       - name: ubuntu-bionic
         config-drive: true
       - name: ubuntu-focal
@@ -133,7 +135,7 @@ diskimages:
       DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
 
 
-############ CentOS and Fedora #############
+############ CentOS and Fedora (and derivatives) #############
 
   - name: centos-7
     parent: base
@@ -168,6 +170,18 @@ diskimages:
     env-vars:
       DIB_EPEL_DISABLED: '1'
 
+  - name: rockylinux-8
+    parent: base
+    pause: false
+    python-path: /usr/bin/python3
+    release: '8'
+    elements:
+      - cache-devstack
+      - rocky-container
+      - epel
+    env-vars:
+      DIB_EPEL_DISABLED: '1'
+
   - name: fedora-35
     parent: base
     pause: false