From e38efe3a8452d43259d768ed1aa7cc93213327ad Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 9 Sep 2019 16:56:02 +1000 Subject: [PATCH] Add Fedora 30 nodes Fedora 30 is supported with diskimage-builder's 2.27.0 release recently tagged Change-Id: Ic0316a0e755b67181ae74c06f712e351ea485de7 --- grafana/create-nodepool-dib.sh | 1 + grafana/nodepool-dib.yaml | 88 ++++++++++++++++++++++++++++++++ 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 | 26 ++++++++++ 7 files changed, 188 insertions(+) diff --git a/grafana/create-nodepool-dib.sh b/grafana/create-nodepool-dib.sh index 03a1420ff2..3192066f05 100755 --- a/grafana/create-nodepool-dib.sh +++ b/grafana/create-nodepool-dib.sh @@ -20,6 +20,7 @@ create "Ubuntu Xenial" "ubuntu-xenial" create "Ubuntu Trusty" "ubuntu-trusty" 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" create "Gentoo" "gentoo-17-0-systemd" diff --git a/grafana/nodepool-dib.yaml b/grafana/nodepool-dib.yaml index bab158d956..d4f5ae3301 100644 --- a/grafana/nodepool-dib.yaml +++ b/grafana/nodepool-dib.yaml @@ -239,6 +239,94 @@ dashboard: targets: - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.fedora-29.qcow2.duration.mean, 'None'), "Time") refId: A +# AUTOGENERATED : Fedora 30 + + - title: Fedora 30 + 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-30.qcow2.rc" + 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-30.*.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-30.qcow2.duration.mean, 'None'), "Time") + refId: A +# AUTOGENERATED : Debian Buster + + - title: Debian Buster + 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.debian-buster.qcow2.rc" + 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.debian-buster.*.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.debian-buster.qcow2.duration.mean, 'None'), "Time") + refId: A # AUTOGENERATED : Debian Stretch - title: Debian Stretch diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml index bb50296ab6..cf8034cb55 100644 --- a/nodepool/nl01.openstack.org.yaml +++ b/nodepool/nl01.openstack.org.yaml @@ -23,6 +23,8 @@ labels: min-ready: 1 - name: fedora-29 min-ready: 1 + - name: fedora-30 + min-ready: 1 - name: gentoo-17-0-systemd min-ready: 1 - name: opensuse-423 @@ -58,6 +60,8 @@ providers: config-drive: true - name: fedora-29 config-drive: true + - name: fedora-30 + config-drive: true - name: gentoo-17-0-systemd config-drive: true - name: opensuse-423 @@ -103,6 +107,11 @@ providers: flavor-name: 'Performance' diskimage: fedora-29 key-name: infra-root-keys-2018-06-15 + - name: fedora-30 + min-ram: 8000 + flavor-name: 'Performance' + diskimage: fedora-30 + key-name: infra-root-keys-2018-06-15 - name: gentoo-17-0-systemd min-ram: 8000 flavor-name: 'Performance' @@ -175,6 +184,7 @@ diskimages: - name: debian-stretch - name: fedora-28 - name: fedora-29 + - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-423 - name: opensuse-150 diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml index 1d0b6b5620..14e23d7640 100644 --- a/nodepool/nl02.openstack.org.yaml +++ b/nodepool/nl02.openstack.org.yaml @@ -18,6 +18,7 @@ labels: - name: debian-stretch - name: fedora-28 - name: fedora-29 + - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-423 - name: opensuse-150 @@ -58,6 +59,8 @@ providers: config-drive: true - name: fedora-29 config-drive: true + - name: fedora-30 + config-drive: true - name: gentoo-17-0-systemd config-drive: true - name: opensuse-423 @@ -107,6 +110,11 @@ providers: 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' + diskimage: fedora-30 + key-name: infra-root-keys-2018-06-15 - name: gentoo-17-0-systemd min-ram: 8000 flavor-name: '8C-8GB-100GB' @@ -218,6 +226,11 @@ providers: 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' + diskimage: fedora-30 + key-name: infra-root-keys-2018-06-15 - name: gentoo-17-0-systemd min-ram: 8000 flavor-name: 'nodepool.0' @@ -295,6 +308,11 @@ providers: 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' + diskimage: fedora-30 + key-name: infra-root-keys-2018-06-15 - name: gentoo-17-0-systemd min-ram: 8000 flavor-name: '8cpu-8GBram-80GBdisk' @@ -403,6 +421,11 @@ providers: flavor-name: 'zuul-flavor' diskimage: fedora-29 key-name: infra-root-keys-2018-06-15 + - name: fedora-30 + min-ram: 8000 + flavor-name: 'zuul-flavor' + diskimage: fedora-30 + key-name: infra-root-keys-2018-06-15 - name: gentoo-17-0-systemd min-ram: 8000 flavor-name: 'zuul-flavor' @@ -450,6 +473,7 @@ diskimages: - name: debian-stretch - name: fedora-28 - name: fedora-29 + - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-423 - name: opensuse-150 diff --git a/nodepool/nl03.openstack.org.yaml b/nodepool/nl03.openstack.org.yaml index e719dd1330..b156c0ccf1 100644 --- a/nodepool/nl03.openstack.org.yaml +++ b/nodepool/nl03.openstack.org.yaml @@ -25,6 +25,7 @@ labels: min-ready: 1 - name: fedora-28 - name: fedora-29 + - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-423 - name: opensuse-150 @@ -45,6 +46,8 @@ labels: min-ready: 0 - name: fedora-29-vexxhost min-ready: 0 + - name: fedora-30-vexxhost + min-ready: 0 - name: centos-7-gpu min-ready: 0 - name: ubuntu-xenial-gpu @@ -70,6 +73,8 @@ providers: config-drive: true - name: fedora-29 config-drive: true + - name: fedora-30 + config-drive: true - name: opensuse-423 config-drive: true - name: gentoo-17-0-systemd @@ -115,6 +120,11 @@ providers: 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' + diskimage: fedora-30 + key-name: infra-root-keys-2018-06-15 - name: gentoo-17-0-systemd min-ram: 8000 flavor-name: 'A1.8' @@ -191,6 +201,11 @@ providers: 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' + diskimage: fedora-30 + key-name: infra-root-keys-2018-06-15 - name: gentoo-17-0-systemd min-ram: 8000 flavor-name: 'osf-highcpu-8' @@ -295,6 +310,13 @@ providers: 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 + boot-from-volume: true + volume-size: 80 + diskimage: fedora-30 + key-name: infra-root-keys-2018-06-15 - name: gentoo-17-0-systemd min-ram: 8000 flavor-name: v2-highcpu-8 @@ -368,6 +390,13 @@ providers: 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 + boot-from-volume: true + volume-size: 80 + diskimage: fedora-30 + key-name: infra-root-keys-2018-06-15 - name: ubuntu-bionic-vexxhost min-ram: 8000 flavor-name: v2-highcpu-8 @@ -471,6 +500,7 @@ diskimages: - name: debian-stretch-arm64 - name: fedora-28 - name: fedora-29 + - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-423 - name: opensuse-150 diff --git a/nodepool/nl04.openstack.org.yaml b/nodepool/nl04.openstack.org.yaml index 9687344200..13c85228c0 100644 --- a/nodepool/nl04.openstack.org.yaml +++ b/nodepool/nl04.openstack.org.yaml @@ -18,6 +18,7 @@ labels: - name: debian-stretch - name: fedora-28 - name: fedora-29 + - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-423 - name: opensuse-150 @@ -45,6 +46,8 @@ providers: config-drive: true - name: fedora-29 config-drive: true + - name: fedora-30 + config-drive: true - name: gentoo-17-0-systemd config-drive: true - name: opensuse-423 @@ -90,6 +93,11 @@ providers: 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 + diskimage: fedora-30 + key-name: infra-root-keys-2018-06-15 - name: gentoo-17-0-systemd min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -149,6 +157,7 @@ diskimages: - name: debian-stretch - name: fedora-28 - name: fedora-29 + - name: fedora-30 - name: gentoo-17-0-systemd - name: opensuse-423 - name: opensuse-150 diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index cbba759ea1..149da22388 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -45,6 +45,8 @@ providers: config-drive: true - name: fedora-29 config-drive: true + - name: fedora-30 + config-drive: true - name: gentoo-17-0-systemd config-drive: true - name: opensuse-423 @@ -243,6 +245,30 @@ diskimages: GIT_HTTP_LOW_SPEED_LIMIT: '1000' DIB_SIMPLE_INIT_NETWORKMANAGER: '1' DIB_SHOW_IMAGE_USAGE: '1' + - name: fedora-30 + pause: false + elements: + - fedora-minimal + - vm + - simple-init + - openstack-repos + - nodepool-base + - cache-devstack + - initialize-urandom + - growroot + - infra-package-needs + release: 30 + env-vars: + TMPDIR: /opt/dib_tmp + DIB_CHECKSUM: '1' + DIB_IMAGE_CACHE: /opt/dib_cache + DIB_JOURNAL_SIZE: '512' + QEMU_IMG_OPTIONS: compat=0.10 + DIB_GRUB_TIMEOUT: '0' + GIT_HTTP_LOW_SPEED_TIME: '300' + GIT_HTTP_LOW_SPEED_LIMIT: '1000' + DIB_SIMPLE_INIT_NETWORKMANAGER: '1' + DIB_SHOW_IMAGE_USAGE: '1' - name: gentoo-17-0-systemd pause: false elements: