sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add support for Fedora 27, remove EOL Fedora 25"

Browse Source
This commit is contained in:
Zuul 2018-01-29 05:23:28 +00:00 committed by Gerrit Code Review
commit 66444e8b93
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
export DISTRO_NAME=fedora export DISTRO_NAME=fedora
export DIB_RELEASE=${DIB_RELEASE:-26} export DIB_RELEASE=${DIB_RELEASE:-27}
# 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:-26}
# #
# [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} == '25' ]]; then if [[ ${DIB_RELEASE} == '26' ]]; then
export DIB_FEDORA_SUBRELEASE=1.3
elif [[ ${DIB_RELEASE} == '26' ]]; then
export DIB_FEDORA_SUBRELEASE=1.5 export DIB_FEDORA_SUBRELEASE=1.5
elif [[ ${DIB_RELEASE} == '27' ]]; then
export DIB_FEDORA_SUBRELEASE=1.6
else else
echo "Unsupported Fedora release" echo "Unsupported Fedora release"
exit 1 exit 1

4
doc/source/user_guide/supported_distros.rst
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 20, 21, 22 - Fedora 26, 27
- 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 20, 21, 22 - Fedora 26, 27
- RHEL 6, 7 - RHEL 6, 7
- Ubuntu 12.04 ("precise"), 14.04 ("trusty") - Ubuntu 12.04 ("precise"), 14.04 ("trusty")
- Gentoo - Gentoo