Add support for Fedora 28, remove EOL Fedora 26

This updates diskimage-builder to support current Fedora releases (27
and 28) and removes support for Fedora 26 which is EOL as of June
2018.

Change-Id: I602b22ed4d5397b39dc1eef67964f6fbdcd93060
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-05-04 10:58:00 -04:00 committed by Ian Wienand
parent bbbade0e4c
commit 7173658df2
7 changed files with 28 additions and 12 deletions

View File

@ -42,7 +42,7 @@ cat <<EOF > $FEDORA_MIN_DIR/dib-mirror-fedora-updates.repo
[updates] [updates]
name=Fedora \$releasever - \$basearch - Updates name=Fedora \$releasever - \$basearch - Updates
failovermethod=priority failovermethod=priority
baseurl=$NODEPOOL_FEDORA_MIRROR/updates/\$releasever/\$basearch/ baseurl=$NODEPOOL_FEDORA_MIRROR/updates/\$releasever/Everything/\$basearch/
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0
metadata_expire=6h metadata_expire=6h

View File

@ -1,2 +1,2 @@
export DISTRO_NAME=fedora export DISTRO_NAME=fedora
export DIB_RELEASE=${DIB_RELEASE:-27} export DIB_RELEASE=${DIB_RELEASE:-28}

View File

@ -1,7 +1,7 @@
[fedora] [fedora]
name=Fedora $releasever - $basearch name=Fedora $releasever - $basearch
failovermethod=priority failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
gpgcheck=0 gpgcheck=0
skip_if_unavailable=False skip_if_unavailable=False
@ -9,7 +9,7 @@ skip_if_unavailable=False
[updates] [updates]
name=Fedora $releasever - $basearch - Updates name=Fedora $releasever - $basearch - Updates
failovermethod=priority failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/ #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
enabled=1 enabled=1
gpgcheck=0 gpgcheck=0

View File

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

View File

@ -10,6 +10,14 @@ DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-}
[ -n "$DIB_DISTRIBUTION_MIRROR" ] || exit 0 [ -n "$DIB_DISTRIBUTION_MIRROR" ] || exit 0
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
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 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://download.fedoraproject.org/pub/fedora/linux|baseurl=$DIB_DISTRIBUTION_MIRROR|;/^metalink/d" -i $FILE sudo sed -e "s|^#baseurl=http://download.fedoraproject.org/pub/fedora/linux|baseurl=$DIB_DISTRIBUTION_MIRROR|;/^metalink/d" -i $FILE
done done

View File

@ -26,10 +26,18 @@ else
# note default DIB_RELEASE set in environment setup # note default DIB_RELEASE set in environment setup
case ${ARCH} in case ${ARCH} in
x86_64) x86_64)
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://download.fedoraproject.org/pub/fedora/linux/releases/${DIB_RELEASE}/CloudImages/${ARCH}/images} if [[ ${DIB_RELEASE} -ge 28 ]]; then
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://download.fedoraproject.org/pub/fedora/linux/releases/${DIB_RELEASE}/Cloud/${ARCH}/images}
else
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://download.fedoraproject.org/pub/fedora/linux/releases/${DIB_RELEASE}/CloudImages/${ARCH}/images}
fi
;; ;;
aarch64|ppc64|ppc64le) aarch64|ppc64|ppc64le)
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://dl.fedoraproject.org/pub/fedora-secondary/releases/${DIB_RELEASE}/CloudImages/${ARCH}/images} if [[ ${DIB_RELEASE} -ge 28 ]]; then
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://dl.fedoraproject.org/pub/fedora-secondary/releases/${DIB_RELEASE}/Cloud/${ARCH}/images}
else
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-https://dl.fedoraproject.org/pub/fedora-secondary/releases/${DIB_RELEASE}/CloudImages/${ARCH}/images}
fi
;; ;;
*) *)
echo "Error: unknown ARCH: ${ARCH}" echo "Error: unknown ARCH: ${ARCH}"

View File

@ -5,7 +5,7 @@ Distributions which are supported as a build host:
- Centos 6, 7 - Centos 6, 7
- Debian 8 ("jessie") - Debian 8 ("jessie")
- Fedora 26, 27 - Fedora 27, 28
- RHEL 6, 7 - RHEL 6, 7
- Ubuntu 14.04 ("trusty") - Ubuntu 14.04 ("trusty")
- Gentoo - Gentoo
@ -16,7 +16,7 @@ Distributions which are supported as a target for an image:
- Centos 6, 7 - Centos 6, 7
- Debian 8 ("jessie") - Debian 8 ("jessie")
- Fedora 26, 27 - Fedora 27, 28
- RHEL 6, 7 - RHEL 6, 7
- Ubuntu 12.04 ("precise"), 14.04 ("trusty") - Ubuntu 12.04 ("precise"), 14.04 ("trusty")
- Gentoo - Gentoo