From 97444ad92edd1103e76bca65ceb7e40b23344abc Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Wed, 26 Jun 2019 09:50:44 +0200
Subject: [PATCH] Enable nodepool testing for opensuse 15.1

There are several jobs depending on working opensuse 15.1
images in nodepool, so it makes sense to ensure its working.
Also upgrade the previously marked experimental opensuse-15.0
job as it tests the xenial->opensuse combination, which is
particularly difficult to keep working and we'll need it in
the CI.

Change-Id: Icb6d998756ce5221e017959dcb59b21f0f023454
---
 .zuul.d/jobs.yaml                             | 19 ++++++++++++++++++-
 .zuul.d/project.yaml                          |  5 ++++-
 .../elements/simple-init/pkg-map              |  3 ++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index 990e251d..08594ee8 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -325,7 +325,7 @@
 - job:
     name: dib-nodepool-functional-openstack-opensuse-150-src
     description: |
-      Test building and booting an openSUSE 15 image with Nodepool
+      Test building and booting an openSUSE 15.0 image with Nodepool
       and OpenStack
     parent: nodepool-functional-openstack-src-base
     nodeset: ubuntu-xenial  # Bionic lacks zypper
@@ -336,6 +336,23 @@
       nodepool_diskimage:
         base_element: opensuse-minimal
         release: '15.0'
+        mirror: "http://{{ zuul_site_mirror_fqdn }}/opensuse"
+
+- job:
+    name: dib-nodepool-functional-openstack-opensuse-151-src
+    description: |
+      Test building and booting an openSUSE 15.1 image with Nodepool
+      and OpenStack
+    parent: nodepool-functional-openstack-src-base
+    nodeset: ubuntu-xenial  # Bionic lacks zypper
+    vars:
+      nodepool_extra_packages:
+        - zypper
+        - gnupg2
+      nodepool_diskimage:
+        base_element: opensuse-minimal
+        release: '15.1'
+        mirror: "http://{{ zuul_site_mirror_fqdn }}/opensuse"
 
 - job:
     name: dib-nodepool-functional-openstack-opensuse-tumbleweed-src
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index cbf30add..3824006f 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -12,6 +12,8 @@
         - openstack-tox-pylint
         - dib-nodepool-functional-openstack-centos-7-src
         - dib-nodepool-functional-openstack-fedora-29-src
+        - dib-nodepool-functional-openstack-opensuse-150-src
+        - dib-nodepool-functional-openstack-opensuse-151-src
         - dib-nodepool-functional-openstack-ubuntu-trusty-src
         - dib-nodepool-functional-openstack-ubuntu-xenial-src
         - dib-nodepool-functional-openstack-ubuntu-bionic-src
@@ -34,6 +36,8 @@
         - openstack-tox-pylint
         - dib-nodepool-functional-openstack-centos-7-src
         - dib-nodepool-functional-openstack-fedora-29-src
+        - dib-nodepool-functional-openstack-opensuse-150-src
+        - dib-nodepool-functional-openstack-opensuse-151-src
         - dib-nodepool-functional-openstack-ubuntu-trusty-src
         - dib-nodepool-functional-openstack-ubuntu-xenial-src
         - dib-nodepool-functional-openstack-ubuntu-bionic-src
@@ -45,7 +49,6 @@
         - dib-nodepool-functional-openstack-gentoo-src
         - dib-nodepool-functional-openstack-debian-stretch-src
         - dib-nodepool-functional-openstack-debian-buster-src
-        - dib-nodepool-functional-openstack-opensuse-150-src
         - dib-nodepool-functional-openstack-opensuse-tumbleweed-src
         - octavia-v1-dsvm-scenario
         - octavia-v1-dsvm-py3x-scenario
diff --git a/diskimage_builder/elements/simple-init/pkg-map b/diskimage_builder/elements/simple-init/pkg-map
index b42f33c4..8298d22c 100644
--- a/diskimage_builder/elements/simple-init/pkg-map
+++ b/diskimage_builder/elements/simple-init/pkg-map
@@ -14,7 +14,8 @@
       "net-tools": "sys-apps/net-tools"
     },
     "suse": {
-      "dhcp-client": "dhcp-client"
+      "dhcp-client": "dhcp-client",
+      "network-scripts": "wicked-service"
     }
   },
   "release": {