From 07e9803134e59bbd20297e410fde382197a75b22 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 10 Jan 2022 14:01:18 -0800 Subject: [PATCH] Remove opensuse-tumbleweed from nodepool This removes the label, nodes, and images for opensuse-tumbleweed across our cloud providers. We also update grafana to stop graphing stats for the label. Depends-On: https://review.opendev.org/c/opendev/base-jobs/+/824068 Change-Id: Ic311af5d667c01c1845251270fd2fdda7d99ebcb --- grafana/create-nodepool-dib.sh | 1 - grafana/nodepool-dib.yaml | 52 ---------------------------------- nodepool/nl01.opendev.org.yaml | 10 ------- nodepool/nl02.opendev.org.yaml | 19 ------------- nodepool/nl03.opendev.org.yaml | 16 ----------- nodepool/nl04.opendev.org.yaml | 9 ------ nodepool/nodepool.yaml | 14 --------- 7 files changed, 121 deletions(-) diff --git a/grafana/create-nodepool-dib.sh b/grafana/create-nodepool-dib.sh index 07757e7ff9..2ec502f1bf 100755 --- a/grafana/create-nodepool-dib.sh +++ b/grafana/create-nodepool-dib.sh @@ -27,7 +27,6 @@ create "Debian Bullseye" "debian-bullseye" create "Debian Buster" "debian-buster" create "Gentoo" "gentoo-17-0-systemd" create "openSUSE 15.1" "opensuse-15" -create "openSUSE Tumbleweed" "opensuse-tumbleweed" create "Centos 8 arm64" "centos-8-arm64" create "Centos 8-stream arm64" "centos-8-stream-arm64" create "Debian Bullseye arm64" "debian-bullseye-arm64" diff --git a/grafana/nodepool-dib.yaml b/grafana/nodepool-dib.yaml index ac3f7163c5..87853497f0 100644 --- a/grafana/nodepool-dib.yaml +++ b/grafana/nodepool-dib.yaml @@ -643,58 +643,6 @@ dashboard: targets: - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.opensuse-15.status.duration.mean, 'None'), "Time") refId: A -# AUTOGENERATED : openSUSE Tumbleweed - - - title: openSUSE Tumbleweed - 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.opensuse-tumbleweed.status.rc" - valueFontSize: "50%" - - - title: Last build - type: singlestat - span: 2 - format: dateTimeFromNow - targets: - - target: "stats.gauges.nodepool.dib_image_build.opensuse-tumbleweed.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.opensuse-tumbleweed.*.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.opensuse-tumbleweed.status.duration.mean, 'None'), "Time") - refId: A # AUTOGENERATED : Centos 8 arm64 - title: Centos 8 arm64 diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml index 2479eec44b..ad6bd94310 100644 --- a/nodepool/nl01.opendev.org.yaml +++ b/nodepool/nl01.opendev.org.yaml @@ -35,8 +35,6 @@ labels: min-ready: 1 - name: opensuse-15 min-ready: 1 - - name: opensuse-tumbleweed - min-ready: 0 - name: ubuntu-bionic # Common job platform min-ready: 10 @@ -75,8 +73,6 @@ providers: config-drive: true - name: opensuse-15 config-drive: true - - name: opensuse-tumbleweed - config-drive: true - name: ubuntu-bionic config-drive: true - name: ubuntu-focal @@ -139,11 +135,6 @@ providers: flavor-name: 'Performance' diskimage: opensuse-15 key-name: infra-root-keys-2020-05-13 - - name: opensuse-tumbleweed - min-ram: 8000 - flavor-name: 'Performance' - diskimage: opensuse-tumbleweed - key-name: infra-root-keys-2020-05-13 - name: ubuntu-bionic min-ram: 8192 flavor-name: 'Performance' @@ -200,7 +191,6 @@ diskimages: - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 - - name: opensuse-tumbleweed - name: ubuntu-bionic - name: ubuntu-focal - name: ubuntu-xenial diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml index 6be25f7f5c..192704699c 100644 --- a/nodepool/nl02.opendev.org.yaml +++ b/nodepool/nl02.opendev.org.yaml @@ -25,7 +25,6 @@ labels: - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 - - name: opensuse-tumbleweed - name: ubuntu-bionic - name: ubuntu-bionic-limestone-debug - name: ubuntu-focal @@ -83,8 +82,6 @@ providers: config-drive: true - name: opensuse-15 config-drive: true - - name: opensuse-tumbleweed - config-drive: true - name: ubuntu-bionic config-drive: true - name: ubuntu-focal @@ -145,11 +142,6 @@ providers: flavor-name: 'nodepool.0' diskimage: opensuse-15 key-name: infra-root-keys-2020-05-13 - - name: opensuse-tumbleweed - min-ram: 8000 - flavor-name: 'nodepool.0' - diskimage: opensuse-tumbleweed - key-name: infra-root-keys-2020-05-13 - name: ubuntu-bionic min-ram: 8000 flavor-name: 'nodepool.0' @@ -259,11 +251,6 @@ providers: flavor-name: '8C-8GB-100GB' diskimage: opensuse-15 key-name: infra-root-keys-2020-05-13 - - name: opensuse-tumbleweed - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: opensuse-tumbleweed - key-name: infra-root-keys-2020-05-13 - name: ubuntu-bionic min-ram: 8000 flavor-name: '8C-8GB-100GB' @@ -358,11 +345,6 @@ providers: flavor-name: 'opendev-zuul' diskimage: opensuse-15 key-name: infra-root-keys-2020-05-13 - - name: opensuse-tumbleweed - min-ram: 8000 - flavor-name: 'opendev-zuul' - diskimage: opensuse-tumbleweed - key-name: infra-root-keys-2020-05-13 - name: ubuntu-bionic min-ram: 8000 flavor-name: 'opendev-zuul' @@ -395,7 +377,6 @@ diskimages: - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 - - name: opensuse-tumbleweed - name: ubuntu-bionic - name: ubuntu-focal - name: ubuntu-xenial diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml index 2cbd737a40..a0b4b3c59e 100644 --- a/nodepool/nl03.opendev.org.yaml +++ b/nodepool/nl03.opendev.org.yaml @@ -38,7 +38,6 @@ labels: - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 - - name: opensuse-tumbleweed - name: ubuntu-bionic - name: ubuntu-focal - name: ubuntu-xenial @@ -105,8 +104,6 @@ providers: config-drive: true - name: opensuse-15 config-drive: true - - name: opensuse-tumbleweed - config-drive: true - name: ubuntu-bionic config-drive: true - name: ubuntu-focal @@ -167,11 +164,6 @@ providers: flavor-name: 'A1.8' diskimage: opensuse-15 key-name: infra-root-keys-2020-05-13 - - name: opensuse-tumbleweed - min-ram: 8000 - flavor-name: 'A1.8' - diskimage: opensuse-tumbleweed - key-name: infra-root-keys-2020-05-13 - name: ubuntu-bionic min-ram: 8000 flavor-name: 'A1.8' @@ -327,13 +319,6 @@ providers: volume-size: 80 diskimage: opensuse-15 key-name: infra-root-keys-2020-05-13 - - name: opensuse-tumbleweed - min-ram: 8000 - flavor-name: v2-highcpu-8 - boot-from-volume: true - volume-size: 80 - diskimage: opensuse-tumbleweed - key-name: infra-root-keys-2020-05-13 - name: ubuntu-bionic min-ram: 8000 flavor-name: v2-highcpu-8 @@ -541,7 +526,6 @@ diskimages: - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 - - name: opensuse-tumbleweed - name: ubuntu-bionic - name: ubuntu-bionic-arm64 - name: ubuntu-focal diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml index 14be1632ef..e3c80f21b0 100644 --- a/nodepool/nl04.opendev.org.yaml +++ b/nodepool/nl04.opendev.org.yaml @@ -25,7 +25,6 @@ labels: - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 - - name: opensuse-tumbleweed - name: ubuntu-bionic - name: ubuntu-focal - name: ubuntu-xenial @@ -68,8 +67,6 @@ providers: config-drive: true - name: opensuse-15 config-drive: true - - name: opensuse-tumbleweed - config-drive: true - name: ubuntu-bionic config-drive: true - name: ubuntu-focal @@ -130,11 +127,6 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: opensuse-15 key-name: infra-root-keys-2020-05-13 - - name: opensuse-tumbleweed - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: opensuse-tumbleweed - key-name: infra-root-keys-2020-05-13 - name: ubuntu-bionic min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -199,7 +191,6 @@ diskimages: - name: fedora-35 - name: gentoo-17-0-systemd - name: opensuse-15 - - name: opensuse-tumbleweed - name: ubuntu-bionic - name: ubuntu-focal - name: ubuntu-xenial diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 6ca022be09..f6ff77c7ca 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -37,8 +37,6 @@ providers: config-drive: true - name: opensuse-15 config-drive: true - - name: opensuse-tumbleweed - config-drive: true - name: ubuntu-bionic config-drive: true - name: ubuntu-focal @@ -301,18 +299,6 @@ diskimages: env-vars: DIB_DISTRIBUTION_MIRROR: 'https://mirror.dfw.rax.opendev.org/opensuse' - - name: opensuse-tumbleweed - parent: base - pause: true - elements: - - opensuse-minimal - - cache-devstack - release: 'tumbleweed' - python-path: /usr/bin/python3 - env-vars: - DIB_DISTRIBUTION_MIRROR: 'https://mirror.dfw.rax.opendev.org/opensuse' - - ############ Ubuntu ############# - name: ubuntu-bionic