From 5b5385cf84a422b0394f6bd95d7700f2f8a9bf86 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 26 Sep 2019 01:11:36 +0000 Subject: [PATCH] CentOS 8 minimal testing and support This adds CentOS 8 into functional and boot tests. This completes centos-minimal support, documentation is updated and a release note is added. Change-Id: I435c2967b4f49faeb6d6edf189907b9f96e80357 --- .zuul.d/jobs.yaml | 17 ++++++++++++++++- .zuul.d/project.yaml | 2 ++ .../elements/centos-minimal/README.rst | 3 +++ .../README.rst | 0 .../element-deps | 0 .../test-elements/8-build-succeeds/README.rst | 1 + .../test-elements/8-build-succeeds/element-deps | 1 + .../environment.d/09-set-distro.bash | 1 + .../centos-minimal-8-aca6314862741177.yaml | 5 +++++ 9 files changed, 29 insertions(+), 1 deletion(-) rename diskimage_builder/elements/centos-minimal/test-elements/{build-succeeds => 7-build-succeeds}/README.rst (100%) rename diskimage_builder/elements/centos-minimal/test-elements/{build-succeeds => 7-build-succeeds}/element-deps (100%) create mode 100644 diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps create mode 100644 diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash create mode 100644 releasenotes/notes/centos-minimal-8-aca6314862741177.yaml diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index fd743b44..9b6f83c9 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -21,7 +21,8 @@ vars: dib_functests: - apt-sources/test-sources - - centos-minimal/build-succeeds + - centos-minimal/7-build-succeeds + - centos-minimal/8-build-succeeds - fedora-minimal/build-succeeds - ironic-agent/build-succeeds-fedora - pip-and-virtualenv/source-install-fedora @@ -224,6 +225,20 @@ release: '7' mirror: "http://{{ zuul_site_mirror_fqdn }}/centos" +- job: + name: dib-nodepool-functional-openstack-centos-8-src + description: | + Test building and booting a Centos 8 image with Nodepool and OpenStack + parent: dib-nodepool-functional-src-base + vars: + nodepool_extra_packages: + - rpm + - yum-utils + nodepool_diskimage: + base_element: centos-minimal + release: '8' + mirror: "http://{{ zuul_site_mirror_fqdn }}/centos" + - job: name: dib-nodepool-functional-openstack-fedora-29-src description: | diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index aecd9b7b..41022dde 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -11,6 +11,7 @@ jobs: - openstack-tox-pylint - dib-nodepool-functional-openstack-centos-7-src + - dib-nodepool-functional-openstack-centos-8-src - dib-nodepool-functional-openstack-fedora-29-src - dib-nodepool-functional-openstack-fedora-30-src - dib-nodepool-functional-openstack-opensuse-15-src @@ -36,6 +37,7 @@ jobs: - openstack-tox-pylint - dib-nodepool-functional-openstack-centos-7-src + - dib-nodepool-functional-openstack-centos-8-src - dib-nodepool-functional-openstack-fedora-29-src - dib-nodepool-functional-openstack-fedora-30-src - dib-nodepool-functional-openstack-opensuse-15-src diff --git a/diskimage_builder/elements/centos-minimal/README.rst b/diskimage_builder/elements/centos-minimal/README.rst index 394f8879..13cb1d09 100644 --- a/diskimage_builder/elements/centos-minimal/README.rst +++ b/diskimage_builder/elements/centos-minimal/README.rst @@ -6,6 +6,9 @@ Create a minimal image based on CentOS Use of this element will require 'yum' and 'yum-utils' to be installed on Ubuntu and Debian. Nothing additional is needed on Fedora or CentOS. +By default this builds CentOS 7 images. Set ``DIB_RELEASE`` to ``7`` +or ``8`` to explicitly select the release. + For CentOS 7, by default, ``DIB_YUM_MINIMAL_CREATE_INTERFACES`` is set to enable the creation of ``/etc/sysconfig/network-scripts/ifcfg-eth[0|1]`` scripts to enable diff --git a/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/README.rst b/diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/README.rst similarity index 100% rename from diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/README.rst rename to diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/README.rst diff --git a/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/element-deps b/diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/element-deps similarity index 100% rename from diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/element-deps rename to diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/element-deps diff --git a/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst b/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst new file mode 100644 index 00000000..fa1e50dc --- /dev/null +++ b/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst @@ -0,0 +1 @@ +Verify we can build a centos-minimal image. diff --git a/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps b/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps new file mode 100644 index 00000000..7791c84f --- /dev/null +++ b/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps @@ -0,0 +1 @@ +openstack-ci-mirrors \ No newline at end of file diff --git a/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash b/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash new file mode 100644 index 00000000..d6c89677 --- /dev/null +++ b/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash @@ -0,0 +1 @@ +export DIB_RELEASE='8' diff --git a/releasenotes/notes/centos-minimal-8-aca6314862741177.yaml b/releasenotes/notes/centos-minimal-8-aca6314862741177.yaml new file mode 100644 index 00000000..c9b4e593 --- /dev/null +++ b/releasenotes/notes/centos-minimal-8-aca6314862741177.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The ``centos-minimal`` supports CentOS 8 builds when run with + ``DIB_RELEASE=8``