diff --git a/grafana/afs.yaml b/grafana/afs.yaml index b3c57b5bab..6008392503 100644 --- a/grafana/afs.yaml +++ b/grafana/afs.yaml @@ -824,6 +824,22 @@ dashboard: refId: C hide: true + - title: Bullseye ARM64 + type: graph + span: 4 + yaxes: + - format: deckbytes + min: 0 + - format: deckbytes + min: 0 + targets: + - target: "alias(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_deb11a64.used, 'Used')" + refId: A + - target: "alias(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_deb11a64.quota, 'Quota')" + refId: B + - target: "divideSeries(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_deb11a64.used, #B)" + refId: C + hide: true - title: Buster ARM64 type: graph @@ -932,6 +948,22 @@ dashboard: refId: C hide: true + - title: Bullseye x86_64 + type: graph + span: 4 + yaxes: + - format: deckbytes + min: 0 + - format: deckbytes + min: 0 + targets: + - target: "alias(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_deb11x64.used, 'Used')" + refId: A + - target: "alias(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_deb11x64.quota, 'Quota')" + refId: B + - target: "divideSeries(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_deb11x64.used, #B)" + refId: C + hide: true - title: Buster x86_64 type: graph @@ -1004,6 +1036,14 @@ dashboard: format: dateTimeFromNow valueFontSize: "50%" + - title: Bullseye ARM64 + type: singlestat + valueName: current + span: 2 + targets: + - target: "scale(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_deb11a64_readonly.creation, 1000)" + format: dateTimeFromNow + valueFontSize: "50%" - title: Buster ARM64 type: singlestat @@ -1064,6 +1104,14 @@ dashboard: format: dateTimeFromNow valueFontSize: "50%" + - title: Bullseye x86_64 + type: singlestat + valueName: current + span: 2 + targets: + - target: "scale(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_deb11x64_readonly.creation, 1000)" + format: dateTimeFromNow + valueFontSize: "50%" - title: Buster x86_64 type: singlestat diff --git a/grafana/create-nodepool-dib.sh b/grafana/create-nodepool-dib.sh index e54853bb6d..ff6404697d 100755 --- a/grafana/create-nodepool-dib.sh +++ b/grafana/create-nodepool-dib.sh @@ -20,12 +20,14 @@ create "Ubuntu Xenial" "ubuntu-xenial" create "Centos 7" "centos-7" create "Centos 8" "centos-8" create "Fedora 32" "fedora-32" +create "Debian Bullseye" "debian-bullseye" create "Debian Buster" "debian-buster" create "Debian Stretch" "debian-stretch" 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 "Debian Bullseye arm64" "debian-bullseye-arm64" create "Debian Buster arm64" "debian-buster-arm64" create "Debian Stretch arm64" "debian-stretch-arm64" create "Ubuntu Focal arm64" "ubuntu-focal-arm64" diff --git a/nodepool/nb03.opendev.org.yaml b/nodepool/nb03.opendev.org.yaml index 5b8ffc7d58..4780164e03 100644 --- a/nodepool/nb03.opendev.org.yaml +++ b/nodepool/nb03.opendev.org.yaml @@ -41,6 +41,14 @@ providers: os_command_line: "console=ttyAMA0" hw_disk_bus: scsi hw_scsi_model: virtio-scsi + - name: debian-bullseye-arm64 + pause: false + config-drive: true + meta: + hw_firmware_type: uefi + os_command_line: "console=ttyAMA0" + hw_disk_bus: scsi + hw_scsi_model: virtio-scsi - name: debian-buster-arm64 pause: false config-drive: true @@ -141,6 +149,14 @@ diskimages: DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.linaro-us.opendev.org/ubuntu-ports' DIB_DEBIAN_COMPONENTS: 'main,universe' + - name: debian-bullseye-arm64 + parent: base-debuntu + elements: + - debian-minimal + release: bullseye + env-vars: + DIB_DISTRIBUTION_MIRROR: 'https://mirror.regionone.linaro-us.opendev.org/debian' + - name: debian-buster-arm64 parent: base-debuntu elements: diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml index 4ee6f52f08..12e07e91bd 100644 --- a/nodepool/nl01.opendev.org.yaml +++ b/nodepool/nl01.opendev.org.yaml @@ -21,6 +21,8 @@ labels: min-ready: 1 - name: centos-8-stream min-ready: 1 + - name: debian-bullseye + min-ready: 1 - name: debian-buster min-ready: 1 - name: debian-stretch @@ -55,6 +57,8 @@ providers: config-drive: true - name: centos-8-stream config-drive: true + - name: debian-bullseye + config-drive: true - name: debian-buster config-drive: true - name: debian-stretch @@ -92,6 +96,11 @@ providers: flavor-name: 'Performance' diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: debian-bullseye + min-ram: 8000 + flavor-name: 'Performance' + diskimage: debian-bullseye + key-name: infra-root-keys-2020-05-13 - name: debian-buster min-ram: 8000 flavor-name: 'Performance' @@ -166,6 +175,7 @@ diskimages: - name: centos-7 - name: centos-8 - name: centos-8-stream + - name: debian-bullseye - name: debian-buster - name: debian-stretch - name: fedora-32 diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml index 6588c5ad1e..adb0d3508f 100644 --- a/nodepool/nl02.opendev.org.yaml +++ b/nodepool/nl02.opendev.org.yaml @@ -18,6 +18,7 @@ labels: - name: centos-7 - name: centos-8 - name: centos-8-stream + - name: debian-bullseye - name: debian-buster - name: debian-stretch - name: fedora-32 @@ -67,6 +68,8 @@ providers: config-drive: true - name: centos-8-stream config-drive: true + - name: debian-bullseye + config-drive: true - name: debian-buster config-drive: true - name: debian-stretch @@ -104,6 +107,11 @@ providers: flavor-name: 'nodepool.0' diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: debian-bullseye + min-ram: 8000 + flavor-name: 'nodepool.0' + diskimage: debian-bullseye + key-name: infra-root-keys-2020-05-13 - name: debian-buster min-ram: 8000 flavor-name: 'nodepool.0' @@ -208,6 +216,11 @@ providers: flavor-name: '8C-8GB-100GB' diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: debian-bullseye + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: debian-bullseye + key-name: infra-root-keys-2020-05-13 - name: debian-buster min-ram: 8000 flavor-name: '8C-8GB-100GB' @@ -275,6 +288,7 @@ diskimages: - name: centos-7 - name: centos-8 - name: centos-8-stream + - name: debian-bullseye - name: debian-buster - name: debian-stretch - name: fedora-32 diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml index 6f4849af3b..413108b238 100644 --- a/nodepool/nl03.opendev.org.yaml +++ b/nodepool/nl03.opendev.org.yaml @@ -27,6 +27,9 @@ labels: - name: centos-8-stream - name: centos-8-stream-arm64 min-ready: 0 + - name: debian-bullseye + - name: debian-bullseye-arm64 + min-ready: 0 - name: debian-buster - name: debian-buster-arm64 min-ready: 0 @@ -87,6 +90,8 @@ providers: config-drive: true - name: centos-8-stream config-drive: true + - name: debian-bullseye + config-drive: true - name: debian-buster config-drive: true - name: debian-stretch @@ -124,6 +129,11 @@ providers: flavor-name: 'A1.8' diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: debian-bullseye + min-ram: 8000 + flavor-name: 'A1.8' + diskimage: debian-bullseye + key-name: infra-root-keys-2020-05-13 - name: debian-buster min-ram: 8000 flavor-name: 'A1.8' @@ -195,6 +205,11 @@ providers: flavor-name: 'v3-standard-8' diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: debian-bullseye + min-ram: 8000 + flavor-name: 'v3-standard-8' + diskimage: debian-bullseye + key-name: infra-root-keys-2020-05-13 - name: debian-buster min-ram: 8000 flavor-name: 'v3-standard-8' @@ -316,6 +331,13 @@ providers: volume-size: 80 diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: debian-bullseye + min-ram: 8000 + flavor-name: v2-highcpu-8 + boot-from-volume: true + volume-size: 80 + diskimage: debian-bullseye + key-name: infra-root-keys-2020-05-13 - name: debian-buster min-ram: 8000 flavor-name: v2-highcpu-8 @@ -426,6 +448,8 @@ providers: config-drive: true - name: centos-8-stream-arm64 config-drive: true + - name: debian-bullseye-arm64 + config-drive: true - name: debian-buster-arm64 config-drive: true - name: debian-stretch-arm64 @@ -455,6 +479,11 @@ providers: flavor-name: 'm1.xxlarge' diskimage: centos-8-arm64 key-name: infra-root-keys-2020-05-13 + - name: debian-bullseye-arm64 + min-ram: 8000 + flavor-name: 'os.large' + diskimage: debian-bullseye-arm64 + key-name: infra-root-keys-2020-05-13 - name: debian-buster-arm64 min-ram: 8000 flavor-name: 'os.large' @@ -507,6 +536,8 @@ providers: config-drive: true - name: centos-8-stream-arm64 config-drive: true + - name: debian-bullseye-arm64 + config-drive: true - name: debian-buster-arm64 config-drive: true - name: debian-stretch-arm64 @@ -531,6 +562,11 @@ providers: flavor-name: 'opendev.large' diskimage: centos-8-stream-arm64 key-name: infra-root-keys-2020-05-13 + - name: debian-bullseye-arm64 + min-ram: 8000 + flavor-name: 'os.large' + diskimage: debian-bullseye-arm64 + key-name: infra-root-keys-2020-05-13 - name: debian-buster-arm64 min-ram: 8000 flavor-name: 'opendev.large' @@ -563,6 +599,8 @@ diskimages: - name: centos-8-arm64 - name: centos-8-stream - name: centos-8-stream-arm64 + - name: debian-bullseye + - name: debian-bullseye-arm64 - name: debian-buster - name: debian-buster-arm64 - name: debian-stretch diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml index f5883151f7..421dd1d233 100644 --- a/nodepool/nl04.opendev.org.yaml +++ b/nodepool/nl04.opendev.org.yaml @@ -18,6 +18,7 @@ labels: - name: centos-7 - name: centos-8 - name: centos-8-stream + - name: debian-bullseye - name: debian-buster - name: debian-stretch - name: fedora-32 @@ -52,6 +53,8 @@ providers: config-drive: true - name: centos-8-stream config-drive: true + - name: debian-bullseye + config-drive: true - name: debian-buster config-drive: true - name: debian-stretch @@ -89,6 +92,11 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: debian-bullseye + min-ram: 8000 + flavor-name: ssd-osFoundation-3 + diskimage: debian-bullseye + key-name: infra-root-keys-2020-05-13 - name: debian-buster min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -176,6 +184,7 @@ diskimages: - name: centos-7 - name: centos-8 - name: centos-8-stream + - name: debian-bullseye - name: debian-buster - name: debian-stretch - name: fedora-32 diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 1b07c8d11c..912375e49b 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -23,6 +23,8 @@ providers: config-drive: true - name: centos-8-stream config-drive: true + - name: debian-bullseye + config-drive: true - name: debian-buster config-drive: true - name: debian-stretch @@ -220,6 +222,39 @@ diskimages: fsck-passno: 1 + - name: debian-bullseye + parent: base-debuntu + pause: false + elements: + - debian-minimal + - cache-devstack + release: bullseye + env-vars: + DIB_DISTRIBUTION_MIRROR: 'https://mirror.dfw.rax.opendev.org/debian' + DIB_DEBIAN_SECURITY_MIRROR: + 'https://mirror.dfw.rax.opendev.org/debian-security' + DIB_DEBIAN_SECURITY_SUBPATH: '' + DIB_BLOCK_DEVICE_CONFIG: | + # Default single partition loopback + + - local_loop: + name: image0 + + - partitioning: + base: image0 + label: mbr + partitions: + - name: root + flags: [ boot, primary ] + size: 100% + mkfs: + mount: + mount_point: / + fstab: + options: "defaults,nobarrier,noatime" + fsck-passno: 1 + + ############ Gentoo ############# - name: gentoo-17-0-systemd diff --git a/playbooks/wheel/release.yaml b/playbooks/wheel/release.yaml index 0089a90d9d..049eaf2209 100644 --- a/playbooks/wheel/release.yaml +++ b/playbooks/wheel/release.yaml @@ -16,6 +16,10 @@ afs_volume: mirror.wheel.busterx64 - role: release-afs-volume afs_volume: mirror.wheel.bustera64 + - role: release-afs-volume + afs_volume: mirror.wheel.deb11x64 + - role: release-afs-volume + afs_volume: mirror.wheel.deb11a64 # Ubuntu - role: release-afs-volume