From a5a6482ac1253bfb5a464caa11409efe93e924f7 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 15 Aug 2019 16:00:40 +1000
Subject: [PATCH] Fedora 30 functional and boot tests

Update testing for Fedora 30

Change-Id: If60eb0b87e45efc0e71db2ddcd814223539f07b7
---
 .zuul.d/jobs.yaml                                 | 15 +++++++++++++++
 .zuul.d/project.yaml                              |  1 +
 .../environment.d/10-fedora-distro-name.bash      |  2 +-
 .../environment.d/10-fedora-distro-name.bash      |  4 +++-
 diskimage_builder/elements/simple-init/pkg-map    |  3 +++
 doc/source/user_guide/supported_distros.rst       |  4 ++--
 6 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index 10371437..0f3768de 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -241,6 +241,21 @@
         env-vars:
           DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
 
+- job:
+    name: dib-nodepool-functional-openstack-fedora-30-src
+    description: |
+      Test building and booting a Fedora 30 image with Nodepool and OpenStack
+    parent: dib-nodepool-functional-src-base
+    vars:
+      nodepool_extra_packages:
+        - rpm
+        - yum-utils
+      nodepool_diskimage:
+        base_element: fedora-minimal
+        release: '30'
+        env-vars:
+          DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
+
 - job:
     name: dib-nodepool-functional-openstack-ubuntu-trusty-src
     description: |
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index 83e1b17e..f60cd261 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -12,6 +12,7 @@
         - openstack-tox-pylint
         - dib-nodepool-functional-openstack-centos-7-src
         - dib-nodepool-functional-openstack-fedora-29-src
+        - dib-nodepool-functional-openstack-fedora-30-src
         - dib-nodepool-functional-openstack-opensuse-150-src
         - dib-nodepool-functional-openstack-opensuse-151-src
         - dib-nodepool-functional-openstack-ubuntu-trusty-src
diff --git a/diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash b/diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash
index 7bda04c9..993e1f97 100644
--- a/diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash
+++ b/diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash
@@ -1,2 +1,2 @@
 export DISTRO_NAME=fedora
-export DIB_RELEASE=${DIB_RELEASE:-29}
+export DIB_RELEASE=${DIB_RELEASE:-30}
diff --git a/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash b/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
index 4fb4028a..1188e697 100644
--- a/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
+++ b/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
@@ -1,5 +1,5 @@
 export DISTRO_NAME=fedora
-export DIB_RELEASE=${DIB_RELEASE:-29}
+export DIB_RELEASE=${DIB_RELEASE:-30}
 
 # Note the filename URL has a "sub-release" in it
 #  http:// ... Fedora-Cloud-Base-25-1.3.x86_64.qcow2
@@ -15,6 +15,8 @@ if [[ ${DIB_RELEASE} == '28' ]]; then
     export DIB_FEDORA_SUBRELEASE=1.1
 elif [[ ${DIB_RELEASE} == '29' ]]; then
     export DIB_FEDORA_SUBRELEASE=1.2
+elif [[ ${DIB_RELEASE} == '30' ]]; then
+    export DIB_FEDORA_SUBRELEASE=1.2
 else
     echo "Unsupported Fedora release"
     exit 1
diff --git a/diskimage_builder/elements/simple-init/pkg-map b/diskimage_builder/elements/simple-init/pkg-map
index 8298d22c..4e2bee16 100644
--- a/diskimage_builder/elements/simple-init/pkg-map
+++ b/diskimage_builder/elements/simple-init/pkg-map
@@ -22,6 +22,9 @@
     "fedora": {
       "29": {
         "network-scripts": "network-scripts"
+      },
+      "30": {
+        "network-scripts": "network-scripts"
       }
     }
   },
diff --git a/doc/source/user_guide/supported_distros.rst b/doc/source/user_guide/supported_distros.rst
index f9d314de..16dc6fbf 100644
--- a/doc/source/user_guide/supported_distros.rst
+++ b/doc/source/user_guide/supported_distros.rst
@@ -5,7 +5,7 @@ Distributions which are supported as a build host:
 
 - Centos 6, 7
 - Debian 8 ("jessie")
-- Fedora 28, 29
+- Fedora 28, 29, 30
 - RHEL 6, 7
 - Ubuntu 14.04 ("trusty")
 - Gentoo
@@ -16,7 +16,7 @@ Distributions which are supported as a target for an image:
 
 - Centos 6, 7
 - Debian 8 ("jessie")
-- Fedora 28, 29
+- Fedora 28, 29, 30
 - RHEL 6, 7
 - Ubuntu 12.04 ("precise"), 14.04 ("trusty")
 - Gentoo