diff -Nru python-diskimage-builder-3.24.0/AUTHORS python-diskimage-builder-3.25.0/AUTHORS --- python-diskimage-builder-3.24.0/AUTHORS 2022-08-26 06:21:18.000000000 +0000 +++ python-diskimage-builder-3.25.0/AUTHORS 2022-09-21 01:16:48.000000000 +0000 @@ -237,6 +237,7 @@ Quique Llorente Rafael Folco Rafael Folco +Rafal Lewandowski Ralf Haferkamp Ramakrishnan G Ramil Minishev @@ -313,6 +314,7 @@ Zhangfei Gao Zhao Lei Zhiguo Deng +annumishra_17 aweiteka azvyagintsev caoyuan diff -Nru python-diskimage-builder-3.24.0/ChangeLog python-diskimage-builder-3.25.0/ChangeLog --- python-diskimage-builder-3.24.0/ChangeLog 2022-08-26 06:21:18.000000000 +0000 +++ python-diskimage-builder-3.25.0/ChangeLog 2022-09-21 01:16:47.000000000 +0000 @@ -1,6 +1,15 @@ CHANGES ======= +3.25.0 +------ + +* Start running dib-lint again +* Install Fedora ifcfg NM compat package +* added elrepo element +* changed release check logic in lvm element +* Allow flake8 version 5 + 3.24.0 ------ @@ -18,6 +27,7 @@ ------ * Add Rockylinux 9 build configuration and update jobs for 8 and 9 +* Add subscription-manager repo names for RHEL-9 * Disable the opensuse functest * Upgrade openEuler to 22.03 LTS * rockylinux : create machine-id early diff -Nru python-diskimage-builder-3.24.0/debian/changelog python-diskimage-builder-3.25.0/debian/changelog --- python-diskimage-builder-3.24.0/debian/changelog 2022-09-08 21:30:01.000000000 +0000 +++ python-diskimage-builder-3.25.0/debian/changelog 2022-12-16 14:32:46.000000000 +0000 @@ -1,3 +1,15 @@ +python-diskimage-builder (3.25.0-0ubuntu1~bpo23.04.1~ppa202212160932) lunar; urgency=medium + + * No-change backport to lunar. + + -- Corey Bryant Fri, 16 Dec 2022 09:32:46 -0500 + +python-diskimage-builder (3.25.0-0ubuntu1) lunar; urgency=medium + + * New upstream release for OpenStack Antelope. + + -- Corey Bryant Thu, 15 Dec 2022 14:17:28 -0500 + python-diskimage-builder (3.24.0-0ubuntu1) kinetic; urgency=medium * New upstream release for OpenStack Zed. diff -Nru python-diskimage-builder-3.24.0/diskimage_builder/block_device/tests/test_lvm.py python-diskimage-builder-3.25.0/diskimage_builder/block_device/tests/test_lvm.py --- python-diskimage-builder-3.24.0/diskimage_builder/block_device/tests/test_lvm.py 2022-08-26 06:20:38.000000000 +0000 +++ python-diskimage-builder-3.25.0/diskimage_builder/block_device/tests/test_lvm.py 2022-09-21 01:16:06.000000000 +0000 @@ -60,7 +60,7 @@ LVMPlugin, bad_config, {}, {}) bad_config = copy.deepcopy(lvm_config) - del(bad_config['lvs'][0]['size']) + del bad_config['lvs'][0]['size'] self.assertRaisesRegex(BlockDeviceSetupException, "Missing 'size' or 'extents' in lvs config", LVMPlugin, bad_config, {}, {}) diff -Nru python-diskimage-builder-3.24.0/diskimage_builder/element_dependencies.py python-diskimage-builder-3.25.0/diskimage_builder/element_dependencies.py --- python-diskimage-builder-3.24.0/diskimage_builder/element_dependencies.py 2022-08-26 06:20:38.000000000 +0000 +++ python-diskimage-builder-3.25.0/diskimage_builder/element_dependencies.py 2022-09-21 01:16:06.000000000 +0000 @@ -178,7 +178,7 @@ raise MissingOSException("Please include an operating system element") out = final_elements - provided - return([all_elements[element] for element in out]) + return [all_elements[element] for element in out] def _find_all_elements(paths=None): diff -Nru python-diskimage-builder-3.24.0/diskimage_builder/elements/elrepo/pre-install.d/01-elrepo python-diskimage-builder-3.25.0/diskimage_builder/elements/elrepo/pre-install.d/01-elrepo --- python-diskimage-builder-3.24.0/diskimage_builder/elements/elrepo/pre-install.d/01-elrepo 1970-01-01 00:00:00.000000000 +0000 +++ python-diskimage-builder-3.25.0/diskimage_builder/elements/elrepo/pre-install.d/01-elrepo 2022-09-21 01:16:06.000000000 +0000 @@ -0,0 +1,23 @@ +#!/bin/bash + +if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then + set -x +fi + +set -eu +set -o pipefail + +case "$DISTRO_NAME" in + centos* | rhel* | rocky*) + dnf install -y elrepo-release.noarch + if [ ${DIB_ELREPO_KERNEL:-0} -eq 1 ]; then + rpm -q dnf-plugins-core || dnf install -y dnf-plugins-core + dnf config-manager --set-enabled "elrepo-kernel" + fi + ;; + *) + echo "Distro \"$DISTRO_NAME\" is not supported" + exit 1 + ;; +esac +exit 0 diff -Nru python-diskimage-builder-3.24.0/diskimage_builder/elements/elrepo/README.rst python-diskimage-builder-3.25.0/diskimage_builder/elements/elrepo/README.rst --- python-diskimage-builder-3.24.0/diskimage_builder/elements/elrepo/README.rst 1970-01-01 00:00:00.000000000 +0000 +++ python-diskimage-builder-3.25.0/diskimage_builder/elements/elrepo/README.rst 2022-09-21 01:16:06.000000000 +0000 @@ -0,0 +1,10 @@ +====== +ELRepo +====== + +Enables ELRepo, a community based repository for Enterprise Linux Packages with a focus +on drivers for hardware such as network interface cards. RHEL/CentOS versions pior to 8 +are not supported. + +* ``DIB_ELREPO_KERNEL`` Whether elrepo-kernel repository containing kernel-ml packages + should be enabled (1) or disabled. Default is disabled (0). diff -Nru python-diskimage-builder-3.24.0/diskimage_builder/elements/lvm/root.d/10-lvm-check-distro python-diskimage-builder-3.25.0/diskimage_builder/elements/lvm/root.d/10-lvm-check-distro --- python-diskimage-builder-3.24.0/diskimage_builder/elements/lvm/root.d/10-lvm-check-distro 2022-08-26 06:20:38.000000000 +0000 +++ python-diskimage-builder-3.25.0/diskimage_builder/elements/lvm/root.d/10-lvm-check-distro 2022-09-21 01:16:06.000000000 +0000 @@ -11,7 +11,7 @@ exit 1 fi -if [[ ! $DIB_RELEASE =~ (xenial|bionic|focal) ]]; then - echo "Only xenial/bionic/focal are supported for LVM support. The DIB_RELEASE is set to $DIB_RELEASE" +if [[ $DIB_RELEASE =~ trusty ]]; then + echo "Trusty release does not have LVM support. The DIB_RELEASE is set to $DIB_RELEASE" exit 1 fi diff -Nru python-diskimage-builder-3.24.0/diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration python-diskimage-builder-3.25.0/diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration --- python-diskimage-builder-3.24.0/diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration 2022-08-26 06:20:38.000000000 +0000 +++ python-diskimage-builder-3.25.0/diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration 2022-09-21 01:16:06.000000000 +0000 @@ -23,6 +23,9 @@ base_repos="rhel-8-for-${arch}-appstream-rpms rhel-8-for-${arch}-baseos-rpms" fi satellite_repo="satellite-tools-6.5-for-rhel-8-${arch}-rpms" +elif [ "${DIB_RELEASE}" == "9" ]; then + base_repos="rhel-9-for-${arch}-appstream-rpms rhel-9-for-${arch}-baseos-rpms" + satellite_repo="rhel-9-for-${arch}-highavailability-rpms" fi REG_SAT_CERT=${REG_SAT_CERT:-"katello-ca-consumer-latest.noarch.rpm"} diff -Nru python-diskimage-builder-3.24.0/diskimage_builder/elements/simple-init/package-installs.yaml python-diskimage-builder-3.25.0/diskimage_builder/elements/simple-init/package-installs.yaml --- python-diskimage-builder-3.24.0/diskimage_builder/elements/simple-init/package-installs.yaml 2022-08-26 06:20:38.000000000 +0000 +++ python-diskimage-builder-3.25.0/diskimage_builder/elements/simple-init/package-installs.yaml 2022-09-21 01:16:06.000000000 +0000 @@ -5,3 +5,5 @@ when: DIB_SIMPLE_INIT_NETWORKMANAGER = 0 NetworkManager: when: DIB_SIMPLE_INIT_NETWORKMANAGER != 0 +NetworkManager-initscripts-ifcfg-rh: + when: DIB_SIMPLE_INIT_NETWORKMANAGER != 0 diff -Nru python-diskimage-builder-3.24.0/diskimage_builder/elements/simple-init/pkg-map python-diskimage-builder-3.25.0/diskimage_builder/elements/simple-init/pkg-map --- python-diskimage-builder-3.24.0/diskimage_builder/elements/simple-init/pkg-map 2022-08-26 06:20:38.000000000 +0000 +++ python-diskimage-builder-3.25.0/diskimage_builder/elements/simple-init/pkg-map 2022-09-21 01:16:06.000000000 +0000 @@ -24,9 +24,20 @@ "network-scripts": "network-scripts" } }, + "release": { + "fedora": { + "36": { + "NetworkManager-initscripts-ifcfg-rh": "NetworkManager-initscripts-ifcfg-rh" + }, + "37": { + "NetworkManager-initscripts-ifcfg-rh": "NetworkManager-initscripts-ifcfg-rh" + } + } + }, "default": { "dhcp-client": "isc-dhcp-client", "ifupdown": "", - "network-scripts": "" + "network-scripts": "", + "NetworkManager-initscripts-ifcfg-rh": "" } } diff -Nru python-diskimage-builder-3.24.0/diskimage_builder.egg-info/pbr.json python-diskimage-builder-3.25.0/diskimage_builder.egg-info/pbr.json --- python-diskimage-builder-3.24.0/diskimage_builder.egg-info/pbr.json 2022-08-26 06:21:18.000000000 +0000 +++ python-diskimage-builder-3.25.0/diskimage_builder.egg-info/pbr.json 2022-09-21 01:16:48.000000000 +0000 @@ -1 +1 @@ -{"git_version": "833c5b8c", "is_release": true} \ No newline at end of file +{"git_version": "2a25db9e", "is_release": true} \ No newline at end of file diff -Nru python-diskimage-builder-3.24.0/diskimage_builder.egg-info/PKG-INFO python-diskimage-builder-3.25.0/diskimage_builder.egg-info/PKG-INFO --- python-diskimage-builder-3.24.0/diskimage_builder.egg-info/PKG-INFO 2022-08-26 06:21:18.000000000 +0000 +++ python-diskimage-builder-3.25.0/diskimage_builder.egg-info/PKG-INFO 2022-09-21 01:16:48.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: diskimage-builder -Version: 3.24.0 +Version: 3.25.0 Summary: Golden Disk Image builder. Home-page: https://docs.openstack.org/diskimage-builder/latest/ Author: OpenStack diff -Nru python-diskimage-builder-3.24.0/diskimage_builder.egg-info/requires.txt python-diskimage-builder-3.25.0/diskimage_builder.egg-info/requires.txt --- python-diskimage-builder-3.24.0/diskimage_builder.egg-info/requires.txt 2022-08-26 06:21:18.000000000 +0000 +++ python-diskimage-builder-3.25.0/diskimage_builder.egg-info/requires.txt 2022-09-21 01:16:48.000000000 +0000 @@ -1,5 +1,5 @@ PyYAML>=3.12 -flake8<4.0.0,>=3.6.0 +flake8<6.0.0,>=3.6.0 networkx>=2.3.0 pbr!=2.1.0,>=2.0.0 stevedore>=1.20.0 diff -Nru python-diskimage-builder-3.24.0/diskimage_builder.egg-info/SOURCES.txt python-diskimage-builder-3.25.0/diskimage_builder.egg-info/SOURCES.txt --- python-diskimage-builder-3.24.0/diskimage_builder.egg-info/SOURCES.txt 2022-08-26 06:21:19.000000000 +0000 +++ python-diskimage-builder-3.25.0/diskimage_builder.egg-info/SOURCES.txt 2022-09-21 01:16:48.000000000 +0000 @@ -366,6 +366,8 @@ diskimage_builder/elements/element-manifest/README.rst diskimage_builder/elements/element-manifest/element-deps diskimage_builder/elements/element-manifest/extra-data.d/75-inject-element-manifest +diskimage_builder/elements/elrepo/README.rst +diskimage_builder/elements/elrepo/pre-install.d/01-elrepo diskimage_builder/elements/enable-serial-console/README.rst diskimage_builder/elements/enable-serial-console/cleanup.d/99-fix-grub diskimage_builder/elements/enable-serial-console/install.d/20-stty @@ -1017,6 +1019,7 @@ releasenotes/notes/element-info-entry-point-448bf622be6061a0.yaml releasenotes/notes/element-override-ccda78c24ab4a4ff.yaml releasenotes/notes/element-vars-c6bf2e6795002f01.yaml +releasenotes/notes/elrepo-element-85b32f6f496234d7.yaml releasenotes/notes/ensure-venv-d7c16a2a04fd3b8f.yaml releasenotes/notes/fedora26-690b9fd9ac3c3d4f.yaml releasenotes/notes/fedora32-9dfa4d9d4dcce1ff.yaml @@ -1032,6 +1035,7 @@ releasenotes/notes/improve-ubuntu-minimal-docs-b4c20a37a4daea2f.yaml releasenotes/notes/incorrect-grub-label-5d2000215c0cc73e.yaml releasenotes/notes/init-ibft-interfaces-9458d97dfcecc3ae.yaml +releasenotes/notes/jammy-lvm-addition-53165b39e144544d.yaml releasenotes/notes/journal-console-752b46542ec5595e.yaml releasenotes/notes/logfile-quiet-b18f2de4059eecfd.yaml releasenotes/notes/lvm-size-unit-c6b790b87d15c53d.yaml diff -Nru python-diskimage-builder-3.24.0/PKG-INFO python-diskimage-builder-3.25.0/PKG-INFO --- python-diskimage-builder-3.24.0/PKG-INFO 2022-08-26 06:21:19.211551200 +0000 +++ python-diskimage-builder-3.25.0/PKG-INFO 2022-09-21 01:16:48.618525300 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: diskimage-builder -Version: 3.24.0 +Version: 3.25.0 Summary: Golden Disk Image builder. Home-page: https://docs.openstack.org/diskimage-builder/latest/ Author: OpenStack diff -Nru python-diskimage-builder-3.24.0/releasenotes/notes/elrepo-element-85b32f6f496234d7.yaml python-diskimage-builder-3.25.0/releasenotes/notes/elrepo-element-85b32f6f496234d7.yaml --- python-diskimage-builder-3.24.0/releasenotes/notes/elrepo-element-85b32f6f496234d7.yaml 1970-01-01 00:00:00.000000000 +0000 +++ python-diskimage-builder-3.25.0/releasenotes/notes/elrepo-element-85b32f6f496234d7.yaml 2022-09-21 01:16:06.000000000 +0000 @@ -0,0 +1,4 @@ +--- +features: + - | + Added ELRepo element. diff -Nru python-diskimage-builder-3.24.0/releasenotes/notes/jammy-lvm-addition-53165b39e144544d.yaml python-diskimage-builder-3.25.0/releasenotes/notes/jammy-lvm-addition-53165b39e144544d.yaml --- python-diskimage-builder-3.24.0/releasenotes/notes/jammy-lvm-addition-53165b39e144544d.yaml 1970-01-01 00:00:00.000000000 +0000 +++ python-diskimage-builder-3.25.0/releasenotes/notes/jammy-lvm-addition-53165b39e144544d.yaml 2022-09-21 01:16:06.000000000 +0000 @@ -0,0 +1,4 @@ +--- +features: + - | + Allow processing 'jammy' ubuntu release in lvm diff -Nru python-diskimage-builder-3.24.0/requirements.txt python-diskimage-builder-3.25.0/requirements.txt --- python-diskimage-builder-3.24.0/requirements.txt 2022-08-26 06:20:38.000000000 +0000 +++ python-diskimage-builder-3.25.0/requirements.txt 2022-09-21 01:16:06.000000000 +0000 @@ -7,4 +7,4 @@ PyYAML>=3.12 # MIT stevedore>=1.20.0 # Apache-2.0 # NOTE(ianw) in here because dib-lint uses flake8 -flake8<4.0.0,>=3.6.0 # MIT +flake8<6.0.0,>=3.6.0 # MIT diff -Nru python-diskimage-builder-3.24.0/tox.ini python-diskimage-builder-3.25.0/tox.ini --- python-diskimage-builder-3.24.0/tox.ini 2022-08-26 06:20:38.000000000 +0000 +++ python-diskimage-builder-3.25.0/tox.ini 2022-09-21 01:16:06.000000000 +0000 @@ -1,5 +1,5 @@ [tox] -envlist = pep8,pylint,py3 +envlist = pep8,linters,py3 minversion = 3.18.0 skipsdist = True ignore_basepython_conflict = True @@ -18,14 +18,12 @@ deps = bindep commands = bindep test -[testenv:pep8] +[testenv:linters] commands = + pylint --rcfile pylint.cfg diskimage_builder flake8 {posargs} dib-lint -[testenv:pylint] -commands = pylint --rcfile pylint.cfg diskimage_builder - [testenv:venv] commands = {posargs} diff -Nru python-diskimage-builder-3.24.0/.zuul.d/project.yaml python-diskimage-builder-3.25.0/.zuul.d/project.yaml --- python-diskimage-builder-3.24.0/.zuul.d/project.yaml 2022-08-26 06:20:38.000000000 +0000 +++ python-diskimage-builder-3.25.0/.zuul.d/project.yaml 2022-09-21 01:16:06.000000000 +0000 @@ -9,7 +9,7 @@ - tripleo-buildimage-jobs-centos-8 check: jobs: - - openstack-tox-pylint + - openstack-tox-linters - tox-py36: nodeset: nodes: @@ -55,7 +55,7 @@ - dib-functests-arm64-rpm gate: jobs: - - openstack-tox-pylint + - openstack-tox-linters - tox-py36: nodeset: nodes: