Hello community, here is the log from the commit of package diskimage-builder for openSUSE:Factory checked in at 2019-09-10 00:01:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diskimage-builder (Old) and /work/SRC/openSUSE:Factory/.diskimage-builder.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diskimage-builder" Tue Sep 10 00:01:08 2019 rev:27 rq:729467 version:2.27.0 Changes: -------- --- /work/SRC/openSUSE:Factory/diskimage-builder/diskimage-builder.changes 2019-08-22 15:07:28.678515215 +0200 +++ /work/SRC/openSUSE:Factory/.diskimage-builder.new.7948/diskimage-builder.changes 2019-09-10 00:01:11.345216761 +0200 @@ -1,0 +2,13 @@ +Mon Sep 9 11:33:05 UTC 2019 - Markos Chandras <mchand...@suse.de> + +- Update to 2.27.0 + * Uninstall linux-firmware and linux-firmware-whence + * Fixed use of flake8 + * Allow configurable gzip binary name + * Do not delete cracklib from /usr/share + * Fedora 30 functional and boot tests + * rpm-distro: ensure we selinux relabel underlying directories + * Allow extra repositories to be added to images + * yum-minimal: install fedora-release-cloud + +------------------------------------------------------------------- Old: ---- diskimage-builder-2.26.1.tar.gz New: ---- diskimage-builder-2.27.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diskimage-builder.spec ++++++ --- /var/tmp/diff_new_pack.uiuAkL/_old 2019-09-10 00:01:11.941216721 +0200 +++ /var/tmp/diff_new_pack.uiuAkL/_new 2019-09-10 00:01:11.941216721 +0200 @@ -20,7 +20,7 @@ # are only ever run inside the disk image build chroot). %global __requires_exclude_from ^%{python3_sitelib}/diskimage_builder/elements/.*$ Name: diskimage-builder -Version: 2.26.1 +Version: 2.27.0 Release: 0 Summary: Image Building Tools for OpenStack License: Apache-2.0 ++++++ diskimage-builder-2.26.1.tar.gz -> diskimage-builder-2.27.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/.zuul.d/jobs.yaml new/diskimage-builder-2.27.0/.zuul.d/jobs.yaml --- old/diskimage-builder-2.26.1/.zuul.d/jobs.yaml 2019-08-21 23:48:02.000000000 +0200 +++ new/diskimage-builder-2.27.0/.zuul.d/jobs.yaml 2019-09-09 08:16:15.000000000 +0200 @@ -43,7 +43,7 @@ dib_functests: - centos7/build-succeeds - opensuse/build-succeeds - - opensuse/opensuse151-build-succeeds + - opensuse/opensuse15-build-succeeds - fedora/build-succeeds - ubuntu/trusty-build-succeeds - ubuntu/xenial-build-succeeds @@ -161,7 +161,7 @@ # opensuse-minimal can only build on xenial ATM, as other # platforms don't have zypper dib_functests_extra: - - opensuse-minimal/opensuse151-build-succeeds + - opensuse-minimal/opensuse15-build-succeeds - job: name: dib-functests-xenial-python3-containers @@ -242,6 +242,21 @@ DIB_SIMPLE_INIT_NETWORKMANAGER: '1' - job: + name: dib-nodepool-functional-openstack-fedora-30-src + description: | + Test building and booting a Fedora 30 image with Nodepool and OpenStack + parent: dib-nodepool-functional-src-base + vars: + nodepool_extra_packages: + - rpm + - yum-utils + nodepool_diskimage: + base_element: fedora-minimal + release: '30' + env-vars: + DIB_SIMPLE_INIT_NETWORKMANAGER: '1' + +- job: name: dib-nodepool-functional-openstack-ubuntu-trusty-src description: | Test building and booting an Ubuntu trusty image with Nodepool @@ -367,9 +382,9 @@ mirror: "http://{{ zuul_site_mirror_fqdn }}/opensuse" - job: - name: dib-nodepool-functional-openstack-opensuse-151-src + name: dib-nodepool-functional-openstack-opensuse-15-src description: | - Test building and booting an openSUSE 15.1 image with Nodepool + Test building and booting an openSUSE 15.x image with Nodepool and OpenStack parent: dib-nodepool-functional-src-base nodeset: ubuntu-xenial # Bionic lacks zypper diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/.zuul.d/project.yaml new/diskimage-builder-2.27.0/.zuul.d/project.yaml --- old/diskimage-builder-2.26.1/.zuul.d/project.yaml 2019-08-21 23:48:02.000000000 +0200 +++ new/diskimage-builder-2.27.0/.zuul.d/project.yaml 2019-09-09 08:16:15.000000000 +0200 @@ -12,8 +12,8 @@ - openstack-tox-pylint - dib-nodepool-functional-openstack-centos-7-src - dib-nodepool-functional-openstack-fedora-29-src - - dib-nodepool-functional-openstack-opensuse-150-src - - dib-nodepool-functional-openstack-opensuse-151-src + - dib-nodepool-functional-openstack-fedora-30-src + - dib-nodepool-functional-openstack-opensuse-15-src - dib-nodepool-functional-openstack-ubuntu-trusty-src - dib-nodepool-functional-openstack-ubuntu-xenial-src - dib-nodepool-functional-openstack-ubuntu-bionic @@ -37,8 +37,8 @@ - openstack-tox-pylint - dib-nodepool-functional-openstack-centos-7-src - dib-nodepool-functional-openstack-fedora-29-src - - dib-nodepool-functional-openstack-opensuse-150-src - - dib-nodepool-functional-openstack-opensuse-151-src + - dib-nodepool-functional-openstack-fedora-30-src + - dib-nodepool-functional-openstack-opensuse-15-src - dib-nodepool-functional-openstack-ubuntu-trusty-src - dib-nodepool-functional-openstack-ubuntu-xenial-src - dib-nodepool-functional-openstack-ubuntu-bionic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/ChangeLog new/diskimage-builder-2.27.0/ChangeLog --- old/diskimage-builder-2.26.1/ChangeLog 2019-08-21 23:49:26.000000000 +0200 +++ new/diskimage-builder-2.27.0/ChangeLog 2019-09-09 08:17:06.000000000 +0200 @@ -1,6 +1,17 @@ CHANGES ======= +2.27.0 +------ + +* Add fedora-30 testing to gate +* Uninstall linux-firmware and linux-firmware-whence +* Fixed use of flake8 +* Rename openSUSE 15.1 testing to 15 +* Allow configurable gzip binary name +* Do not delete cracklib from /usr/share +* Fedora 30 functional and boot tests + 2.26.1 ------ @@ -11,6 +22,9 @@ * simple-init: add configurable RA timeout with network-manager * update gentoo systemd profile to 17.1 from 17.0 +* rpm-distro: ensure we selinux relabel underlying directories +* Allow extra repositories to be added to images +* yum-minimal: install fedora-release-cloud * block-device-efi : expand disk size calculation * Don't show all elements found * dracut-regenerate: catch failures and exit code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/PKG-INFO new/diskimage-builder-2.27.0/PKG-INFO --- old/diskimage-builder-2.26.1/PKG-INFO 2019-08-21 23:49:27.000000000 +0200 +++ new/diskimage-builder-2.27.0/PKG-INFO 2019-09-09 08:17:07.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: diskimage-builder -Version: 2.26.1 +Version: 2.27.0 Summary: Golden Disk Image builder. Home-page: https://docs.openstack.org/diskimage-builder/latest/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash new/diskimage-builder-2.27.0/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash --- old/diskimage-builder-2.26.1/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash 2019-08-21 23:48:02.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash 2019-09-09 08:16:11.000000000 +0200 @@ -1,5 +1,5 @@ export DISTRO_NAME=fedora -export DIB_RELEASE=${DIB_RELEASE:-29} +export DIB_RELEASE=${DIB_RELEASE:-30} # Note the filename URL has a "sub-release" in it # http:// ... Fedora-Cloud-Base-25-1.3.x86_64.qcow2 @@ -15,6 +15,8 @@ export DIB_FEDORA_SUBRELEASE=1.1 elif [[ ${DIB_RELEASE} == '29' ]]; then export DIB_FEDORA_SUBRELEASE=1.2 +elif [[ ${DIB_RELEASE} == '30' ]]; then + export DIB_FEDORA_SUBRELEASE=1.2 else echo "Unsupported Fedora release" exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash new/diskimage-builder-2.27.0/diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash --- old/diskimage-builder-2.26.1/diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash 2019-08-21 23:48:02.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash 2019-09-09 08:16:11.000000000 +0200 @@ -1,2 +1,2 @@ export DISTRO_NAME=fedora -export DIB_RELEASE=${DIB_RELEASE:-29} +export DIB_RELEASE=${DIB_RELEASE:-30} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/README.rst new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/README.rst --- old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/README.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/README.rst 2019-09-09 08:16:15.000000000 +0200 @@ -0,0 +1 @@ +Verify we can build an openSUSE Leap 15.1 image. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash --- old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash 2019-09-09 08:16:15.000000000 +0200 @@ -0,0 +1 @@ +export DIB_RELEASE=15.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/README.rst new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/README.rst --- old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/README.rst 2019-08-21 23:48:06.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/README.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Verify we can build an openSUSE Leap 15.1 image. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash --- old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash 2019-08-21 23:48:06.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -export DIB_RELEASE=15.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/README.rst new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/README.rst --- old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/README.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/README.rst 2019-09-09 08:16:15.000000000 +0200 @@ -0,0 +1 @@ +Verify we can build an openSUSE Leap 15.1 image. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/element-deps new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/element-deps --- old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/element-deps 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/element-deps 2019-09-09 08:16:15.000000000 +0200 @@ -0,0 +1 @@ +openstack-ci-mirrors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash --- old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash 2019-09-09 08:16:15.000000000 +0200 @@ -0,0 +1 @@ +export DIB_RELEASE=15.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/README.rst new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/README.rst --- old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/README.rst 2019-08-21 23:48:06.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/README.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Verify we can build an openSUSE Leap 15.1 image. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/element-deps new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/element-deps --- old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/element-deps 2019-08-21 23:48:06.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/element-deps 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -openstack-ci-mirrors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash --- old/diskimage-builder-2.26.1/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash 2019-08-21 23:48:06.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -export DIB_RELEASE=15.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore new/diskimage-builder-2.27.0/diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore --- old/diskimage-builder-2.26.1/diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore 2019-08-21 23:48:06.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore 2019-09-09 08:16:11.000000000 +0200 @@ -70,9 +70,38 @@ echo "*** SELinux enabled and kauditd not found, suggesting auditing support is disabled in the host kernel. setfiles will fail without this, please enable and rebuild" exit 1 fi - sudo ${_runcon} chroot ${TARGET_ROOT} \ - /usr/sbin/setfiles -F ${_dash_m} \ - /etc/selinux/targeted/contexts/files/file_contexts ${MOUNTPOINT} + + if [[ ${MOUNTPOINT} == "/" ]]; then + # If you don't label /dev, /proc and /sys (the actual, + # on-disk directory in the image) correctly, it will have + # bad effects when things like systemd try to do things + # like make network or process namespaces. This generally + # leads to obscure and hard-to-debug failures; [1] has + # plenty of examples. + # + # But right now, /{dev,proc,sys} are mounted! With the + # extant block-device code, we do not have a point to + # break in when these are unmounted, but before we've + # unmounted everything. So we do a hack; for the root + # directory, we bind mount the target so we see the + # underlying directories, and then run setfiles on that. + # + # XXX: we might be able to uncondtionally do this for all + # mountpoints? leaving well enough alone for now... + # + # [1] https://bugzilla.redhat.com/show_bug.cgi?id=1663040 + TMP_BIND_MOUNT=$(mktemp -d) + sudo mount --bind ${TARGET_ROOT} ${TMP_BIND_MOUNT} + sudo ${_runcon} chroot ${TMP_BIND_MOUNT} \ + /usr/sbin/setfiles -F ${_dash_m} \ + /etc/selinux/targeted/contexts/files/file_contexts / + sudo umount ${TMP_BIND_MOUNT} + sudo rmdir ${TMP_BIND_MOUNT} + else + sudo ${_runcon} chroot ${TARGET_ROOT} \ + /usr/sbin/setfiles -F ${_dash_m} \ + /etc/selinux/targeted/contexts/files/file_contexts ${MOUNTPOINT} + fi fi done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/simple-init/pkg-map new/diskimage-builder-2.27.0/diskimage_builder/elements/simple-init/pkg-map --- old/diskimage-builder-2.26.1/diskimage_builder/elements/simple-init/pkg-map 2019-08-21 23:48:06.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/simple-init/pkg-map 2019-09-09 08:16:11.000000000 +0200 @@ -22,6 +22,9 @@ "fedora": { "29": { "network-scripts": "network-scripts" + }, + "30": { + "network-scripts": "network-scripts" } } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/yum-minimal/README.rst new/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/README.rst --- old/diskimage-builder-2.26.1/diskimage_builder/elements/yum-minimal/README.rst 2019-08-21 23:48:07.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/README.rst 2019-09-09 08:16:11.000000000 +0200 @@ -18,3 +18,7 @@ files to use during bootstrap and build. The repo files should be named with a prefix ``dib-mirror-`` and will be removed from the final image. + +If you wish to include extra repositories, set ``DIB_YUM_MINIMAL_EXTRA_REPOS`` +to a directory with the ``.repo`` files. The repo files will not be removed +from the final image. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/yum-minimal/package-installs.yaml new/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/package-installs.yaml --- old/diskimage-builder-2.26.1/diskimage_builder/elements/yum-minimal/package-installs.yaml 2019-08-21 23:48:07.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/package-installs.yaml 2019-09-09 08:16:15.000000000 +0200 @@ -6,4 +6,8 @@ initscripts: man-pages: lsb_release: -redhat-rpm-config: \ No newline at end of file +redhat-rpm-config: +linux-firmware: + uninstall: true +linux-firmware-whence: + uninstall: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/yum-minimal/pre-install.d/03-yum-cleanup new/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/pre-install.d/03-yum-cleanup --- old/diskimage-builder-2.26.1/diskimage_builder/elements/yum-minimal/pre-install.d/03-yum-cleanup 2019-08-21 23:48:07.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/pre-install.d/03-yum-cleanup 2019-09-09 08:16:15.000000000 +0200 @@ -75,8 +75,6 @@ # docs rm -rf /usr/share/{doc,info,gnome/help} -# cracklib -rm -rf /usr/share/cracklib # i18n rm -rf /usr/share/i18n # sln diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot new/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot --- old/diskimage-builder-2.26.1/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot 2019-08-21 23:48:07.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot 2019-09-09 08:16:11.000000000 +0200 @@ -74,7 +74,7 @@ packages="basesystem filesystem setup " if [[ ${DISTRO_NAME} = fedora && ${DIB_RELEASE} -gt 29 ]]; then - packages+="${DISTRO_NAME}-release-common " + packages+="fedora-release-cloud fedora-release-common " else packages+="${DISTRO_NAME}-release " fi @@ -128,6 +128,10 @@ $TARGET_ROOT/etc/yum.repos.d/ fi + if [[ -n ${DIB_YUM_MINIMAL_EXTRA_REPOS:-} ]]; then + sudo cp ${DIB_YUM_MINIMAL_EXTRA_REPOS}/* \ + $TARGET_ROOT/etc/yum.repos.d/ + fi } # _install_pkg_manager packages... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/lib/disk-image-create new/diskimage-builder-2.27.0/diskimage_builder/lib/disk-image-create --- old/diskimage-builder-2.26.1/diskimage_builder/lib/disk-image-create 2019-08-21 23:48:07.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/lib/disk-image-create 2019-09-09 08:16:15.000000000 +0200 @@ -123,6 +123,7 @@ INSTALL_PACKAGES="" IMAGE_TYPES=("qcow2") COMPRESS_IMAGE="true" +DIB_GZIP_BIN=${DIB_GZIP_BIN:-"gzip"} ROOT_LABEL="" DIB_DEFAULT_INSTALLTYPE=${DIB_DEFAULT_INSTALLTYPE:-"source"} MKFS_OPTS="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/lib/img-functions new/diskimage-builder-2.27.0/diskimage_builder/lib/img-functions --- old/diskimage-builder-2.26.1/diskimage_builder/lib/img-functions 2019-08-21 23:48:07.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/lib/img-functions 2019-09-09 08:16:15.000000000 +0200 @@ -144,7 +144,7 @@ if [ "$IMAGE_TYPE" = "raw" ]; then mv $TMP_IMAGE_PATH $1-new elif [ "$IMAGE_TYPE" == "tgz" ]; then - gzip -9 < $IMAGE_NAME.tar > $1-new + $DIB_GZIP_BIN -9 < $IMAGE_NAME.tar > $1-new rm $IMAGE_NAME.tar elif [ "$IMAGE_TYPE" == "vhd" ]; then cp $TMP_IMAGE_PATH $1-intermediate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder/lib/ramdisk-image-create new/diskimage-builder-2.27.0/diskimage_builder/lib/ramdisk-image-create --- old/diskimage-builder-2.26.1/diskimage_builder/lib/ramdisk-image-create 2019-08-21 23:48:07.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder/lib/ramdisk-image-create 2019-09-09 08:16:15.000000000 +0200 @@ -123,6 +123,7 @@ INSTALL_PACKAGES="" IMAGE_TYPES=("qcow2") COMPRESS_IMAGE="true" +DIB_GZIP_BIN=${DIB_GZIP_BIN:-"gzip"} ROOT_LABEL="" DIB_DEFAULT_INSTALLTYPE=${DIB_DEFAULT_INSTALLTYPE:-"source"} MKFS_OPTS="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder.egg-info/PKG-INFO new/diskimage-builder-2.27.0/diskimage_builder.egg-info/PKG-INFO --- old/diskimage-builder-2.26.1/diskimage_builder.egg-info/PKG-INFO 2019-08-21 23:49:26.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder.egg-info/PKG-INFO 2019-09-09 08:17:06.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: diskimage-builder -Version: 2.26.1 +Version: 2.27.0 Summary: Golden Disk Image builder. Home-page: https://docs.openstack.org/diskimage-builder/latest/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder.egg-info/SOURCES.txt new/diskimage-builder-2.27.0/diskimage_builder.egg-info/SOURCES.txt --- old/diskimage-builder-2.26.1/diskimage_builder.egg-info/SOURCES.txt 2019-08-21 23:49:26.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder.egg-info/SOURCES.txt 2019-09-09 08:17:06.000000000 +0200 @@ -501,16 +501,16 @@ diskimage_builder/elements/opensuse-minimal/element-deps diskimage_builder/elements/opensuse-minimal/element-provides diskimage_builder/elements/opensuse-minimal/environment.d/10-opensuse-distro-name.bash -diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/README.rst -diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/element-deps -diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash +diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/README.rst +diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/element-deps +diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash diskimage_builder/elements/opensuse/environment.d/10-opensuse-distro-name.bash diskimage_builder/elements/opensuse/extra-data.d/01-inject-defaults diskimage_builder/elements/opensuse/root.d/10-opensuse-cloud-image diskimage_builder/elements/opensuse/test-elements/build-succeeds/README.rst diskimage_builder/elements/opensuse/test-elements/build-succeeds/element-deps -diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/README.rst -diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash +diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/README.rst +diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash diskimage_builder/elements/package-installs/README.rst diskimage_builder/elements/package-installs/__init__.py diskimage_builder/elements/package-installs/element-deps @@ -851,6 +851,7 @@ releasenotes/notes/fedora26-690b9fd9ac3c3d4f.yaml releasenotes/notes/gpt-esp-partition-size-200568cb6fcc8788.yaml releasenotes/notes/grub-timeout-1cdd14a2b1467d89.yaml +releasenotes/notes/gzip-env-variable-94e61e0c043f4f1f.yaml releasenotes/notes/harden-sshd-config-3f84556136014f95.yaml releasenotes/notes/image-size-padding-24f88d1c4a215221.yaml releasenotes/notes/image-size-padding-mb-574104d40fdd2345.yaml @@ -883,6 +884,7 @@ releasenotes/notes/ubuntu-arbitrary-images-c796f5c6dbd40679.yaml releasenotes/notes/upgrade-pip-before-c-d2443847f9d58c7a.yaml releasenotes/notes/yum-cache-removal-148c33012515e56e.yaml +releasenotes/notes/yum-minimal-firmware-194846961a6a1cb9.yaml releasenotes/source/conf.py releasenotes/source/index.rst roles/dib-functests/README.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder.egg-info/pbr.json new/diskimage-builder-2.27.0/diskimage_builder.egg-info/pbr.json --- old/diskimage-builder-2.26.1/diskimage_builder.egg-info/pbr.json 2019-08-21 23:49:26.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder.egg-info/pbr.json 2019-09-09 08:17:06.000000000 +0200 @@ -1 +1 @@ -{"git_version": "76b09c84", "is_release": true} \ No newline at end of file +{"git_version": "33a089b0", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/diskimage_builder.egg-info/requires.txt new/diskimage-builder-2.27.0/diskimage_builder.egg-info/requires.txt --- old/diskimage-builder-2.26.1/diskimage_builder.egg-info/requires.txt 2019-08-21 23:49:26.000000000 +0200 +++ new/diskimage-builder-2.27.0/diskimage_builder.egg-info/requires.txt 2019-09-09 08:17:06.000000000 +0200 @@ -1,7 +1,6 @@ Babel!=2.4.0,>=2.3.4 pbr!=2.1.0,>=2.0.0 PyYAML>=3.12 -flake8<2.6.0,>=2.5.4 six>=1.10.0 stevedore>=1.20.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/doc/source/user_guide/building_an_image.rst new/diskimage-builder-2.27.0/doc/source/user_guide/building_an_image.rst --- old/diskimage-builder-2.26.1/doc/source/user_guide/building_an_image.rst 2019-08-21 23:48:07.000000000 +0200 +++ new/diskimage-builder-2.27.0/doc/source/user_guide/building_an_image.rst 2019-09-09 08:16:15.000000000 +0200 @@ -57,6 +57,9 @@ * docker * raw +When building a tgz image, note that the `DIB_GZIP_BIN` environment variable +can be used to set the path of the gzip executable. + Disk Image Layout ----------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/doc/source/user_guide/supported_distros.rst new/diskimage-builder-2.27.0/doc/source/user_guide/supported_distros.rst --- old/diskimage-builder-2.26.1/doc/source/user_guide/supported_distros.rst 2019-08-21 23:48:07.000000000 +0200 +++ new/diskimage-builder-2.27.0/doc/source/user_guide/supported_distros.rst 2019-09-09 08:16:11.000000000 +0200 @@ -5,7 +5,7 @@ - Centos 6, 7 - Debian 8 ("jessie") -- Fedora 28, 29 +- Fedora 28, 29, 30 - RHEL 6, 7 - Ubuntu 14.04 ("trusty") - Gentoo @@ -16,7 +16,7 @@ - Centos 6, 7 - Debian 8 ("jessie") -- Fedora 28, 29 +- Fedora 28, 29, 30 - RHEL 6, 7 - Ubuntu 12.04 ("precise"), 14.04 ("trusty") - Gentoo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/releasenotes/notes/gzip-env-variable-94e61e0c043f4f1f.yaml new/diskimage-builder-2.27.0/releasenotes/notes/gzip-env-variable-94e61e0c043f4f1f.yaml --- old/diskimage-builder-2.26.1/releasenotes/notes/gzip-env-variable-94e61e0c043f4f1f.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.27.0/releasenotes/notes/gzip-env-variable-94e61e0c043f4f1f.yaml 2019-09-09 08:16:15.000000000 +0200 @@ -0,0 +1,5 @@ +--- +features: + - | + The `DIB_GZIP_BIN` environment variable enables builders to change the + path to `gzip`, such as when an alternate gzip is to be used (ie. pigz). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/releasenotes/notes/yum-minimal-firmware-194846961a6a1cb9.yaml new/diskimage-builder-2.27.0/releasenotes/notes/yum-minimal-firmware-194846961a6a1cb9.yaml --- old/diskimage-builder-2.26.1/releasenotes/notes/yum-minimal-firmware-194846961a6a1cb9.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.27.0/releasenotes/notes/yum-minimal-firmware-194846961a6a1cb9.yaml 2019-09-09 08:16:15.000000000 +0200 @@ -0,0 +1,5 @@ +--- +fixes: + - | + The yum-minimal element now removes the linux-firmware and + linux-firmware-whence packages to save space in cloud images. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/requirements.txt new/diskimage-builder-2.27.0/requirements.txt --- old/diskimage-builder-2.26.1/requirements.txt 2019-08-21 23:48:07.000000000 +0200 +++ new/diskimage-builder-2.27.0/requirements.txt 2019-09-09 08:16:15.000000000 +0200 @@ -7,6 +7,5 @@ networkx>=1.10;python_version>='3.4' # BSD pbr!=2.1.0,>=2.0.0 # Apache-2.0 PyYAML>=3.12 # MIT -flake8<2.6.0,>=2.5.4 # MIT six>=1.10.0 # MIT stevedore>=1.20.0 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/test-requirements.txt new/diskimage-builder-2.27.0/test-requirements.txt --- old/diskimage-builder-2.26.1/test-requirements.txt 2019-08-21 23:48:07.000000000 +0200 +++ new/diskimage-builder-2.27.0/test-requirements.txt 2019-09-09 08:16:15.000000000 +0200 @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking<0.11,>=0.10.0 +hacking<1.2.0,>=1.1.0 pylint==1.7.6;python_version=='2.7' # GPLv2 pylint;python_version>'3.0' #GPLv2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.26.1/tests/run_functests.sh new/diskimage-builder-2.27.0/tests/run_functests.sh --- old/diskimage-builder-2.26.1/tests/run_functests.sh 2019-08-21 23:48:07.000000000 +0200 +++ new/diskimage-builder-2.27.0/tests/run_functests.sh 2019-09-09 08:16:15.000000000 +0200 @@ -26,7 +26,7 @@ # These require "zypper" on the host which is not available on # all platforms opensuse-minimal/build-succeeds - opensuse-minimal/opensuse151-build-succeeds + opensuse-minimal/opensuse15-build-succeeds # non-voting; not used by infra currently gentoo/build-succeeds # Needs infra mirroring to move to voting job @@ -38,7 +38,7 @@ # in the gate. Keep them in a -nv job until we can figure out # better caching for the images opensuse/build-succeeds - opensuse/opensuse151-build-succeeds + opensuse/opensuse15-build-succeeds centos7/build-succeeds debian/build-succeeds fedora/build-succeeds