diskimage-builder/diskimage_builder/elements
Ian Wienand 9f688f53da centos7; use numeric DIB_RELEASE
With the introduction of centos 8 we have constructs like

 if [[ $DISTRO =~ (centos|fedora) && $DIB_RELEASE -ge 8 ]]

This is intended to match the "centos7" element (from the =~) but it
was missed that this is setting the DIB_RELEASE to "GenericCloud".

I think it makes more sense for this to be a numeric release, and
makes constructs like above work.  There really isn't any other type
of image to choose here; thus we move it into a new, centos7
specific variable.

Note that when the centos 8 images are available, we want to move to a
generic "centos" element that will handle both 7 and 8 together (same
as rhel) based on DIB_RELEASE and deprecate centos7; this works with
that environment too.

Change-Id: I2e6b7848070d6452c0563e2a122447627c6e6bf7
2019-10-14 14:34:36 +11:00
..
apt-conf Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
apt-preferences Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
apt-sources Use local mirror for ubuntu-minimal jobs 2017-06-21 12:01:31 +10:00
baremetal Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
base Add option to skip update packages 2019-02-25 06:31:30 +00:00
block-device-efi Increase size of EFI system partition (again) 2019-05-31 17:10:08 +10:00
block-device-gpt Choose appropriate bootloader for block-device 2018-02-23 10:04:44 +11:00
block-device-mbr Choose appropriate bootloader for block-device 2018-02-23 10:04:44 +11:00
bootloader Use x86 architeture specific grub2 packages for RHEL 2019-09-12 15:06:17 -04:00
cache-url Makes image caching more resilient 2019-05-31 16:31:43 +10:00
centos-minimal CentOS 8 minimal testing and support 2019-10-08 00:17:14 +02:00
centos7 centos7; use numeric DIB_RELEASE 2019-10-14 14:34:36 +11:00
cleanup-kernel-initrd Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
cloud-init Merge branch 'master' into merge-branch 2017-02-09 13:35:53 +11:00
cloud-init-datasources Drop support for Ubuntu precise 2017-05-31 14:36:30 +02:00
cloud-init-disable-resizefs Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
cloud-init-nocloud Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
debian Fix element-provides in debian element 2018-03-26 10:58:04 -07:00
debian-minimal Add security mirror override for debian-minimal 2019-10-03 13:49:47 +10:00
debian-systemd Install systemd earlier for Stretch 2017-06-19 13:27:33 +10:00
debian-upstart Install systemd earlier for Stretch 2017-06-19 13:27:33 +10:00
debootstrap debootstrap: make default network interface names configurable 2019-06-12 13:53:38 +00:00
deploy-baremetal Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
deploy-kexec Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
deploy-targetcli Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
deploy-tgtadm Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
devuser install sudo in the devuser element 2018-03-22 00:16:09 -05:00
dhcp-all-interfaces Merge "Fix /etc/network/interfaces file contents" 2018-07-10 07:46:56 +00:00
dib-init-system allow building non-gentoo images on gentoo hosts 2018-04-12 13:24:59 -05:00
dib-python dib-python : handle centos 8 2019-10-03 00:22:18 +00:00
dib-run-parts Trivial fix typos 2017-05-31 11:17:05 +07:00
disable-nouveau Add DIB element to blacklist nouveau 2018-07-25 16:35:58 +01:00
disable-selinux/post-install.d Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
dkms Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
docker Run dib-run-parts out of /tmp 2017-04-05 13:11:22 +10:00
dpkg Fixes add-apt-keys in dpkg element 2018-05-09 12:06:20 -05:00
dracut-network Remove dracut-network element 2017-05-31 08:36:56 +10:00
dracut-ramdisk Merge "Remove use of 'which'." 2017-06-11 09:30:34 +00:00
dracut-regenerate dracut-regenerate: catch failures and exit code 2019-08-13 15:51:05 +10:00
dynamic-login Release 1.25.2 2017-02-02 11:20:00 +11:00
element-manifest Release 1.24.0 2017-01-31 14:14:19 +11:00
enable-serial-console Release 1.25.2 2017-02-02 11:20:00 +11:00
epel Use $YUM instead of direct calls in more places 2019-10-03 00:22:18 +00:00
fedora Fedora 30 functional and boot tests 2019-08-28 11:21:46 +10:00
fedora-minimal Remove "failovermethod=priority" for Fedora (dnf) 2019-10-01 06:01:15 +00:00
gentoo update gentoo systemd profile to 17.1 from 17.0 2019-08-19 15:13:09 -05:00
growroot Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
grub2 Use x86 architeture specific grub2 packages for RHEL 2019-09-12 15:06:17 -04:00
hpdsa fail early when lates build information can not be fetched 2019-05-31 16:09:25 +10:00
hwburnin Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
hwdiscovery Remove use of 'which'. 2017-05-19 12:43:36 -07:00
ibft-interfaces Add an element to configure iBFT network interfaces 2018-11-20 14:11:11 +01:00
ilo Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
install-bin Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
install-static Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
install-types Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
ironic-agent ironic-agent: Use targetcli & python3-devel on rhel8 2019-07-02 21:39:13 -04:00
iscsi-boot Change phase to check for dracut-regenerate in iscsi-boot 2019-01-02 11:05:00 +01:00
iso Fix for rhel7 iso image creation. 2018-02-28 06:31:34 -06:00
journal-to-console journal-to-console: element to send systemd journal to console 2019-07-25 11:24:49 +10:00
local-config Merge remote-tracking branch 'origin/master' into merge-branch 2016-11-29 07:43:46 +11:00
lvm [lvm] Add Ubuntu bionic as supported distro 2019-03-04 15:05:37 -05:00
manifests Set manifest permissions in the image 2017-05-24 15:20:55 +10:00
mellanox Merge remote-tracking branch 'origin/master' into merge-branch 2016-11-29 07:43:46 +11:00
modprobe Allow debootstrap to cleanup without a kernel 2018-10-08 16:02:25 +11:00
modprobe-blacklist Add new modprobe element 2018-06-28 13:55:53 +02:00
no-final-image Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
oat-client Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
openssh-server openssh-server: harden sshd config 2019-05-01 11:42:21 -04:00
openstack-ci-mirrors yum-minimal : update mirrors for Centos 8 2019-10-03 00:22:05 +00:00
opensuse Rename openSUSE 15.1 testing to 15 2019-08-30 22:44:40 +02:00
opensuse-minimal Rename openSUSE 15.1 testing to 15 2019-08-30 22:44:40 +02:00
package-installs package-installs: provide for skip from env var 2018-11-30 10:02:47 +11:00
pip-and-virtualenv pip-and-virtualenv : deprecate source for CentOS 8, new variables 2019-10-03 00:22:18 +00:00
pip-cache Fix DIB ubuntu-minimal running on bionic (18.04) 2018-10-01 19:59:30 -07:00
pkg-map Turn down pkg-map and hook copy tracing output 2018-10-18 11:03:17 +11:00
posix Merge remote-tracking branch 'origin/master' into merge-branch 2016-11-29 07:43:46 +11:00
proliant-tools Trivial: update url to new url 2018-05-13 23:06:00 +08:00
pypi Fix the pypi element for multiple mirror URLs 2019-08-08 22:52:43 +00:00
python-brickclient Merge branch 'master' into merge-branch 2017-02-09 13:35:53 +11:00
ramdisk Remove use of 'which'. 2017-05-19 12:43:36 -07:00
ramdisk-base Remove use of 'which'. 2017-05-19 12:43:36 -07:00
rax-nova-agent Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
redhat-common Update redhat-common pkg-map for centos 8 2019-10-03 00:22:18 +00:00
rhel Create /etc/machine-id for RHEL images 2019-08-07 18:18:34 +10:00
rhel-common Add version-less RHEL element for RHEL7 and RHEL8 2019-05-29 11:28:53 +03:00
rhel7 Deprecate rhel7 in favor of rhel 2019-05-29 12:07:44 +00:00
rpm-distro Use $YUM instead of direct calls in more places 2019-10-03 00:22:18 +00:00
runtime-ssh-host-keys Release 1.21.1 2017-02-02 20:36:23 +11:00
select-boot-kernel-initrd Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
selinux-permissive move selinux-permissive configure to pre-install phase 2018-11-19 13:13:57 +11:00
simple-init Fix networking for CentOS 8 2019-10-07 10:47:09 +00:00
source-repositories fail early when lates build information can not be fetched 2019-05-31 16:09:25 +10:00
stable-interface-names Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
svc-map Add version-less RHEL element for RHEL7 and RHEL8 2019-05-29 11:28:53 +03:00
sysctl Release 1.25.2 2017-02-02 11:20:00 +11:00
sysprep Clear /etc/machine-id to avoid duplicate machine-ids 2017-08-06 13:56:58 -04:00
uboot Move elements & lib relative to diskimage_builder package 2016-11-01 17:27:41 -07:00
ubuntu Fixes DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE matching when empty 2019-08-09 10:26:48 +00:00
ubuntu-common ubuntu-common: Update default DIB_RELEASE to bionic 2018-09-20 02:06:04 +01:00
ubuntu-minimal Add DIB_UBUNTU_KERNEL to ubuntu-minimal 2019-06-20 10:18:23 -07:00
ubuntu-signed Use sphinx warning-is-error 2017-03-14 14:49:49 +11:00
ubuntu-systemd-container Add ubuntu-systemd-container operating-system element 2018-10-31 14:22:28 +11:00
vm Add block-device defaults 2018-02-23 10:04:40 +11:00
yum Use $YUM instead of direct calls in more places 2019-10-03 00:22:18 +00:00
yum-minimal Add NetworkManager and dhcp-client for CentOS 8 2019-10-07 10:47:09 +00:00
zipl Delete the duplicate words in 50-zipl 2019-01-07 10:02:35 +08:00
zypper zypper: fix package removal 2017-12-05 22:59:20 +00:00
zypper-minimal zypper-minimal: Don't get confused by etc/resolv.conf symlink 2019-08-21 19:57:25 +02:00
__init__.py Fix unit tests for elements 2018-11-28 11:04:50 +11:00