Remove Xenial ARM64 nodes

Wheel jobs were removed with Ia44c384072c0482cfd11c642013fd51004f85c8b. There are now no more job references for these nodes, so this now removes them from nodepool. Change-Id: I5dc4f42629661da984cc197a11e3383cddc4ff54
2021-05-06 12:15:12 +10:00 · 2021-05-06 12:15:12 +10:00 · 8a8c39996c
commit 8a8c39996c
parent 808d35046e
4 changed files with 106 additions and 88 deletions
--- a/grafana/create-nodepool-dib.sh
+++ b/grafana/create-nodepool-dib.sh
@ -32,5 +32,4 @@ create "Debian Buster arm64" "debian-buster-arm64"
 create "Debian Stretch arm64" "debian-stretch-arm64"
 create "Ubuntu Focal arm64" "ubuntu-focal-arm64"
 create "Ubuntu Bionic arm64" "ubuntu-bionic-arm64"
-create "Ubuntu Xenial arm64" "ubuntu-xenial-arm64"

--- a/grafana/nodepool-dib.yaml
+++ b/grafana/nodepool-dib.yaml
@ -279,6 +279,58 @@ dashboard:
          targets:
            - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.fedora-32.status.duration.mean, 'None'), "Time")
              refId: A
+# AUTOGENERATED : Debian Bullseye
+
+    - title: Debian Bullseye
+      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-bullseye.status.rc"
+          valueFontSize: "50%"
+
+        - title: Last build
+          type: singlestat
+          span: 2
+          format: dateTimeFromNow
+          targets:
+            - target: "stats.gauges.nodepool.dib_image_build.debian-bullseye.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.debian-bullseye.*.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-bullseye.status.duration.mean, 'None'), "Time")
+              refId: A
 # AUTOGENERATED : Debian Buster

    - title: Debian Buster
@ -591,6 +643,58 @@ dashboard:
          targets:
            - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.centos-8-arm64.status.duration.mean, 'None'), "Time")
              refId: A
+# AUTOGENERATED : Debian Bullseye arm64
+
+    - title: Debian Bullseye arm64
+      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-bullseye-arm64.status.rc"
+          valueFontSize: "50%"
+
+        - title: Last build
+          type: singlestat
+          span: 2
+          format: dateTimeFromNow
+          targets:
+            - target: "stats.gauges.nodepool.dib_image_build.debian-bullseye-arm64.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.debian-bullseye-arm64.*.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-bullseye-arm64.status.duration.mean, 'None'), "Time")
+              refId: A
 # AUTOGENERATED : Debian Buster arm64

    - title: Debian Buster arm64
@ -799,55 +903,3 @@ dashboard:
          targets:
            - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.ubuntu-bionic-arm64.status.duration.mean, 'None'), "Time")
              refId: A
-# AUTOGENERATED : Ubuntu Xenial arm64
-
-    - title: Ubuntu Xenial arm64
-      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-xenial-arm64.status.rc"
-          valueFontSize: "50%"
-
-        - title: Last build
-          type: singlestat
-          span: 2
-          format: dateTimeFromNow
-          targets:
-            - target: "stats.gauges.nodepool.dib_image_build.ubuntu-xenial-arm64.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.ubuntu-xenial-arm64.*.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-xenial-arm64.status.duration.mean, 'None'), "Time")
-              refId: A
--- a/nodepool/nb03.opendev.org.yaml
+++ b/nodepool/nb03.opendev.org.yaml
@ -17,14 +17,6 @@ providers:
    cloud: linaro-us
    rate: 0.25
    diskimages: &arm64_diskimages
-      - name: ubuntu-xenial-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: ubuntu-bionic-arm64
        pause: false
        config-drive: true
@ -122,15 +114,6 @@ diskimages:
      DIB_DISABLE_APT_CLEANUP: '1'
      DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'

-  - name: ubuntu-xenial-arm64
-    parent: base-debuntu
-    elements:
-      - ubuntu-minimal
-    release: xenial
-    env-vars:
-      DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.linaro-us.opendev.org/ubuntu-ports'
-      DIB_DEBIAN_COMPONENTS: 'main,universe'
-
  - name: ubuntu-bionic-arm64
    parent: base-debuntu
    elements:
--- a/nodepool/nl03.opendev.org.yaml
+++ b/nodepool/nl03.opendev.org.yaml
@ -16,7 +16,7 @@ zookeeper-servers:
 # another launcher will need to assume this logic.
 #
 # Note this doesn't apply for labels that are only provided by this launcher;
-# ubuntu-xenial-arm64 being one of them.
+# e.g. *-arm64
 labels:
  - name: centos-7
  - name: centos-8
@ -43,8 +43,6 @@ labels:
  - name: ubuntu-bionic
  - name: ubuntu-focal
  - name: ubuntu-xenial
-  - name: ubuntu-xenial-arm64
-    min-ready: 0
  - name: ubuntu-focal-arm64
    min-ready: 0
  - name: ubuntu-focal-arm64-xxxlarge
@ -454,8 +452,6 @@ providers:
        config-drive: true
      - name: debian-stretch-arm64
        config-drive: true
-      - name: ubuntu-xenial-arm64
-        config-drive: true
      - name: ubuntu-bionic-arm64
        config-drive: true
      - name: ubuntu-focal-arm64
@ -494,11 +490,6 @@ providers:
            flavor-name: 'os.large'
            diskimage: debian-stretch-arm64
            key-name: infra-root-keys-2020-05-13
-          - name: ubuntu-xenial-arm64
-            min-ram: 8000
-            flavor-name: 'os.large'
-            diskimage: ubuntu-xenial-arm64
-            key-name: infra-root-keys-2020-05-13
          - name: ubuntu-bionic-arm64
            min-ram: 8000
            flavor-name: 'os.large'
@ -542,8 +533,6 @@ providers:
        config-drive: true
      - name: debian-stretch-arm64
        config-drive: true
-      - name: ubuntu-xenial-arm64
-        config-drive: true
      - name: ubuntu-bionic-arm64
        config-drive: true
      - name: ubuntu-focal-arm64
@ -577,11 +566,6 @@ providers:
            flavor-name: 'opendev.large'
            diskimage: debian-stretch-arm64
            key-name: infra-root-keys-2020-05-13
-          - name: ubuntu-xenial-arm64
-            min-ram: 8000
-            flavor-name: 'opendev.large'
-            diskimage: ubuntu-xenial-arm64
-            key-name: infra-root-keys-2020-05-13
          - name: ubuntu-bionic-arm64
            min-ram: 8000
            flavor-name: 'opendev.large'
@ -614,4 +598,4 @@ diskimages:
  - name: ubuntu-focal
  - name: ubuntu-focal-arm64
  - name: ubuntu-xenial
-  - name: ubuntu-xenial-arm64
+