From dc09dffbe225207bdc039a0bd9abd3c09554dbc8 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 10 Mar 2020 10:49:40 +0100 Subject: [PATCH] Remove Fedora 29 from nodepool All jobs using Fedora 29 have been removed, we can remove it from nodepool and thus OpenDev now. Depends-On: https://review.opendev.org/711969 Change-Id: I75c0713d164c29a47db9a0cdfc43fadb370e81f8 --- grafana/create-nodepool-dib.sh | 1 - grafana/nodepool-dib.yaml | 52 -------------------------------- nodepool/nl01.openstack.org.yaml | 10 ------ nodepool/nl02.openstack.org.yaml | 24 --------------- nodepool/nl03.openstack.org.yaml | 30 ------------------ nodepool/nl04.openstack.org.yaml | 9 ------ nodepool/nodepool.yaml | 24 --------------- 7 files changed, 150 deletions(-) diff --git a/grafana/create-nodepool-dib.sh b/grafana/create-nodepool-dib.sh index 4a44517b05..207e1c7fd8 100755 --- a/grafana/create-nodepool-dib.sh +++ b/grafana/create-nodepool-dib.sh @@ -18,7 +18,6 @@ cp nodepool-dib.base.template nodepool-dib.yaml create "Ubuntu Bionic" "ubuntu-bionic" create "Ubuntu Xenial" "ubuntu-xenial" create "Centos 7" "centos-7" -create "Fedora 29" "fedora-29" create "Fedora 30" "fedora-30" create "Debian Buster" "debian-buster" create "Debian Stretch" "debian-stretch" diff --git a/grafana/nodepool-dib.yaml b/grafana/nodepool-dib.yaml index 679f78d7da..509d2adf51 100644 --- a/grafana/nodepool-dib.yaml +++ b/grafana/nodepool-dib.yaml @@ -175,58 +175,6 @@ dashboard: targets: - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.centos-7.status.duration.mean, 'None'), "Time") refId: A -# AUTOGENERATED : Fedora 29 - - - title: Fedora 29 - 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-29.status.rc" - valueFontSize: "50%" - - - title: Last build - type: singlestat - span: 2 - format: dateTimeFromNow - targets: - - target: "stats.gauges.nodepool.dib_image_build.fedora-29.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-29.*.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-29.status.duration.mean, 'None'), "Time") - refId: A # AUTOGENERATED : Fedora 30 - title: Fedora 30 diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml index cdcff826f7..7308821cca 100644 --- a/nodepool/nl01.openstack.org.yaml +++ b/nodepool/nl01.openstack.org.yaml @@ -21,8 +21,6 @@ labels: min-ready: 1 - name: debian-stretch min-ready: 1 - - name: fedora-29 - min-ready: 1 - name: fedora-30 min-ready: 1 - name: gentoo-17-0-systemd @@ -53,8 +51,6 @@ providers: config-drive: true - name: debian-stretch config-drive: true - - name: fedora-29 - config-drive: true - name: fedora-30 config-drive: true - name: gentoo-17-0-systemd @@ -91,11 +87,6 @@ providers: flavor-name: 'Performance' diskimage: debian-stretch key-name: infra-root-keys-2018-06-15 - - name: fedora-29 - min-ram: 8000 - flavor-name: 'Performance' - diskimage: fedora-29 - key-name: infra-root-keys-2018-06-15 - name: fedora-30 min-ram: 8000 flavor-name: 'Performance' @@ -157,7 +148,6 @@ diskimages: - name: centos-8 - name: debian-buster - name: debian-stretch - - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-15 diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml index ee0d5cad35..6085290dcc 100644 --- a/nodepool/nl02.openstack.org.yaml +++ b/nodepool/nl02.openstack.org.yaml @@ -17,7 +17,6 @@ labels: - name: centos-8 - name: debian-buster - name: debian-stretch - - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-15 @@ -61,8 +60,6 @@ providers: config-drive: true - name: debian-stretch config-drive: true - - name: fedora-29 - config-drive: true - name: fedora-30 config-drive: true - name: gentoo-17-0-systemd @@ -103,11 +100,6 @@ providers: flavor-name: '8C-8GB-100GB' diskimage: debian-stretch key-name: infra-root-keys-2018-06-15 - - name: fedora-29 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: fedora-29 - key-name: infra-root-keys-2018-06-15 - name: fedora-30 min-ram: 8000 flavor-name: '8C-8GB-100GB' @@ -204,11 +196,6 @@ providers: flavor-name: 'nodepool.0' diskimage: debian-stretch key-name: infra-root-keys-2018-06-15 - - name: fedora-29 - min-ram: 8000 - flavor-name: 'nodepool.0' - diskimage: fedora-29 - key-name: infra-root-keys-2018-06-15 - name: fedora-30 min-ram: 8000 flavor-name: 'nodepool.0' @@ -286,11 +273,6 @@ providers: flavor-name: '8cpu-8GBram-80GBdisk' diskimage: debian-stretch key-name: infra-root-keys-2018-06-15 - - name: fedora-29 - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: fedora-29 - key-name: infra-root-keys-2018-06-15 - name: fedora-30 min-ram: 8000 flavor-name: '8cpu-8GBram-80GBdisk' @@ -398,11 +380,6 @@ providers: flavor-name: '8C-8GB-100GB' diskimage: debian-stretch key-name: infra-root-keys-2018-06-15 - - name: fedora-29 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: fedora-29 - key-name: infra-root-keys-2018-06-15 - name: fedora-30 min-ram: 8000 flavor-name: '8C-8GB-100GB' @@ -456,7 +433,6 @@ diskimages: - name: centos-8 - name: debian-buster - name: debian-stretch - - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-15 diff --git a/nodepool/nl03.openstack.org.yaml b/nodepool/nl03.openstack.org.yaml index 572536307e..dacc92de31 100644 --- a/nodepool/nl03.openstack.org.yaml +++ b/nodepool/nl03.openstack.org.yaml @@ -24,7 +24,6 @@ labels: - name: debian-stretch - name: debian-stretch-arm64 min-ready: 1 - - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-15 @@ -39,8 +38,6 @@ labels: min-ready: 0 - name: ubuntu-bionic-vexxhost min-ready: 0 - - name: fedora-29-vexxhost - min-ready: 0 - name: fedora-30-vexxhost min-ready: 0 - name: centos-7-gpu @@ -70,8 +67,6 @@ providers: config-drive: true - name: debian-stretch config-drive: true - - name: fedora-29 - config-drive: true - name: fedora-30 config-drive: true - name: gentoo-17-0-systemd @@ -108,11 +103,6 @@ providers: flavor-name: 'A1.8' diskimage: debian-stretch key-name: infra-root-keys-2018-06-15 - - name: fedora-29 - min-ram: 8000 - flavor-name: 'A1.8' - diskimage: fedora-29 - key-name: infra-root-keys-2018-06-15 - name: fedora-30 min-ram: 8000 flavor-name: 'A1.8' @@ -174,11 +164,6 @@ providers: flavor-name: 'osf-highcpu-8' diskimage: debian-stretch key-name: infra-root-keys-2018-06-15 - - name: fedora-29 - min-ram: 8000 - flavor-name: 'osf-highcpu-8' - diskimage: fedora-29 - key-name: infra-root-keys-2018-06-15 - name: fedora-30 min-ram: 8000 flavor-name: 'osf-highcpu-8' @@ -276,13 +261,6 @@ providers: volume-size: 80 diskimage: debian-stretch key-name: infra-root-keys-2018-06-15 - - name: fedora-29 - min-ram: 8000 - flavor-name: v2-highcpu-8 - boot-from-volume: true - volume-size: 80 - diskimage: fedora-29 - key-name: infra-root-keys-2018-06-15 - name: fedora-30 min-ram: 8000 flavor-name: v2-highcpu-8 @@ -342,13 +320,6 @@ providers: - name: vexxhost-specific max-servers: 10 labels: - - name: fedora-29-vexxhost - min-ram: 8000 - flavor-name: v2-highcpu-8 - boot-from-volume: true - volume-size: 80 - diskimage: fedora-29 - key-name: infra-root-keys-2018-06-15 - name: fedora-30-vexxhost min-ram: 8000 flavor-name: v2-highcpu-8 @@ -430,7 +401,6 @@ diskimages: - name: debian-buster-arm64 - name: debian-stretch - name: debian-stretch-arm64 - - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-15 diff --git a/nodepool/nl04.openstack.org.yaml b/nodepool/nl04.openstack.org.yaml index 5c2c38361b..3c919a8459 100644 --- a/nodepool/nl04.openstack.org.yaml +++ b/nodepool/nl04.openstack.org.yaml @@ -17,7 +17,6 @@ labels: - name: centos-8 - name: debian-buster - name: debian-stretch - - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-15 @@ -41,8 +40,6 @@ providers: config-drive: true - name: debian-stretch config-drive: true - - name: fedora-29 - config-drive: true - name: fedora-30 config-drive: true - name: gentoo-17-0-systemd @@ -79,11 +76,6 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: debian-stretch key-name: infra-root-keys-2018-06-15 - - name: fedora-29 - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: fedora-29 - key-name: infra-root-keys-2018-06-15 - name: fedora-30 min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -132,7 +124,6 @@ diskimages: - name: centos-8 - name: debian-buster - name: debian-stretch - - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-15 diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index a09cfacf95..73708f1804 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -43,8 +43,6 @@ providers: config-drive: true - name: debian-stretch config-drive: true - - name: fedora-29 - config-drive: true - name: fedora-30 config-drive: true - name: gentoo-17-0-systemd @@ -239,28 +237,6 @@ diskimages: fstab: options: "defaults,nobarrier,noatime" fsck-passno: 1 - - name: fedora-29 - pause: false - elements: - - fedora-minimal - - vm - - simple-init - - openstack-repos - - nodepool-base - - cache-devstack - - initialize-urandom - - growroot - - infra-package-needs - release: 29 - env-vars: - TMPDIR: /opt/dib_tmp - DIB_CHECKSUM: '1' - DIB_IMAGE_CACHE: /opt/dib_cache - DIB_JOURNAL_SIZE: '512' - DIB_GRUB_TIMEOUT: '0' - GIT_HTTP_LOW_SPEED_TIME: '300' - GIT_HTTP_LOW_SPEED_LIMIT: '1000' - DIB_SHOW_IMAGE_USAGE: '1' - name: fedora-30 pause: true python-path: /usr/bin/python3