Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package diskimage-builder for openSUSE:Factory checked in at 2023-01-29 14:11:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diskimage-builder (Old) and /work/SRC/openSUSE:Factory/.diskimage-builder.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diskimage-builder" Sun Jan 29 14:11:01 2023 rev:32 rq:1061807 version:3.26.0 Changes: -------- --- /work/SRC/openSUSE:Factory/diskimage-builder/diskimage-builder.changes 2022-12-08 16:52:05.423761062 +0100 +++ /work/SRC/openSUSE:Factory/.diskimage-builder.new.32243/diskimage-builder.changes 2023-01-29 14:27:26.788452685 +0100 @@ -1,0 +2,14 @@ +Sat Jan 28 19:45:48 UTC 2023 - Dirk Müller <[email protected]> + +- update to 3.26.0: + * cache-url: Give up on curl install for Redhat platforms + * Clean up tox.ini for tox v4 + * Grow thin pool metadata by 1GiB + * Add variable for check installing python3 in yum element + * tox jobs: pin to correct nodesets; use host networking for containerfile + * Fix issue in extract image + * Added example configuration + * Added cloud-init growpart element + * Add Rocky 9 ARM64 functional test + +------------------------------------------------------------------- Old: ---- diskimage-builder-3.25.0.tar.gz New: ---- diskimage-builder-3.26.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diskimage-builder.spec ++++++ --- /var/tmp/diff_new_pack.sGz1BF/_old 2023-01-29 14:27:27.168454786 +0100 +++ /var/tmp/diff_new_pack.sGz1BF/_new 2023-01-29 14:27:27.176454830 +0100 @@ -1,7 +1,7 @@ # # spec file for package diskimage-builder # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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: 3.25.0 +Version: 3.26.0 Release: 0 Summary: Image Building Tools for OpenStack License: Apache-2.0 ++++++ diskimage-builder-3.25.0.tar.gz -> diskimage-builder-3.26.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/.zuul.d/jobs.yaml new/diskimage-builder-3.26.0/.zuul.d/jobs.yaml --- old/diskimage-builder-3.25.0/.zuul.d/jobs.yaml 2022-09-21 03:16:06.000000000 +0200 +++ new/diskimage-builder-3.26.0/.zuul.d/jobs.yaml 2023-01-23 04:10:37.000000000 +0100 @@ -61,6 +61,7 @@ - centos-minimal/8-stream-aarch64-build-succeeds - centos-minimal/9-stream-aarch64-build-succeeds - openeuler-minimal/22.03-LTS-build-succeeds + - rocky-container/rocky-9-aarch64-build-succeeds # # Build and boot functional tests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/.zuul.d/project.yaml new/diskimage-builder-3.26.0/.zuul.d/project.yaml --- old/diskimage-builder-3.25.0/.zuul.d/project.yaml 2022-09-21 03:16:06.000000000 +0200 +++ new/diskimage-builder-3.26.0/.zuul.d/project.yaml 2023-01-23 04:10:37.000000000 +0100 @@ -15,8 +15,16 @@ nodes: - name: ubuntu-bionic label: ubuntu-bionic - - tox-py38 - - tox-py39 + - tox-py38: + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + - tox-py39: + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal - tox-py310: nodeset: nodes: @@ -61,8 +69,16 @@ nodes: - name: ubuntu-bionic label: ubuntu-bionic - - tox-py38 - - tox-py39 + - tox-py38: + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + - tox-py39: + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal - tox-py310: nodeset: nodes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/AUTHORS new/diskimage-builder-3.26.0/AUTHORS --- old/diskimage-builder-3.25.0/AUTHORS 2022-09-21 03:16:48.000000000 +0200 +++ new/diskimage-builder-3.26.0/AUTHORS 2023-01-23 04:11:01.000000000 +0100 @@ -95,6 +95,7 @@ Felipe Alencastro <[email protected]> Francois RIGAULT <[email protected]> Frederic Lepied <[email protected]> +Frikin Evgenii <[email protected]> Gabriele Cerami <[email protected]> Gary Duan <[email protected]> Gaëtan Trellu <[email protected]> @@ -295,6 +296,7 @@ Tristan Cacqueray <[email protected]> Uwe Grawert <[email protected]> Van Hung Pham <[email protected]> +Vanou Ishii <[email protected]> Victor Lowther <[email protected]> Vipul Sabhaya <[email protected]> Vu Cong Tuan <[email protected]> @@ -331,6 +333,7 @@ inspurericzhang <[email protected]> jacky06 <[email protected]> janonymous <[email protected]> +jgupta <[email protected]> jodewey <[email protected]> justin-hopper <[email protected]> kaiokassiano <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/ChangeLog new/diskimage-builder-3.26.0/ChangeLog --- old/diskimage-builder-3.25.0/ChangeLog 2022-09-21 03:16:47.000000000 +0200 +++ new/diskimage-builder-3.26.0/ChangeLog 2023-01-23 04:11:01.000000000 +0100 @@ -1,6 +1,19 @@ CHANGES ======= +3.26.0 +------ + +* cache-url: Give up on curl install for Redhat platforms +* Clean up tox.ini for tox v4 +* Grow thin pool metadata by 1GiB +* Add variable for check installing python3 in yum element +* tox jobs: pin to correct nodesets; use host networking for containerfile +* Fix issue in extract image +* Added example configuration +* Added cloud-init growpart element +* Add Rocky 9 ARM64 functional test + 3.25.0 ------ @@ -22,6 +35,7 @@ * rocky : create machine-id in 9 * Allow setting ROOT\_LABEL from environment * Do dmsetup remove device in rollback +* Fix wrong yum.conf name of CentOS 9 Stream 3.23.0 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/PKG-INFO new/diskimage-builder-3.26.0/PKG-INFO --- old/diskimage-builder-3.25.0/PKG-INFO 2022-09-21 03:16:48.618525300 +0200 +++ new/diskimage-builder-3.26.0/PKG-INFO 2023-01-23 04:11:02.195054500 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: diskimage-builder -Version: 3.25.0 +Version: 3.26.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-3.25.0/diskimage_builder/elements/cache-url/README.rst new/diskimage-builder-3.26.0/diskimage_builder/elements/cache-url/README.rst --- old/diskimage-builder-3.25.0/diskimage_builder/elements/cache-url/README.rst 2022-09-21 03:16:06.000000000 +0200 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/cache-url/README.rst 2023-01-23 04:10:37.000000000 +0100 @@ -1,4 +1,10 @@ ========= cache-url ========= + A helper script to download images into a local cache. + +**NOTE** : on RedHat platforms, ensure the curl binary is available. +Due to conflicting differences in platform usage of ```curl-minimal`` +and ```curl``, the usual package dependency methods do not work for +this package. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/cache-url/pkg-map new/diskimage-builder-3.26.0/diskimage_builder/elements/cache-url/pkg-map --- old/diskimage-builder-3.25.0/diskimage_builder/elements/cache-url/pkg-map 2022-09-21 03:16:06.000000000 +0200 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/cache-url/pkg-map 2023-01-23 04:10:37.000000000 +0100 @@ -1,4 +1,9 @@ { + "family": { + "redhat": { + "curl": "" + } + }, "distro": { "gentoo": { "curl": "net-misc/curl" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/centos/pre-install.d/00-02-set-centos-mirror new/diskimage-builder-3.26.0/diskimage_builder/elements/centos/pre-install.d/00-02-set-centos-mirror --- old/diskimage-builder-3.25.0/diskimage_builder/elements/centos/pre-install.d/00-02-set-centos-mirror 2022-09-21 03:16:06.000000000 +0200 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/centos/pre-install.d/00-02-set-centos-mirror 2023-01-23 04:10:37.000000000 +0100 @@ -14,7 +14,11 @@ # The others aren't enabled and do not exist on all mirrors if [[ ${DIB_RELEASE} == '7' ]]; then sed -e "s,^#baseurl=http[s]*://mirror.centos.org/\(centos\|altarch\)/,baseurl=$DIB_DISTRIBUTION_MIRROR/,;/^mirrorlist=/d" -i /etc/yum.repos.d/CentOS-Base.repo -# CentOS Stream releases (e.g. 8-stream, 9-stream) +# CentOS Stream releases (9-stream) +elif [[ ${DIB_RELEASE} =~ '9-stream' ]]; then + sed -e "s,^#baseurl=http[s]*://mirror.centos.org/\$contentdir/,baseurl=$DIB_DISTRIBUTION_MIRROR/,;/^mirrorlist=/d" -i /etc/yum.repos.d/centos.repo + sed -e "s,^#baseurl=http[s]*://mirror.centos.org/\$contentdir/,baseurl=$DIB_DISTRIBUTION_MIRROR/,;/^mirrorlist=/d" -i /etc/yum.repos.d/centos-addons.repo +# CentOS Stream releases (8-stream) elif [[ ${DIB_RELEASE} =~ '-stream' ]]; then sed -e "s,^#baseurl=http[s]*://mirror.centos.org/\$contentdir/,baseurl=$DIB_DISTRIBUTION_MIRROR/,;/^mirrorlist=/d" -i /etc/yum.repos.d/CentOS-Stream-BaseOS.repo sed -e "s,^#baseurl=http[s]*://mirror.centos.org/\$contentdir/,baseurl=$DIB_DISTRIBUTION_MIRROR/,;/^mirrorlist=/d" -i /etc/yum.repos.d/CentOS-Stream-AppStream.repo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/cloud-init-growpart/README.rst new/diskimage-builder-3.26.0/diskimage_builder/elements/cloud-init-growpart/README.rst --- old/diskimage-builder-3.25.0/diskimage_builder/elements/cloud-init-growpart/README.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/cloud-init-growpart/README.rst 2023-01-23 04:10:37.000000000 +0100 @@ -0,0 +1,22 @@ +=================== +cloud-init-growpart +=================== + +This element enables growpart for OS images. It allows to grow +Specific partitions during the deployment process. +To enable this element simply include it in the elements list. + +**Disclaimer:** This element might not work with some device names supplied, for example when server is deployed and the image is written to a fibre channel device, or a SAS/SATA SSD controller. + +* ``DIB_CLOUD_INIT_GROWPART_DEVICES``: List of partition names that needs to be populated in order to be grown by cloud-init. **Populating this variable is mandatory.** + Cloud-init growpart module documentation - https://cloudinit.readthedocs.io/en/latest/topics/modules.html?highlight=growpart#growpart:: + + DIB_CLOUD_INIT_GROWPART_DEVICES: + - /dev/sda1 + - /dev/vda3 + + +Dependencies: + +* ``/usr/bin/growpart``: **is needed on the system in order to grow the partition**, + however it is part of different packages depending on linux family. That is already taken care of by package-installs. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/cloud-init-growpart/element-deps new/diskimage-builder-3.26.0/diskimage_builder/elements/cloud-init-growpart/element-deps --- old/diskimage-builder-3.25.0/diskimage_builder/elements/cloud-init-growpart/element-deps 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/cloud-init-growpart/element-deps 2023-01-23 04:10:37.000000000 +0100 @@ -0,0 +1,2 @@ +package-installs +pkg-map diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/cloud-init-growpart/package-installs.yaml new/diskimage-builder-3.26.0/diskimage_builder/elements/cloud-init-growpart/package-installs.yaml --- old/diskimage-builder-3.25.0/diskimage_builder/elements/cloud-init-growpart/package-installs.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/cloud-init-growpart/package-installs.yaml 2023-01-23 04:10:37.000000000 +0100 @@ -0,0 +1 @@ +growpart_package: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/cloud-init-growpart/pkg-map new/diskimage-builder-3.26.0/diskimage_builder/elements/cloud-init-growpart/pkg-map --- old/diskimage-builder-3.25.0/diskimage_builder/elements/cloud-init-growpart/pkg-map 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/cloud-init-growpart/pkg-map 2023-01-23 04:10:37.000000000 +0100 @@ -0,0 +1,10 @@ +{ + "family": { + "redhat": { + "growpart_package": "cloud-utils-growpart" + }, + "debian": { + "growpart_package": "cloud-guest-utils" + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/cloud-init-growpart/post-install.d/55-growpart new/diskimage-builder-3.26.0/diskimage_builder/elements/cloud-init-growpart/post-install.d/55-growpart --- old/diskimage-builder-3.25.0/diskimage_builder/elements/cloud-init-growpart/post-install.d/55-growpart 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/cloud-init-growpart/post-install.d/55-growpart 2023-01-23 04:10:37.000000000 +0100 @@ -0,0 +1,25 @@ +#!/bin/bash + +if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then + set -x +fi +set -eu +set -o pipefail + +if [[ -n ${DIB_CLOUD_INIT_GROWPART_DEVICES} ]]; then + if [ -d /etc/cloud/cloud.cfg.d ]; then + cat > /etc/cloud/cloud.cfg.d/55-growpart.cfg <<EOF +#cloud-config +growpart: + mode: auto + devices: $DIB_CLOUD_INIT_GROWPART_DEVICES + ignore_growroot_disabled: false +EOF + else + echo "The /etc/cloud/cloud.cfg.d directory must exist." + exit 1 + fi +else + echo "Set the device list in DIB_CLOUD_INIT_GROWPART_DEVICES." + exit 1 +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/cloud-init-growpart/releasenotes/notes/added_growpart_for_lvm-0ce76ba71710c720.yaml new/diskimage-builder-3.26.0/diskimage_builder/elements/cloud-init-growpart/releasenotes/notes/added_growpart_for_lvm-0ce76ba71710c720.yaml --- old/diskimage-builder-3.25.0/diskimage_builder/elements/cloud-init-growpart/releasenotes/notes/added_growpart_for_lvm-0ce76ba71710c720.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/cloud-init-growpart/releasenotes/notes/added_growpart_for_lvm-0ce76ba71710c720.yaml 2023-01-23 04:10:37.000000000 +0100 @@ -0,0 +1,7 @@ +--- +features: + - | + Added growpart element. It allows for growing specific partitions + during the deployment, which will result in less post deploy actions + needed for the server to be ready for use. + \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/containerfile/root.d/08-containerfile new/diskimage-builder-3.26.0/diskimage_builder/elements/containerfile/root.d/08-containerfile --- old/diskimage-builder-3.25.0/diskimage_builder/elements/containerfile/root.d/08-containerfile 2022-09-21 03:16:06.000000000 +0200 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/containerfile/root.d/08-containerfile 2023-01-23 04:10:37.000000000 +0100 @@ -28,8 +28,13 @@ DIB_CONTAINERFILE_RUNTIME_ROOT=1 fi +# NOTE(ianw) 2022-12-15 : this used to be left blank, but we've found +# with current podman this is the only reliable way to get networking +# in the container we're building (needed for yum update, package +# install, etc.). It's less secure, but we're already running in a +# priviledged container ... if [[ -z "${DIB_CONTAINERFILE_NETWORK_DRIVER:-}" ]]; then - DIB_CONTAINERFILE_RUNTIME_NETWORK="" + DIB_CONTAINERFILE_RUNTIME_NETWORK="--network host" else DIB_CONTAINERFILE_RUNTIME_NETWORK="--network ${DIB_CONTAINERFILE_NETWORK_DRIVER:-}" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/growvols/static/usr/local/sbin/growvols new/diskimage-builder-3.26.0/diskimage_builder/elements/growvols/static/usr/local/sbin/growvols --- old/diskimage-builder-3.25.0/diskimage_builder/elements/growvols/static/usr/local/sbin/growvols 2022-09-21 03:16:06.000000000 +0200 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/growvols/static/usr/local/sbin/growvols 2023-01-23 04:10:37.000000000 +0100 @@ -36,12 +36,22 @@ UNITS.extend(UNIT_BYTES.keys()) AMOUNT_UNIT_RE = re.compile('^([0-9]+)(%s)$' % '|'.join(UNITS)) +UNIT_BYTES_FORMAT = { + 'B': 1, + 'KiB': 1024, + 'MiB': 1048576, + 'GiB': 1073741824 +} + # Only create growth partition if there is at least 1GiB available MIN_DISK_SPACE_BYTES = UNIT_BYTES['GiB'] # Default LVM physical extent size is 4MiB PHYSICAL_EXTENT_BYTES = 4 * UNIT_BYTES['MiB'] +# Grow the thin pool metadata size to 1GiB +POOL_METADATA_SIZE = UNIT_BYTES['GiB'] + class Command(object): """ An object to represent a command to run with associated comment """ @@ -172,13 +182,13 @@ def convert_bytes(num): - """Format a bytes amount with units MB, GB etc""" - step_unit = 1000.0 - - for x in ['B', 'KB', 'MB', 'GB', 'TB']: - if num < step_unit: - return "%d%s" % (num, x) - num /= step_unit + """Format a bytes amount with units GiB, MiB etc""" + for x in ['GiB', 'MiB', 'KiB', 'B']: + unit = UNIT_BYTES_FORMAT[x] + unit_num = num // unit + if unit_num > 0: + break + return "%d%s" % (unit_num, x) def execute(cmd): @@ -499,9 +509,14 @@ group = find_group(opts) partnum = find_next_partnum(devices, disk_name) devname = find_next_device_name(devices, disk_name, partnum) + thin_pool = find_thin_pool(devices, group) + if thin_pool: + # total size available, reduced by POOL_METADATA_SIZE + # rounded down to whole extent + size_bytes -= POOL_METADATA_SIZE + size_bytes -= size_bytes % PHYSICAL_EXTENT_BYTES dev_path = '/dev/%s' % devname grow_vols = find_grow_vols(opts, devices, group, size_bytes) - thin_pool = find_thin_pool(devices, group) commands = [] @@ -528,14 +543,20 @@ ], 'Add physical volume %s to group %s' % (devname, group))) if thin_pool: - # total size available, rounded down to whole extents - pool_size = size_bytes - size_bytes % PHYSICAL_EXTENT_BYTES commands.append(Command([ 'lvextend', - '-L+%sB' % pool_size, + '--poolmetadatasize', + '+%sB' % POOL_METADATA_SIZE, + thin_pool, + dev_path + ], 'Add %s to thin pool metadata %s' % ( + convert_bytes(POOL_METADATA_SIZE), thin_pool))) + commands.append(Command([ + 'lvextend', + '-L+%sB' % size_bytes, thin_pool, dev_path - ], 'Add %s to thin pool %s' % (convert_bytes(pool_size), + ], 'Add %s to thin pool %s' % (convert_bytes(size_bytes), thin_pool))) for volume_path, size_bytes in grow_vols.items(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/growvols/tests/test_growvols.py new/diskimage-builder-3.26.0/diskimage_builder/elements/growvols/tests/test_growvols.py --- old/diskimage-builder-3.25.0/diskimage_builder/elements/growvols/tests/test_growvols.py 2022-09-21 03:16:06.000000000 +0200 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/growvols/tests/test_growvols.py 2023-01-23 04:10:37.000000000 +0100 @@ -147,10 +147,10 @@ def test_convert_bytes(self): self.assertEqual('100B', growvols.convert_bytes(100)) - self.assertEqual('1KB', growvols.convert_bytes(1000)) - self.assertEqual('2MB', growvols.convert_bytes(2000000)) - self.assertEqual('3GB', growvols.convert_bytes(3000000000)) - self.assertEqual('4TB', growvols.convert_bytes(4000000000000)) + self.assertEqual('1000B', growvols.convert_bytes(1000)) + self.assertEqual('1MiB', growvols.convert_bytes(2000000)) + self.assertEqual('2GiB', growvols.convert_bytes(3000000000)) + self.assertEqual('3725GiB', growvols.convert_bytes(4000000000000)) @mock.patch('subprocess.Popen') def test_execute(self, mock_popen): @@ -582,7 +582,7 @@ SGDISK_LARGEST, VGS, LVS_THIN, - '', '', '', '', '', '', '', '', '', '', '' + '', '', '', '', '', '', '', '', '', '', '', '' ] growvols.main(['growvols', '--yes', '--group', 'vg', '/home=20%', 'fs_var=40%']) @@ -599,13 +599,15 @@ mock.call(['partprobe']), mock.call(['pvcreate', '/dev/sda5']), mock.call(['vgextend', 'vg', '/dev/sda5']), - mock.call(['lvextend', '-L+209404821504B', + mock.call(['lvextend', '--poolmetadatasize', '+1073741824B', '/dev/mapper/vg-lv_thinpool', '/dev/sda5']), - mock.call(['lvextend', '--size', '+41880125440B', + mock.call(['lvextend', '-L+208331079680B', + '/dev/mapper/vg-lv_thinpool', '/dev/sda5']), + mock.call(['lvextend', '--size', '+41666215936B', '/dev/mapper/vg-lv_home']), - mock.call(['lvextend', '--size', '+83760250880B', + mock.call(['lvextend', '--size', '+83332431872B', '/dev/mapper/vg-lv_var']), - mock.call(['lvextend', '--size', '+83764445184B', + mock.call(['lvextend', '--size', '+83332431872B', '/dev/mapper/vg-lv_root']), mock.call(['xfs_growfs', '/dev/mapper/vg-lv_home']), mock.call(['xfs_growfs', '/dev/mapper/vg-lv_var']), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/README.rst new/diskimage-builder-3.26.0/diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/README.rst --- old/diskimage-builder-3.25.0/diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/README.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/README.rst 2023-01-23 04:10:37.000000000 +0100 @@ -0,0 +1 @@ +Verify a Rocky 9 aarch64 image diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/element-deps new/diskimage-builder-3.26.0/diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/element-deps --- old/diskimage-builder-3.25.0/diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/element-deps 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/element-deps 2023-01-23 04:10:37.000000000 +0100 @@ -0,0 +1,3 @@ +block-device-efi +openstack-ci-mirrors +vm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/environment.d/09-set-distro.bash new/diskimage-builder-3.26.0/diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/environment.d/09-set-distro.bash --- old/diskimage-builder-3.25.0/diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/environment.d/09-set-distro.bash 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/environment.d/09-set-distro.bash 2023-01-23 04:10:37.000000000 +0100 @@ -0,0 +1 @@ +export DIB_RELEASE='9' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/sysprep/bin/extract-image new/diskimage-builder-3.26.0/diskimage_builder/elements/sysprep/bin/extract-image --- old/diskimage-builder-3.25.0/diskimage_builder/elements/sysprep/bin/extract-image 2022-09-21 03:16:06.000000000 +0200 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/sysprep/bin/extract-image 2023-01-23 04:10:37.000000000 +0100 @@ -97,9 +97,9 @@ fi for LOOPDEV in ${LOOPDEVS}; do - fstype=$(lsblk --all --nodeps --noheadings --output FSTYPE $LOOPDEV) - label=$(lsblk --all --nodeps --noheadings --output LABEL $LOOPDEV) - part_type=$(lsblk --all --nodeps --noheadings --output PARTTYPE $LOOPDEV) + fstype=$(sudo blkid -o value -s TYPE -p "${LOOPDEV}" 2>/dev/null) + label=$(sudo blkid -o value -s LABEL -p "${LOOPDEV}" 2>/dev/null) + part_type=$(sudo blkid -o value -s PART_ENTRY_TYPE -p "${LOOPDEV}" 2>/dev/null) if [ -z "${fstype}" ]; then # Ignore block device with no filesystem type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/yum/README.rst new/diskimage-builder-3.26.0/diskimage_builder/elements/yum/README.rst --- old/diskimage-builder-3.25.0/diskimage_builder/elements/yum/README.rst 2022-09-21 03:16:06.000000000 +0200 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/yum/README.rst 2023-01-23 04:10:37.000000000 +0100 @@ -22,20 +22,22 @@ a yum available package or a URL to an rpm file. This package can install repo files with any associated keys and certificates. -Environment Variables for Module Selection during Image Creation ----------------------------------------------------------------- -The following environment variable is used to select module streams to be -enabled during an image build on Yum/DNF based distributions. Any existing -stream for the given module is first disabled prior to enabling -the specified stream. +Environment Variables +--------------------- -#### DIB\_DNF\_MODULE\_STREAMS -This is a space-separated list of module streams to enable prior to any -RPMs being installed. +DIB_DNF_MODULE_STREAMS + :Required: No + :Default: None + :Description: The following environment variable is used to select module streams + to be enabled during an image build on Yum/DNF based distributions.Any existing + stream for the given module is first disabled prior to enabling the specified + stream. + :Example: ``DIB_DNF_MODULE_STREAMS='virt:8.2 container-tools:3.0'`` -Image Build Module Selection Example ------------------------------------- -When using Train release on RHEL/CentOS/Fedora, one must select the appropriate -virt and container-tools module streams: +DIB_CENTOS_7_PREINSTALL_EPEL_URL_PACKAGE + :Required: No + :Default: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + :Description: The environment variable is used to override default value in pre-install + stage to install epel repository from custom source + :Example: ``DIB_CENTOS_7_PREINSTALL_EPEL_URL_PACKAGE=http://repos.example.com/epel/epel-latest-7.noarch.rpm`` -DIB_DNF_MODULE_STREAMS='virt:8.2 container-tools:3.0' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder/elements/yum/pre-install.d/01-00-centos-python3 new/diskimage-builder-3.26.0/diskimage_builder/elements/yum/pre-install.d/01-00-centos-python3 --- old/diskimage-builder-3.25.0/diskimage_builder/elements/yum/pre-install.d/01-00-centos-python3 2022-09-21 03:16:06.000000000 +0200 +++ new/diskimage-builder-3.26.0/diskimage_builder/elements/yum/pre-install.d/01-00-centos-python3 2023-01-23 04:10:37.000000000 +0100 @@ -17,7 +17,7 @@ # early stage. yum install -y python3 # NOTE(dpawlik) The epel-release package is not available in RHEL. - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + yum install -y ${DIB_CENTOS_7_PREINSTALL_EPEL_URL_PACKAGE:-https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm} yum install -y python36-PyYAML yum remove -y epel-release elif [[ ${DISTRO_NAME} =~ (centos|rhel) && ${DIB_RELEASE} > 7 ]]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder.egg-info/PKG-INFO new/diskimage-builder-3.26.0/diskimage_builder.egg-info/PKG-INFO --- old/diskimage-builder-3.25.0/diskimage_builder.egg-info/PKG-INFO 2022-09-21 03:16:48.000000000 +0200 +++ new/diskimage-builder-3.26.0/diskimage_builder.egg-info/PKG-INFO 2023-01-23 04:11:01.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: diskimage-builder -Version: 3.25.0 +Version: 3.26.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-3.25.0/diskimage_builder.egg-info/SOURCES.txt new/diskimage-builder-3.26.0/diskimage_builder.egg-info/SOURCES.txt --- old/diskimage-builder-3.25.0/diskimage_builder.egg-info/SOURCES.txt 2022-09-21 03:16:48.000000000 +0200 +++ new/diskimage-builder-3.26.0/diskimage_builder.egg-info/SOURCES.txt 2023-01-23 04:11:01.000000000 +0100 @@ -199,6 +199,12 @@ diskimage_builder/elements/cloud-init-disable-resizefs/README.rst diskimage_builder/elements/cloud-init-disable-resizefs/post-install.d/50-cloud-init-disable-resizefs diskimage_builder/elements/cloud-init-disable-resizefs/post-install.d/51-cloud-init-disable-growpart +diskimage_builder/elements/cloud-init-growpart/README.rst +diskimage_builder/elements/cloud-init-growpart/element-deps +diskimage_builder/elements/cloud-init-growpart/package-installs.yaml +diskimage_builder/elements/cloud-init-growpart/pkg-map +diskimage_builder/elements/cloud-init-growpart/post-install.d/55-growpart +diskimage_builder/elements/cloud-init-growpart/releasenotes/notes/added_growpart_for_lvm-0ce76ba71710c720.yaml diskimage_builder/elements/cloud-init-nocloud/README.rst diskimage_builder/elements/cloud-init-nocloud/element-deps diskimage_builder/elements/cloud-init-nocloud/environment.d/10-cloud-init-nocloud.bash @@ -716,6 +722,9 @@ diskimage_builder/elements/rocky-container/environment.d/11-yum-dnf.bash diskimage_builder/elements/rocky-container/test-elements/build-succeeds/README.rst diskimage_builder/elements/rocky-container/test-elements/build-succeeds/element-deps +diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/README.rst +diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/element-deps +diskimage_builder/elements/rocky-container/test-elements/rocky-9-aarch64-build-succeeds/environment.d/09-set-distro.bash diskimage_builder/elements/rpm-distro/README.rst diskimage_builder/elements/rpm-distro/cleanup.d/99-selinux-fixfiles-restore diskimage_builder/elements/rpm-distro/post-install.d/06-network-config-nonzeroconf @@ -993,6 +1002,7 @@ releasenotes/notes/centos-minimal-8-stream-97021a2c92463dde.yaml releasenotes/notes/centos-retired-f17ae9f6f03e57e3.yaml releasenotes/notes/cloud-init-resizefs-growpart-e820b8c7f3adb78b.yaml +releasenotes/notes/containerfile-host-networking-0691f3be5c6b11b6.yaml releasenotes/notes/containerfile-root-extraction-430148dd669cb3da.yaml releasenotes/notes/create-945440b17d500bf5.yaml releasenotes/notes/dash-p-after-install-58a87549c1c906c3.yaml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/diskimage_builder.egg-info/pbr.json new/diskimage-builder-3.26.0/diskimage_builder.egg-info/pbr.json --- old/diskimage-builder-3.25.0/diskimage_builder.egg-info/pbr.json 2022-09-21 03:16:48.000000000 +0200 +++ new/diskimage-builder-3.26.0/diskimage_builder.egg-info/pbr.json 2023-01-23 04:11:01.000000000 +0100 @@ -1 +1 @@ -{"git_version": "2a25db9e", "is_release": true} \ No newline at end of file +{"git_version": "2c4d230d", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/releasenotes/notes/containerfile-host-networking-0691f3be5c6b11b6.yaml new/diskimage-builder-3.26.0/releasenotes/notes/containerfile-host-networking-0691f3be5c6b11b6.yaml --- old/diskimage-builder-3.25.0/releasenotes/notes/containerfile-host-networking-0691f3be5c6b11b6.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-3.26.0/releasenotes/notes/containerfile-host-networking-0691f3be5c6b11b6.yaml 2023-01-23 04:10:37.000000000 +0100 @@ -0,0 +1,6 @@ +--- +upgrade: + - | + The default networking in the ``containerfile`` element is + switched to ``host`` as we have found that more reliable in + generating the initial chroot images. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-3.25.0/tox.ini new/diskimage-builder-3.26.0/tox.ini --- old/diskimage-builder-3.25.0/tox.ini 2022-09-21 03:16:06.000000000 +0200 +++ new/diskimage-builder-3.26.0/tox.ini 2023-01-23 04:10:37.000000000 +0100 @@ -1,12 +1,10 @@ [tox] envlist = pep8,linters,py3 minversion = 3.18.0 -skipsdist = True ignore_basepython_conflict = True [testenv] usedevelop = True -basepython = python3 deps= -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt @@ -32,7 +30,6 @@ commands = {toxinidir}/tests/run_functests.sh {posargs} [testenv:cover] -basepython = python3 allowlist_externals = find setenv = PYTHON=coverage run --source diskimage_builder --parallel-mode @@ -50,7 +47,6 @@ -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt -basepython = python3 allowlist_externals = rm commands =
