Merge "Update to Fedora 29"

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

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

@@ -1,5 +1,5 @@
 export DISTRO_NAME=fedora
-export DIB_RELEASE=${DIB_RELEASE:-28}
+export DIB_RELEASE=${DIB_RELEASE:-29}
 
 # Note the filename URL has a "sub-release" in it
 #  http:// ... Fedora-Cloud-Base-25-1.3.x86_64.qcow2
@@ -11,10 +11,10 @@ export DIB_RELEASE=${DIB_RELEASE:-28}
 #
 # [1] https://lists.fedoraproject.org/archives/list/cloud@lists.fedoraproject.org/thread/2WFO2FKIGUQYRQXIR35UVJGRHF7LQENJ/
 
-if [[ ${DIB_RELEASE} == '27' ]]; then
-    export DIB_FEDORA_SUBRELEASE=1.6
-elif [[ ${DIB_RELEASE} == '28' ]]; then
+if [[ ${DIB_RELEASE} == '28' ]]; then
     export DIB_FEDORA_SUBRELEASE=1.1
+elif [[ ${DIB_RELEASE} == '29' ]]; then
+    export DIB_FEDORA_SUBRELEASE=1.2
 else
     echo "Unsupported Fedora release"
     exit 1

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 27, 28
+- Fedora 28, 29
 - 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 27, 28
+- Fedora 28, 29
 - RHEL 6, 7
 - Ubuntu 12.04 ("precise"), 14.04 ("trusty")
 - Gentoo

roles/dib-setup-gate-mirrors/tasks/main.yaml

@@ -28,9 +28,10 @@
     state: directory
     mode: 0775
     recurse: yes
+  # sometimes Fedora moves things and we need different versions; keep
+  # the loops for future use.
   with_items:
     - default
-    - '28'
 
 - name: Install fedora-minimal repo files
   template:
@@ -38,5 +39,5 @@
     mode: 0644
     src: "fedora-minimal/{{ item[0] }}/{{ item[1] }}.j2"
   with_nested:
-    - [ 'default', '28' ]
+    - [ 'default' ]
     - [ 'fedora.repo', 'fedora-updates.repo' ]

roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora-updates.repo.j2

@@ -1,10 +0,0 @@
-[updates]
-name=Fedora $releasever - $basearch - Updates
-failovermethod=priority
-baseurl=http://{{ mirror_fqdn }}/fedora/updates/$releasever/Everything/$basearch/
-enabled=1
-gpgcheck=0
-metadata_expire=6h
-skip_if_unavailable=False
-deltarpm=False
-deltarpm_percentage=0

roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora.repo.j2

@@ -1,10 +0,0 @@
-[fedora]
-name=Fedora $releasever - $basearch
-failovermethod=priority
-baseurl=http://{{ mirror_fqdn }}/fedora/releases/$releasever/Everything/$basearch/os/
-enabled=1
-metadata_expire=7d
-gpgcheck=0
-skip_if_unavailable=False
-deltarpm=False
-deltarpm_percentage=0

roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2

@@ -1,7 +1,7 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
 failovermethod=priority
-baseurl=http://{{ mirror_fqdn }}/fedora/updates/$releasever/$basearch/
+baseurl=http://{{ mirror_fqdn }}/fedora/updates/$releasever/Everything/$basearch/
 enabled=1
 gpgcheck=0
 metadata_expire=6h