diff --git a/grafana/create-nodepool-dib.sh b/grafana/create-nodepool-dib.sh index e5ec8b8be3..820f5676a3 100755 --- a/grafana/create-nodepool-dib.sh +++ b/grafana/create-nodepool-dib.sh @@ -15,6 +15,7 @@ function create { } cp nodepool-dib.base.template nodepool-dib.yaml +create "Ubuntu Jammy" "ubuntu-jammy" create "Ubuntu Focal" "ubuntu-focal" create "Ubuntu Bionic" "ubuntu-bionic" create "Ubuntu Xenial" "ubuntu-xenial" diff --git a/grafana/nodepool-dib.yaml b/grafana/nodepool-dib.yaml index 4cc11f3bd8..ca9dba22f8 100644 --- a/grafana/nodepool-dib.yaml +++ b/grafana/nodepool-dib.yaml @@ -19,6 +19,59 @@ dashboard: If you would like to make changes to this dashboard, please see the grafana directory in [project-config](https://opendev.org/openstack/project-config/src/branch/master/grafana/afs.yaml). type: text +# AUTOGENERATED : Ubuntu Jammy + + - title: Ubuntu Jammy + 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.ubuntu-jammy.status.rc" + valueFontSize: "50%" + + - title: Last build + type: singlestat + valueName: current + span: 2 + format: dateTimeFromNow + targets: + - target: "scale(stats.gauges.nodepool.dib_image_build.ubuntu-jammy.status.last_build, 1000)" + 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.ubuntu-jammy.*.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.ubuntu-jammy.status.duration.mean), "Time") + refId: A # AUTOGENERATED : Ubuntu Focal - title: Ubuntu Focal diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml index d6fbbc1ff3..91468b1d3e 100644 --- a/nodepool/nl01.opendev.org.yaml +++ b/nodepool/nl01.opendev.org.yaml @@ -38,6 +38,8 @@ labels: min-ready: 10 - name: ubuntu-focal min-ready: 1 + - name: ubuntu-jammy + min-ready: 1 - name: ubuntu-xenial min-ready: 1 - name: openEuler-20-03-LTS-SP2 @@ -73,6 +75,8 @@ providers: config-drive: true - name: ubuntu-focal config-drive: true + - name: ubuntu-jammy + config-drive: true - name: ubuntu-xenial config-drive: true - name: openEuler-20-03-LTS-SP2 @@ -136,6 +140,11 @@ providers: flavor-name: 'Performance' diskimage: ubuntu-focal key-name: infra-root-keys-2020-05-13 + - name: ubuntu-jammy + min-ram: 8192 + flavor-name: 'Performance' + diskimage: ubuntu-jammy + key-name: infra-root-keys-2020-05-13 - name: ubuntu-xenial min-ram: 8192 flavor-name: 'Performance' @@ -183,5 +192,6 @@ diskimages: - name: rockylinux-8 - name: ubuntu-bionic - name: ubuntu-focal + - name: ubuntu-jammy - name: ubuntu-xenial - name: openEuler-20-03-LTS-SP2 diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml index 71447d32f0..e0926ebf7b 100644 --- a/nodepool/nl02.opendev.org.yaml +++ b/nodepool/nl02.opendev.org.yaml @@ -27,6 +27,7 @@ labels: - name: ubuntu-bionic - name: ubuntu-bionic-limestone-debug - name: ubuntu-focal + - name: ubuntu-jammy - name: ubuntu-xenial - name: centos-7-expanded min-ready: 0 @@ -83,6 +84,8 @@ providers: config-drive: true - name: ubuntu-focal config-drive: true + - name: ubuntu-jammy + config-drive: true - name: ubuntu-xenial config-drive: true pools: @@ -149,6 +152,11 @@ providers: flavor-name: 'nodepool.0' diskimage: ubuntu-focal key-name: infra-root-keys-2020-05-13 + - name: ubuntu-jammy + min-ram: 8000 + flavor-name: 'nodepool.0' + diskimage: ubuntu-jammy + key-name: infra-root-keys-2020-05-13 - name: ubuntu-xenial min-ram: 8000 flavor-name: 'nodepool.0' @@ -246,6 +254,11 @@ providers: flavor-name: 'opendev-zuul' diskimage: ubuntu-focal key-name: infra-root-keys-2020-05-13 + - name: ubuntu-jammy + min-ram: 8000 + flavor-name: 'opendev-zuul' + diskimage: ubuntu-jammy + key-name: infra-root-keys-2020-05-13 - name: ubuntu-xenial min-ram: 8000 flavor-name: 'opendev-zuul' @@ -264,4 +277,5 @@ diskimages: - name: rockylinux-8 - name: ubuntu-bionic - name: ubuntu-focal + - name: ubuntu-jammy - name: ubuntu-xenial diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml index 39a3294aec..c2bfc073e6 100644 --- a/nodepool/nl03.opendev.org.yaml +++ b/nodepool/nl03.opendev.org.yaml @@ -36,6 +36,7 @@ labels: - name: rockylinux-8 - name: ubuntu-bionic - name: ubuntu-focal + - name: ubuntu-jammy - name: ubuntu-xenial - name: ubuntu-focal-arm64 min-ready: 0 @@ -102,6 +103,8 @@ providers: config-drive: true - name: ubuntu-focal config-drive: true + - name: ubuntu-jammy + config-drive: true - name: ubuntu-xenial config-drive: true pools: @@ -163,6 +166,11 @@ providers: flavor-name: 'A1.8' diskimage: ubuntu-focal key-name: infra-root-keys-2020-05-13 + - name: ubuntu-jammy + min-ram: 8000 + flavor-name: 'A1.8' + diskimage: ubuntu-jammy + key-name: infra-root-keys-2020-05-13 - name: ubuntu-xenial min-ram: 8000 flavor-name: 'A1.8' @@ -308,6 +316,13 @@ providers: volume-size: 80 diskimage: ubuntu-focal key-name: infra-root-keys-2020-05-13 + - name: ubuntu-jammy + min-ram: 8000 + flavor-name: v2-highcpu-8 + boot-from-volume: true + volume-size: 80 + diskimage: ubuntu-jammy + key-name: infra-root-keys-2020-05-13 - name: ubuntu-xenial min-ram: 8000 flavor-name: v2-highcpu-8 @@ -499,6 +514,7 @@ diskimages: - name: ubuntu-bionic-arm64 - name: ubuntu-focal - name: ubuntu-focal-arm64 + - name: ubuntu-jammy - name: ubuntu-xenial - name: openEuler-20-03-LTS-SP2-arm64 diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml index 9416e2bd7c..dba76c9ee7 100644 --- a/nodepool/nl04.opendev.org.yaml +++ b/nodepool/nl04.opendev.org.yaml @@ -25,6 +25,7 @@ labels: - name: opensuse-15 - name: ubuntu-bionic - name: ubuntu-focal + - name: ubuntu-jammy - name: ubuntu-xenial - name: nested-virt-ubuntu-bionic min-ready: 0 @@ -65,6 +66,8 @@ providers: config-drive: true - name: ubuntu-focal config-drive: true + - name: ubuntu-jammy + config-drive: true - name: ubuntu-xenial config-drive: true pools: @@ -121,6 +124,11 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: ubuntu-focal key-name: infra-root-keys-2020-05-13 + - name: ubuntu-jammy + min-ram: 8000 + flavor-name: ssd-osFoundation-3 + diskimage: ubuntu-jammy + key-name: infra-root-keys-2020-05-13 - name: ubuntu-xenial min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -175,4 +183,5 @@ diskimages: - name: opensuse-15 - name: ubuntu-bionic - name: ubuntu-focal + - name: ubuntu-jammy - name: ubuntu-xenial