diff --git a/grafana/create-nodepool-dib.sh b/grafana/create-nodepool-dib.sh index ac4e4f3586..b7dc7e60d9 100755 --- a/grafana/create-nodepool-dib.sh +++ b/grafana/create-nodepool-dib.sh @@ -19,7 +19,6 @@ create "Ubuntu Bionic" "ubuntu-bionic" create "Ubuntu Xenial" "ubuntu-xenial" create "Centos 7" "centos-7" create "Centos 8" "centos-8" -create "Fedora 32" "fedora-32" create "Fedora 34" "fedora-34" create "Debian Bullseye" "debian-bullseye" create "Debian Buster" "debian-buster" diff --git a/grafana/nodepool-dib.yaml b/grafana/nodepool-dib.yaml index d33919ff71..6703b96ed5 100644 --- a/grafana/nodepool-dib.yaml +++ b/grafana/nodepool-dib.yaml @@ -227,58 +227,6 @@ dashboard: targets: - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.centos-8.status.duration.mean, 'None'), "Time") refId: A -# AUTOGENERATED : Fedora 32 - - - title: Fedora 32 - 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.fedora-32.status.rc" - valueFontSize: "50%" - - - title: Last build - type: singlestat - span: 2 - format: dateTimeFromNow - targets: - - target: "stats.gauges.nodepool.dib_image_build.fedora-32.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.fedora-32.*.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.fedora-32.status.duration.mean, 'None'), "Time") - refId: A # AUTOGENERATED : Fedora 34 - title: Fedora 34 diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml index cdb2e2b636..4a2f8be9b9 100644 --- a/nodepool/nl01.opendev.org.yaml +++ b/nodepool/nl01.opendev.org.yaml @@ -27,8 +27,6 @@ labels: min-ready: 1 - name: debian-stretch min-ready: 1 - - name: fedora-32 - min-ready: 1 - name: fedora-34 min-ready: 1 - name: gentoo-17-0-systemd @@ -115,11 +113,6 @@ providers: flavor-name: 'Performance' diskimage: debian-stretch key-name: infra-root-keys-2020-05-13 - - name: fedora-32 - min-ram: 8000 - flavor-name: 'Performance' - diskimage: fedora-32 - key-name: infra-root-keys-2020-05-13 - name: fedora-34 min-ram: 8000 flavor-name: 'Performance' diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml index bf4e748ff5..19a85aa98f 100644 --- a/nodepool/nl02.opendev.org.yaml +++ b/nodepool/nl02.opendev.org.yaml @@ -21,7 +21,6 @@ labels: - name: debian-bullseye - name: debian-buster - name: debian-stretch - - name: fedora-32 - name: fedora-34 - name: gentoo-17-0-systemd - name: opensuse-15 @@ -125,11 +124,6 @@ providers: flavor-name: 'nodepool.0' diskimage: debian-stretch key-name: infra-root-keys-2020-05-13 - - name: fedora-32 - min-ram: 8000 - flavor-name: 'nodepool.0' - diskimage: fedora-32 - key-name: infra-root-keys-2020-05-13 - name: fedora-34 min-ram: 8000 flavor-name: 'nodepool.0' @@ -239,11 +233,6 @@ providers: flavor-name: '8C-8GB-100GB' diskimage: debian-stretch key-name: infra-root-keys-2020-05-13 - - name: fedora-32 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: fedora-32 - key-name: infra-root-keys-2020-05-13 - name: fedora-34 min-ram: 8000 flavor-name: '8C-8GB-100GB' @@ -338,11 +327,6 @@ providers: flavor-name: 'opendev-zuul' diskimage: debian-stretch key-name: infra-root-keys-2020-05-13 - - name: fedora-32 - min-ram: 8000 - flavor-name: 'opendev-zuul' - diskimage: fedora-32 - key-name: infra-root-keys-2020-05-13 - name: fedora-34 min-ram: 8000 flavor-name: 'opendev-zuul' diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml index bb4b49cb18..5d8fa239e8 100644 --- a/nodepool/nl03.opendev.org.yaml +++ b/nodepool/nl03.opendev.org.yaml @@ -36,7 +36,6 @@ labels: - name: debian-stretch - name: debian-stretch-arm64 min-ready: 0 - - name: fedora-32 - name: fedora-34 - name: gentoo-17-0-systemd - name: opensuse-15 @@ -145,11 +144,6 @@ providers: flavor-name: 'A1.8' diskimage: debian-stretch key-name: infra-root-keys-2020-05-13 - - name: fedora-32 - min-ram: 8000 - flavor-name: 'A1.8' - diskimage: fedora-32 - key-name: infra-root-keys-2020-05-13 - name: fedora-34 min-ram: 8000 flavor-name: 'A1.8' @@ -293,13 +287,6 @@ providers: volume-size: 80 diskimage: debian-stretch key-name: infra-root-keys-2020-05-13 - - name: fedora-32 - min-ram: 8000 - flavor-name: v2-highcpu-8 - boot-from-volume: true - volume-size: 80 - diskimage: fedora-32 - key-name: infra-root-keys-2020-05-13 - name: fedora-34 min-ram: 8000 flavor-name: v2-highcpu-8 diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml index d3ecbb3e60..b36344e109 100644 --- a/nodepool/nl04.opendev.org.yaml +++ b/nodepool/nl04.opendev.org.yaml @@ -21,7 +21,6 @@ labels: - name: debian-bullseye - name: debian-buster - name: debian-stretch - - name: fedora-32 - name: fedora-34 - name: gentoo-17-0-systemd - name: opensuse-15 @@ -110,11 +109,6 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: debian-stretch key-name: infra-root-keys-2020-05-13 - - name: fedora-32 - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: fedora-32 - key-name: infra-root-keys-2020-05-13 - name: fedora-34 min-ram: 8000 flavor-name: ssd-osFoundation-3