Merge "Add openSUSE 15.1 to the nodepool building as opensuse-15"

2019-06-18 12:58:28 +00:00 · 2019-06-18 12:58:28 +00:00 · a7f112ebd0
parent 653047fc30 eb81a56ac1
commit a7f112ebd0
7 changed files with 130 additions and 1 deletions
--- a/grafana/create-nodepool-dib.sh
+++ b/grafana/create-nodepool-dib.sh
@ -24,6 +24,7 @@ create "Debian Buster" "debian-buster"
 create "Debian Stretch" "debian-stretch"
 create "Gentoo" "gentoo-17-0-systemd"
 create "openSUSE 15.0" "opensuse-150"
+create "openSUSE 15" "opensuse-15"
 create "openSUSE 42.3" "opensuse-423"
 create "Ubuntu Bionic arm64" "ubuntu-bionic-arm64"
 create "Ubuntu Xenial arm64" "ubuntu-xenial-arm64"
--- a/grafana/nodepool-dib.yaml
+++ b/grafana/nodepool-dib.yaml
@ -16,7 +16,7 @@ dashboard:
          content: |
            **This dashboard is managed by [Grafyaml](http://docs.openstack.org/infra/system-config/grafyaml.html).**

-            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/grafana/afs.yaml).
+            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 Bionic
@ -371,6 +371,50 @@ dashboard:
          targets:
            - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.opensuse-150.qcow2.duration.mean, 'None'), "Time")
              refId: A
+# AUTOGENERATED : openSUSE 15
+
+    - title: openSUSE 15
+      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.opensuse-15.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.opensuse-15.*.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.opensuse-15.qcow2.duration.mean, 'None'), "Time")
+              refId: A
 # AUTOGENERATED : openSUSE 42.3

    - title: openSUSE 42.3
--- a/nodepool/nl01.openstack.org.yaml
+++ b/nodepool/nl01.openstack.org.yaml
@ -29,6 +29,8 @@ labels:
    min-ready: 1
  - name: opensuse-150
    min-ready: 1
+  - name: opensuse-15
+    min-ready: 1
  - name: opensuse-tumbleweed
    min-ready: 1
  - name: ubuntu-bionic
@ -62,6 +64,8 @@ providers:
        config-drive: true
      - name: opensuse-150
        config-drive: true
+      - name: opensuse-15
+        config-drive: true
      - name: opensuse-tumbleweed
        config-drive: true
      - name: ubuntu-bionic
@ -114,6 +118,11 @@ providers:
            flavor-name: 'Performance'
            diskimage: opensuse-150
            key-name: infra-root-keys-2018-06-15
+          - name: opensuse-15
+            min-ram: 8000
+            flavor-name: 'Performance'
+            diskimage: opensuse-15
+            key-name: infra-root-keys-2018-06-15
          - name: opensuse-tumbleweed
            min-ram: 8000
            flavor-name: 'Performance'
@ -169,6 +178,7 @@ diskimages:
  - name: gentoo-17-0-systemd
  - name: opensuse-423
  - name: opensuse-150
+  - name: opensuse-15
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
  - name: ubuntu-trusty
--- a/nodepool/nl02.openstack.org.yaml
+++ b/nodepool/nl02.openstack.org.yaml
@ -21,6 +21,7 @@ labels:
  - name: gentoo-17-0-systemd
  - name: opensuse-423
  - name: opensuse-150
+  - name: opensuse-15
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
  - name: ubuntu-trusty
@ -51,6 +52,8 @@ providers:
        config-drive: true
      - name: opensuse-150
        config-drive: true
+      - name: opensuse-15
+        config-drive: true
      - name: opensuse-tumbleweed
        config-drive: true
      - name: ubuntu-bionic
@ -107,6 +110,11 @@ providers:
            flavor-name: '8C-8GB-100GB'
            diskimage: opensuse-150
            key-name: infra-root-keys-2018-06-15
+          - name: opensuse-15
+            min-ram: 8000
+            flavor-name: '8C-8GB-100GB'
+            diskimage: opensuse-15
+            key-name: infra-root-keys-2018-06-15
          - name: opensuse-tumbleweed
            min-ram: 8000
            flavor-name: '8C-8GB-100GB'
@ -213,6 +221,11 @@ providers:
            flavor-name: 'nodepool.0'
            diskimage: opensuse-150
            key-name: infra-root-keys-2018-06-15
+          - name: opensuse-15
+            min-ram: 8000
+            flavor-name: 'nodepool.0'
+            diskimage: opensuse-15
+            key-name: infra-root-keys-2018-06-15
          - name: opensuse-tumbleweed
            min-ram: 8000
            flavor-name: 'nodepool.0'
@ -286,6 +299,11 @@ providers:
            flavor-name: 'zuul-flavor'
            diskimage: opensuse-150
            key-name: infra-root-keys-2018-06-15
+          - name: opensuse-15
+            min-ram: 8000
+            flavor-name: 'zuul-flavor'
+            diskimage: opensuse-15
+            key-name: infra-root-keys-2018-06-15
          - name: opensuse-tumbleweed
            min-ram: 8000
            flavor-name: 'zuul-flavor'
@ -316,6 +334,7 @@ diskimages:
  - name: gentoo-17-0-systemd
  - name: opensuse-423
  - name: opensuse-150
+  - name: opensuse-15
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
  - name: ubuntu-trusty
--- a/nodepool/nl03.openstack.org.yaml
+++ b/nodepool/nl03.openstack.org.yaml
@ -28,6 +28,7 @@ labels:
  - name: gentoo-17-0-systemd
  - name: opensuse-423
  - name: opensuse-150
+  - name: opensuse-15
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
  - name: ubuntu-trusty
@ -75,6 +76,8 @@ providers:
        config-drive: true
      - name: opensuse-150
        config-drive: true
+      - name: opensuse-15
+        config-drive: true
      - name: opensuse-tumbleweed
        config-drive: true
      - name: ubuntu-bionic
@ -127,6 +130,11 @@ providers:
            flavor-name: 'A1.8'
            diskimage: opensuse-150
            key-name: infra-root-keys-2018-06-15
+          - name: opensuse-15
+            min-ram: 8000
+            flavor-name: 'A1.8'
+            diskimage: opensuse-15
+            key-name: infra-root-keys-2018-06-15
          - name: opensuse-tumbleweed
            min-ram: 8000
            flavor-name: 'A1.8'
@ -198,6 +206,11 @@ providers:
            flavor-name: 'osf-highcpu-8'
            diskimage: opensuse-150
            key-name: infra-root-keys-2018-06-15
+          - name: opensuse-15
+            min-ram: 8000
+            flavor-name: 'osf-highcpu-8'
+            diskimage: opensuse-15
+            key-name: infra-root-keys-2018-06-15
          - name: opensuse-tumbleweed
            min-ram: 8000
            flavor-name: 'osf-highcpu-8'
@ -303,6 +316,13 @@ providers:
            volume-size: 80
            diskimage: opensuse-150
            key-name: infra-root-keys-2018-06-15
+          - name: opensuse-15
+            min-ram: 8000
+            flavor-name: v2-highcpu-8
+            boot-from-volume: true
+            volume-size: 80
+            diskimage: opensuse-15
+            key-name: infra-root-keys-2018-06-15
          - name: opensuse-tumbleweed
            min-ram: 8000
            flavor-name: v2-highcpu-8
@ -454,6 +474,7 @@ diskimages:
  - name: gentoo-17-0-systemd
  - name: opensuse-423
  - name: opensuse-150
+  - name: opensuse-15
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
  - name: ubuntu-bionic-arm64
--- a/nodepool/nl04.openstack.org.yaml
+++ b/nodepool/nl04.openstack.org.yaml
@ -21,6 +21,7 @@ labels:
  - name: gentoo-17-0-systemd
  - name: opensuse-423
  - name: opensuse-150
+  - name: opensuse-15
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
  - name: ubuntu-trusty
@ -50,6 +51,8 @@ providers:
        config-drive: true
      - name: opensuse-150
        config-drive: true
+      - name: opensuse-15
+        config-drive: true
      - name: opensuse-tumbleweed
        config-drive: true
      - name: ubuntu-bionic
@ -102,6 +105,11 @@ providers:
            flavor-name: ssd-osFoundation-3
            diskimage: opensuse-150
            key-name: infra-root-keys-2018-06-15
+          - name: opensuse-15
+            min-ram: 8000
+            flavor-name: ssd-osFoundation-3
+            diskimage: opensuse-15
+            key-name: infra-root-keys-2018-06-15
          - name: opensuse-tumbleweed
            min-ram: 8000
            flavor-name: ssd-osFoundation-3
@ -144,6 +152,7 @@ diskimages:
  - name: gentoo-17-0-systemd
  - name: opensuse-423
  - name: opensuse-150
+  - name: opensuse-15
  - name: opensuse-tumbleweed
  - name: ubuntu-bionic
  - name: ubuntu-trusty
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@ -51,6 +51,8 @@ providers:
        config-drive: true
      - name: opensuse-150
        config-drive: true
+      - name: opensuse-15
+        config-drive: true
      - name: opensuse-tumbleweed
        config-drive: true
      - name: ubuntu-bionic
@ -316,6 +318,29 @@ diskimages:
      GIT_HTTP_LOW_SPEED_TIME: '300'
      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
      DIB_SHOW_IMAGE_USAGE: '1'
+  - name: opensuse-15
+    pause: false
+    elements:
+      - opensuse-minimal
+      - vm
+      - simple-init
+      - openstack-repos
+      - nodepool-base
+      - cache-devstack
+      - growroot
+      - infra-package-needs
+    release: '15.1'
+    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'
+      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/opensuse'
+      GIT_HTTP_LOW_SPEED_TIME: '300'
+      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
+      DIB_SHOW_IMAGE_USAGE: '1'
  - name: opensuse-tumbleweed
    pause: false
    elements: