From 5085f23fdfcae315e4da5864bfde485a6fb4f39a Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 16 Nov 2018 14:50:08 +1100 Subject: [PATCH] Update to Fedora 29 Update builds to Fedora 29. Remove the openstack gate CI mirror workaround for pre-28 versions as they're not building in the gate any more. Change-Id: Ia6a8ae8d66d69f6add39e571043328e7274ba26c --- .../environment.d/10-fedora-distro-name.bash | 2 +- .../fedora/environment.d/10-fedora-distro-name.bash | 8 ++++---- doc/source/user_guide/supported_distros.rst | 4 ++-- roles/dib-setup-gate-mirrors/tasks/main.yaml | 5 +++-- .../templates/fedora-minimal/28/fedora-updates.repo.j2 | 10 ---------- .../templates/fedora-minimal/28/fedora.repo.j2 | 10 ---------- .../fedora-minimal/default/fedora-updates.repo.j2 | 2 +- 7 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora-updates.repo.j2 delete mode 100644 roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora.repo.j2 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 7c889e5d..7bda04c9 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:-28} +export DIB_RELEASE=${DIB_RELEASE:-29} 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 90af79c0..4fb4028a 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:-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 diff --git a/doc/source/user_guide/supported_distros.rst b/doc/source/user_guide/supported_distros.rst index 74559e2a..ee6d2538 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 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 diff --git a/roles/dib-setup-gate-mirrors/tasks/main.yaml b/roles/dib-setup-gate-mirrors/tasks/main.yaml index da7521d0..862b68a7 100644 --- a/roles/dib-setup-gate-mirrors/tasks/main.yaml +++ b/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' ] diff --git a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora-updates.repo.j2 b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora-updates.repo.j2 deleted file mode 100644 index 5725c665..00000000 --- a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora-updates.repo.j2 +++ /dev/null @@ -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 diff --git a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora.repo.j2 b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora.repo.j2 deleted file mode 100644 index 74853f8d..00000000 --- a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora.repo.j2 +++ /dev/null @@ -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 diff --git a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2 b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2 index 79ecb21e..5725c665 100644 --- a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2 +++ b/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