Merge "Fedora 32 support"

.zuul.d/jobs.yaml

@@ -196,6 +196,16 @@
         base_element: fedora-minimal
         release: '31'
 
+- job:
+    name: dib-nodepool-functional-openstack-fedora-32-src
+    description: |
+      Test building and booting a Fedora 32 image with Nodepool and OpenStack
+    parent: dib-nodepool-functional-src-base
+    vars:
+      nodepool_diskimage:
+        base_element: fedora-minimal
+        release: '32'
+
 - job:
     name: dib-nodepool-functional-openstack-ubuntu-xenial-src
     description: |

.zuul.d/project.yaml

@@ -18,6 +18,7 @@
         - dib-nodepool-functional-openstack-centos-8-src
         - dib-nodepool-functional-openstack-centos-8-stream-src
         - dib-nodepool-functional-openstack-fedora-31-src
+        - dib-nodepool-functional-openstack-fedora-32-src
         - dib-nodepool-functional-openstack-ubuntu-xenial-src
         - dib-nodepool-functional-openstack-ubuntu-bionic-src
         - dib-nodepool-functional-openstack-ubuntu-focal-src
@@ -49,6 +50,7 @@
         - dib-nodepool-functional-openstack-centos-8-src
         - dib-nodepool-functional-openstack-centos-8-stream-src
         - dib-nodepool-functional-openstack-fedora-31-src
+        - dib-nodepool-functional-openstack-fedora-32-src
         - dib-nodepool-functional-openstack-ubuntu-xenial-src
         - dib-nodepool-functional-openstack-ubuntu-bionic-src
         - dib-nodepool-functional-openstack-ubuntu-focal-src

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:-31}
+export DIB_RELEASE=${DIB_RELEASE:-32}

diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash

@@ -1,5 +1,5 @@
 export DISTRO_NAME=fedora
-export DIB_RELEASE=${DIB_RELEASE:-31}
+export DIB_RELEASE=${DIB_RELEASE:-32}
 
 # Note the filename URL has a "sub-release" in it
 #  http:// ... Fedora-Cloud-Base-25-1.3.x86_64.qcow2
@@ -19,6 +19,8 @@ elif [[ ${DIB_RELEASE} == '30' ]]; then
     export DIB_FEDORA_SUBRELEASE=1.2
 elif [[ ${DIB_RELEASE} == '31' ]]; then
     export DIB_FEDORA_SUBRELEASE=1.9
+elif [[ ${DIB_RELEASE} == '32' ]]; then
+    export DIB_FEDORA_SUBRELEASE=1.6
 else
     echo "Unsupported Fedora release"
     exit 1

diskimage_builder/elements/fedora/pre-install.d/01-set-fedora-mirror

@@ -14,10 +14,14 @@ if [[ ${DIB_RELEASE} -gt 27 ]]; then
     # urgh, the repo is wrong in the "baseurl" line, see
     #  https://pagure.io/fedora/repos/issue/70
     for FILE in /etc/yum.repos.d/fedora-updates.repo /etc/yum.repos.d/fedora-updates-testing.repo; do
-        sed -i "s|/os/||" $FILE
+        sed -i "s,/os/,," $FILE
     done
 fi
 
 for FILE in /etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo /etc/yum.repos.d/fedora-updates-testing.repo; do
-    sudo sed -e "s|^#baseurl=http[s]*://download.fedoraproject.org/pub/fedora/linux|baseurl=$DIB_DISTRIBUTION_MIRROR|;/^metalink/d" -i $FILE
+    # In >=32 this became "download.example" not
+    # "download.fedoraproject.org"
+    cat $FILE
+    sudo sed -e "s,^#baseurl=http[s]*://download.\(fedoraproject.org\|example\)/pub/fedora/linux,baseurl=$DIB_DISTRIBUTION_MIRROR,;/^metalink/d" -i $FILE
+    cat $FILE
 done

diskimage_builder/elements/simple-init/pkg-map

@@ -18,17 +18,9 @@
       "network-scripts": "wicked-service"
     }
   },
-  "release": {
+  "distro": {
     "fedora": {
-      "29": {
-        "network-scripts": "network-scripts"
-      },
-      "30": {
-        "network-scripts": "network-scripts"
-      },
-      "31": {
-        "network-scripts": "network-scripts"
-      }
+       "network-scripts": "network-scripts"
     }
   },
   "default": {

doc/source/user_guide/supported_distros.rst

@@ -15,7 +15,7 @@ Distributions which are supported as a target for an image:
 
 - Centos 6, 7
 - Debian 8 ("jessie")
-- Fedora 30, 31
+- Fedora 31, 32
 - RHEL 6, 7
 - 16.04 ("xenial"), 18.04 ("bionic")
 - Gentoo

releasenotes/notes/fedora32-9dfa4d9d4dcce1ff.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The default for elements building Fedora is updated to Fedora 32