Hello community,
here is the log from the commit of package diskimage-builder for
openSUSE:Factory checked in at 2019-10-11 15:17:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/diskimage-builder (Old)
and /work/SRC/openSUSE:Factory/.diskimage-builder.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diskimage-builder"
Fri Oct 11 15:17:30 2019 rev:28 rq:737144 version:2.28.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/diskimage-builder/diskimage-builder.changes
2019-09-10 00:01:11.345216761 +0200
+++
/work/SRC/openSUSE:Factory/.diskimage-builder.new.2352/diskimage-builder.changes
2019-10-11 15:17:54.292006658 +0200
@@ -1,0 +2,24 @@
+Thu Oct 10 13:32:59 UTC 2019 - Markos Chandras <[email protected]>
+
+- Update to 2.28.0
+ * Add NetworkManager and dhcp-client for CentOS 8
+ * Fix networking for CentOS 8
+ * simple-init: Use wrappers to call pip for glean install
+ * simple-init: default to NetworkManager for CentOS and Fedora
+ * Add security mirror override for debian-minimal
+ * pip-and-virtualenv : deprecate source for CentOS 8, new variables
+ * yum-minimal: Don't install yum, install libcurl
+ * Use $YUM instead of direct calls in more places
+ * Add environment switch for centos8 to use dnf
+ * Update redhat-common pkg-map for centos 8
+ * Update locales for Centos 8
+ * dib-python : handle centos 8
+ * yum-minimal : update mirrors for Centos 8
+ * Remove "failovermethod=priority" for Fedora (dnf)
+ * Install Python 3 libselinux packages for Fedora
+ * Revert "Fixed use of flake8"
+ * Only install doc requirements if needed
+ * Use x86 architeture specific grub2 packages for RHEL
+ * Move doc related modules to doc/requirements.txt
+
+-------------------------------------------------------------------
Old:
----
diskimage-builder-2.27.0.tar.gz
New:
----
diskimage-builder-2.28.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ diskimage-builder.spec ++++++
--- /var/tmp/diff_new_pack.CtGoOz/_old 2019-10-11 15:17:58.267995728 +0200
+++ /var/tmp/diff_new_pack.CtGoOz/_new 2019-10-11 15:17:58.271995717 +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.27.0
+Version: 2.28.0
Release: 0
Summary: Image Building Tools for OpenStack
License: Apache-2.0
++++++ diskimage-builder-2.27.0.tar.gz -> diskimage-builder-2.28.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.27.0/.zuul.d/jobs.yaml
new/diskimage-builder-2.28.0/.zuul.d/jobs.yaml
--- old/diskimage-builder-2.27.0/.zuul.d/jobs.yaml 2019-09-09
08:16:15.000000000 +0200
+++ new/diskimage-builder-2.28.0/.zuul.d/jobs.yaml 2019-10-09
22:46:07.000000000 +0200
@@ -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
@@ -223,8 +224,20 @@
base_element: centos-minimal
release: '7'
mirror: "http://{{ zuul_site_mirror_fqdn }}/centos"
- env-vars:
- DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
+
+- 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
@@ -238,8 +251,6 @@
nodepool_diskimage:
base_element: fedora-minimal
release: '29'
- env-vars:
- DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
- job:
name: dib-nodepool-functional-openstack-fedora-30-src
@@ -253,8 +264,6 @@
nodepool_diskimage:
base_element: fedora-minimal
release: '30'
- env-vars:
- DIB_SIMPLE_INIT_NETWORKMANAGER: '1'
- job:
name: dib-nodepool-functional-openstack-ubuntu-trusty-src
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.27.0/.zuul.d/project.yaml
new/diskimage-builder-2.28.0/.zuul.d/project.yaml
--- old/diskimage-builder-2.27.0/.zuul.d/project.yaml 2019-09-09
08:16:15.000000000 +0200
+++ new/diskimage-builder-2.28.0/.zuul.d/project.yaml 2019-10-09
22:46:07.000000000 +0200
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.27.0/ChangeLog
new/diskimage-builder-2.28.0/ChangeLog
--- old/diskimage-builder-2.27.0/ChangeLog 2019-09-09 08:17:06.000000000
+0200
+++ new/diskimage-builder-2.28.0/ChangeLog 2019-10-09 22:47:28.000000000
+0200
@@ -1,6 +1,38 @@
CHANGES
=======
+2.28.0
+------
+
+* CentOS 8 minimal testing and support
+* Add NetworkManager and dhcp-client for CentOS 8
+* Fix networking for CentOS 8
+* simple-init: Use wrappers to call pip for glean install
+* simple-init: default to NetworkManager for CentOS and Fedora
+* Add security mirror override for debian-minimal
+* pip-and-virtualenv : deprecate source for CentOS 8, new variables
+* yum-minimal: Don't install yum, install libcurl
+* Use $YUM instead of direct calls in more places
+* Add environment switch for centos8 to use dnf
+* Update redhat-common pkg-map for centos 8
+* Update locales for Centos 8
+* dib-python : handle centos 8
+* yum-minimal : update mirrors for Centos 8
+* Remove "failovermethod=priority" for Fedora (dnf)
+
+2.27.2
+------
+
+* Install Python 3 libselinux packages for Fedora
+
+2.27.1
+------
+
+* Revert "Fixed use of flake8"
+* Only install doc requirements if needed
+* Use x86 architeture specific grub2 packages for RHEL
+* Move doc related modules to doc/requirements.txt
+
2.27.0
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.27.0/PKG-INFO
new/diskimage-builder-2.28.0/PKG-INFO
--- old/diskimage-builder-2.27.0/PKG-INFO 2019-09-09 08:17:07.000000000
+0200
+++ new/diskimage-builder-2.28.0/PKG-INFO 2019-10-09 22:47:28.000000000
+0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: diskimage-builder
-Version: 2.27.0
+Version: 2.28.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.27.0/contrib/setup-gate-mirrors.sh
new/diskimage-builder-2.28.0/contrib/setup-gate-mirrors.sh
--- old/diskimage-builder-2.27.0/contrib/setup-gate-mirrors.sh 2019-09-09
08:16:11.000000000 +0200
+++ new/diskimage-builder-2.28.0/contrib/setup-gate-mirrors.sh 2019-10-09
22:46:07.000000000 +0200
@@ -28,7 +28,6 @@
cat <<EOF > $FEDORA_MIN_DIR/dib-mirror-fedora.repo
[fedora]
name=Fedora \$releasever - \$basearch
-failovermethod=priority
baseurl=$NODEPOOL_FEDORA_MIRROR/releases/\$releasever/Everything/\$basearch/os/
enabled=1
metadata_expire=7d
@@ -41,7 +40,6 @@
cat <<EOF > $FEDORA_MIN_DIR/dib-mirror-fedora-updates.repo
[updates]
name=Fedora \$releasever - \$basearch - Updates
-failovermethod=priority
baseurl=$NODEPOOL_FEDORA_MIRROR/updates/\$releasever/Everything/\$basearch/
enabled=1
gpgcheck=0
@@ -51,8 +49,8 @@
deltarpm_percentage=0
EOF
-# Centos Minimal
-CENTOS_MIN_DIR=$BASE_DIR/centos-minimal/yum.repos.d
+# Centos 7 Minimal
+CENTOS_MIN_DIR=$BASE_DIR/centos-minimal/yum.repos.d/7
mkdir -p $CENTOS_MIN_DIR
cat <<EOF > $CENTOS_MIN_DIR/dib-mirror-base.repo
@@ -78,4 +76,32 @@
gpgcheck=0
EOF
+# Centos 8 Minimal
+CENTOS_MIN_DIR=$BASE_DIR/centos-minimal/yum.repos.d/8
+mkdir -p $CENTOS_MIN_DIR
+
+cat <<EOF > $CENTOS_MIN_DIR/dib-mirror-base.repo
+[base]
+name=CentOS-\$releasever - Base
+baseurl=$NODEPOOL_CENTOS_MIRROR/\$releasever/BaseOS/\$basearch/os/
+gpgcheck=0
+EOF
+
+cat <<EOF > $CENTOS_MIN_DIR/dib-mirror-appstream.repo
+[base]
+name=CentOS-\$releasever - AppStream
+baseurl=$NODEPOOL_CENTOS_MIRROR/\$releasever/AppStream/\$basearch/os/
+gpgcheck=0
+EOF
+
+
+cat <<EOF > $CENTOS_MIN_DIR/dib-mirror-extras.repo
+#additional packages that may be useful
+[extras]
+name=CentOS-\$releasever - Extras
+baseurl=$NODEPOOL_CENTOS_MIRROR/\$releasever/extras/\$basearch/os/
+gpgcheck=0
+EOF
+
+
## apt sources (todo)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/bootloader/pkg-map
new/diskimage-builder-2.28.0/diskimage_builder/elements/bootloader/pkg-map
--- old/diskimage-builder-2.27.0/diskimage_builder/elements/bootloader/pkg-map
2019-09-09 08:16:11.000000000 +0200
+++ new/diskimage-builder-2.28.0/diskimage_builder/elements/bootloader/pkg-map
2019-10-09 22:46:07.000000000 +0200
@@ -28,7 +28,7 @@
"redhat": {
"extlinux": "syslinux-extlinux",
"grub-pc": "grub2-tools grub2",
- "grub-efi-amd64": "grub2-tools grub2-efi grub2-efi-modules",
+ "grub-efi-amd64": "grub2-tools grub2-efi-x64 grub2-efi-x64-modules",
"grub-efi-arm64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules",
"grub-efi-aarch64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules",
"grub-efi": "grub2-tools grub2-efi",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/README.rst
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/README.rst
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/README.rst
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/README.rst
2019-10-09 22:46:07.000000000 +0200
@@ -1,14 +1,19 @@
==============
centos-minimal
==============
-Create a minimal image based on CentOS 7.
+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, ``DIB_YUM_MINIMAL_CREATE_INTERFACES`` is set to enable the
-creation of ``/etc/sysconfig/network-scripts/ifcfg-eth[0|1]`` scripts to
-enable DHCP on the ``eth0`` & ``eth1`` interfaces. If you do not have
-these interfaces, or if you are using something else to setup the
-network such as cloud-init, glean or network-manager, you would want
-to set this to ``0``.
+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
+DHCP on the ``eth0`` & ``eth1`` interfaces. If you do not have these
+interfaces, or if you are using something else to setup the network
+such as cloud-init, glean or network-manager, you would want to set
+this to ``0``. For CentOS 8, this is set to ``0`` by default as the
+system uses NetworkManager by default.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/environment.d/10-centos-distro-name.bash
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/environment.d/10-centos-distro-name.bash
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/environment.d/10-centos-distro-name.bash
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/environment.d/10-centos-distro-name.bash
2019-10-09 22:46:07.000000000 +0200
@@ -2,8 +2,10 @@
export DIB_RELEASE=${DIB_RELEASE:-7}
# by default, enable DHCP configuration of eth0 & eth1 in network
-# scripts. See yum-minimal for full details
-export
DIB_YUM_MINIMAL_CREATE_INTERFACES=${DIB_YUM_MINIMAL_CREATE_INTERFACES:-1}
-
-# Useful for elements that work with fedora (dnf) & centos
-export YUM=${YUM:-yum}
+# scripts for centos 7. See yum-minimal for full details. CentOS 8
+# does not come with network-scripts by default so avoid this there.
+if [[ ${DIB_RELEASE} -le 7 ]]; then
+ export
DIB_YUM_MINIMAL_CREATE_INTERFACES=${DIB_YUM_MINIMAL_CREATE_INTERFACES:-1}
+else
+ export
DIB_YUM_MINIMAL_CREATE_INTERFACES=${DIB_YUM_MINIMAL_CREATE_INTERFACES:-0}
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/environment.d/11-yum-dnf.bash
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/environment.d/11-yum-dnf.bash
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/environment.d/11-yum-dnf.bash
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/environment.d/11-yum-dnf.bash
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,5 @@
+if [ $DIB_RELEASE -ge 8 ]; then
+ export YUM=dnf
+else
+ export YUM=yum
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/README.rst
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/README.rst
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/README.rst
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/README.rst
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1 @@
+Verify we can build a centos-minimal image.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/element-deps
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/element-deps
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/element-deps
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/element-deps
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1 @@
+openstack-ci-mirrors
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1 @@
+Verify we can build a centos-minimal image.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1 @@
+openstack-ci-mirrors
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1 @@
+export DIB_RELEASE='8'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/README.rst
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/README.rst
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/README.rst
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/README.rst
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Verify we can build a centos-minimal image.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/element-deps
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/element-deps
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/element-deps
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/element-deps
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-openstack-ci-mirrors
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/yum.repos.d/7/yum.repo
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/yum.repos.d/7/yum.repo
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/yum.repos.d/7/yum.repo
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/yum.repos.d/7/yum.repo
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,6 @@
+[centos]
+name=CentOS-$releasever - Base
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
+gpgcheck=0
+#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
+#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/yum.repos.d/8/appstream.repo
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/yum.repos.d/8/appstream.repo
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/yum.repos.d/8/appstream.repo
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/yum.repos.d/8/appstream.repo
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,5 @@
+[centos-appstream]
+name=CentOS-$releasever - AppStream
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=appstream
+gpgcheck=0
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/yum.repos.d/8/base.repo
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/yum.repos.d/8/base.repo
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/yum.repos.d/8/base.repo
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/yum.repos.d/8/base.repo
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,5 @@
+[centos-base]
+name=CentOS-$releasever - Base
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=baseos
+gpgcheck=0
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/yum.repos.d/yum.repo
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/yum.repos.d/yum.repo
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/centos-minimal/yum.repos.d/yum.repo
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/centos-minimal/yum.repos.d/yum.repo
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-[centos]
-name=CentOS-$releasever - Base
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
-gpgcheck=0
-#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
-#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/debian-minimal/README.rst
new/diskimage-builder-2.28.0/diskimage_builder/elements/debian-minimal/README.rst
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/debian-minimal/README.rst
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/debian-minimal/README.rst
2019-10-09 22:46:07.000000000 +0200
@@ -12,4 +12,11 @@
Note that this element installs ``systemd-sysv`` as the init system
+The element obeys the ``DIB_DISTRIBUTION_MIRROR`` argument for
+mirroring (see ``debootsrap`` element documentation). However, the
+security repositories are separate for Debian, so we can not assume
+they exist at ``DIB_DISTRIBUTION_MIRROR``. If you do not wish to use
+the upstream repository (from ``security.debian.org``) override it
+with ``DIB_DEBIAN_SECURITY_MIRROR``.
+
.. element_deps::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash
new/diskimage-builder-2.28.0/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash
2019-10-09 22:46:07.000000000 +0200
@@ -6,6 +6,12 @@
fi
export
DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://deb.debian.org/debian}
+# With Debian, security is in a different repository. We can't, say,
+# assume "${DIB_DISTRIBUTION_MIRROR}-security" is valid. The only
+# choice is for people to add it separately, otherwise we use
+# upstream.
+DIB_DEBIAN_SECURITY_MIRROR=${DIB_DEBIAN_SECURITY_MIRROR:-http://security.debian.org/}
+
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main}
export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ }
@@ -13,7 +19,7 @@
"default:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE}
${DIB_DEBIAN_COMPONENTS_WS}
backports:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE}-backports
${DIB_DEBIAN_COMPONENTS_WS}
updates:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE}-updates
${DIB_DEBIAN_COMPONENTS_WS}
-security:deb http://security.debian.org/ ${DIB_RELEASE}/updates
${DIB_DEBIAN_COMPONENTS_WS}
+security:deb ${DIB_DEBIAN_SECURITY_MIRROR} ${DIB_RELEASE}/updates
${DIB_DEBIAN_COMPONENTS_WS}
"
if [ "${DIB_RELEASE}" = "testing" -o "${DIB_RELEASE}" = "unstable" ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/dib-python/environment.d/50-dib-python-version
new/diskimage-builder-2.28.0/diskimage_builder/elements/dib-python/environment.d/50-dib-python-version
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/dib-python/environment.d/50-dib-python-version
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/dib-python/environment.d/50-dib-python-version
2019-10-09 22:46:07.000000000 +0200
@@ -10,14 +10,12 @@
if [ "$DIB_RELEASE" -le 22 ]; then
DIB_PYTHON_VERSION=2
fi
- elif [ "$DISTRO_NAME" == "centos" ]; then
- DIB_PYTHON_VERSION=2
elif [ "$DISTRO_NAME" == "centos7" ]; then
DIB_PYTHON_VERSION=2
elif [ "$DISTRO_NAME" == "rhel7" ]; then
# TODO(nmagnezi): Remove this when the 'rhel7' element gets replaced
by 'rhel'
DIB_PYTHON_VERSION=2
- elif [ "$DISTRO_NAME" == "rhel" ]; then
+ elif [[ "$DISTRO_NAME" =~ (rhel|centos) ]]; then
if [ "$DIB_RELEASE" -le 7 ]; then
DIB_PYTHON_VERSION=2
elif [ "$DIB_RELEASE" -ge 8 ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/dib-python/pre-install.d/01-dib-python
new/diskimage-builder-2.28.0/diskimage_builder/elements/dib-python/pre-install.d/01-dib-python
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/dib-python/pre-install.d/01-dib-python
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/dib-python/pre-install.d/01-dib-python
2019-10-09 22:46:07.000000000 +0200
@@ -6,7 +6,7 @@
set -eu
set -o pipefail
-if [[ ${DISTRO_NAME} == "rhel" && ${DIB_RELEASE} == 8 ]]; then
+if [[ ${DISTRO_NAME} =~ (centos|rhel) && ${DIB_RELEASE} == 8 ]]; then
# RHEL8 has a system python, separate from the user python. What
# a good idea, abstracting the python binary for system scripts!
# :) Use it for dib-python.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
new/diskimage-builder-2.28.0/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/epel/pre-install.d/05-rpm-epel-release
2019-10-09 22:46:07.000000000 +0200
@@ -8,7 +8,7 @@
if [[ ${DISTRO_NAME} =~ "centos" ]]; then
# Centos has "epel-release" in extras, which is default enabled.
- yum install -y epel-release
+ ${YUM} install -y epel-release
else
# For RHEL, we have to scrape the download page to find the latest
# release and install that
@@ -34,7 +34,11 @@
fi
if [ ${DIB_EPEL_DISABLED:-0} -ne 0 ]; then
- yum-config-manager --disable epel
+ if [[ ${YUM} == "dnf" ]]; then
+ dnf config-manager --set-disabled epel
+ else
+ yum-config-manager --disable epel
+ fi
fi
DIB_EPEL_MIRROR=${DIB_EPEL_MIRROR:-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo
new/diskimage-builder-2.28.0/diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo
2019-10-09 22:46:07.000000000 +0200
@@ -1,6 +1,5 @@
[fedora]
name=Fedora $releasever - $basearch
-failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
gpgcheck=0
@@ -8,7 +7,6 @@
[updates]
name=Fedora $releasever - $basearch - Updates
-failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
enabled=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/grub2/pkg-map
new/diskimage-builder-2.28.0/diskimage_builder/elements/grub2/pkg-map
--- old/diskimage-builder-2.27.0/diskimage_builder/elements/grub2/pkg-map
2019-09-09 08:16:11.000000000 +0200
+++ new/diskimage-builder-2.28.0/diskimage_builder/elements/grub2/pkg-map
2019-10-09 22:46:07.000000000 +0200
@@ -17,7 +17,7 @@
"grub_bios_arm64": "grub-efi-arm64-bin"
},
"redhat":{
- "signed_grub_efi": "efibootmgr grub2-efi-modules grub2-efi",
+ "signed_grub_efi": "efibootmgr grub2-efi-x64-modules grub2-efi-x64",
"signed_shim_efi": "shim",
"grub_bios": "grub2"
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash
new/diskimage-builder-2.28.0/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash
2019-10-09 22:46:07.000000000 +0200
@@ -53,7 +53,7 @@
export
DIB_YUM_MINIMAL_BOOTSTRAP_REPOS=${DIB_OS_CI_YUM_REPOS}/fedora-minimal/default/yum.repos.d
fi
elif [[ "${DISTRO_NAME}" == "centos" ]]; then
- export
DIB_YUM_MINIMAL_BOOTSTRAP_REPOS=${DIB_OS_CI_YUM_REPOS}/centos-minimal/yum.repos.d
+ export
DIB_YUM_MINIMAL_BOOTSTRAP_REPOS=${DIB_OS_CI_YUM_REPOS}/centos-minimal/${DIB_RELEASE}/yum.repos.d
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/pip-and-virtualenv/README.rst
new/diskimage-builder-2.28.0/diskimage_builder/elements/pip-and-virtualenv/README.rst
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/pip-and-virtualenv/README.rst
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/pip-and-virtualenv/README.rst
2019-10-09 22:46:07.000000000 +0200
@@ -4,10 +4,6 @@
This element installs pip and virtualenv in the image.
-.. note:: This element setups and Python 2 and Python 3 environment.
- This means it will bring in python2 packages, so isn't
- appropriate if you want a python3 only environment.
-
Package install
===============
@@ -16,10 +12,12 @@
will be installed *only* for the python version identified by
``dib-python`` (i.e. the default python for the platform).
-Distribution packages have worked out name-spacing such that only
+Namespacing of the tools will be up to your distribution. Some
+distribution packages have worked out name-spacing such that only
python2 or python3 owns common scripts like ``/usr/bin/pip`` (on most
platforms, ``pip`` refers to python2 pip, and ``pip3`` refers to
-python3 pip, although some may choose the reverse).
+python3 pip, although some may choose the reverse). Other platforms
+have avoided making a decision and require explicit version suffixes.
To install pip and virtualenv from package::
@@ -28,12 +26,28 @@
Source install
==============
-Source install is the default. If the source installtype is used,
-``pip`` and ``virtualenv`` are installed from the latest upstream
-releases.
+.. note:: For source installs this element setups and Python 2 and
+ Python 3 environments. This means it will bring in python2
+ packages, so isn't appropriate if you want a python3 only
+ environment.
+
+.. note:: Source install is considered deprecated for several reasons.
+ Because it makes for a hetrogenous environment between
+ distro packaged tools and upstream it means the final images
+ create bespoke environments that make standarised testing
+ difficult. The tricks used around holding packages to
+ overwrite them cause difficulty for users of images. This
+ also brings in Python 2 unconditonally, something not wanted
+ on modern Python 3 only distributions.
+
+Source install is the default on most platforms for historical
+purposes. The current exception(s) are RHEL8 and CentOS 8.
+
+If the source installtype is used, ``pip`` and ``virtualenv`` are
+installed from the latest upstream releases.
-Source installs from these tools are not name-spaced. It is
-inconsistent across platforms if the first or last install gets to own
+Source installs from upstream releases are not name-spaced. It is
+inconsistent across platforms if the first or last install will own
common scripts like ``/usr/bin/pip`` and ``virtualenv``.
To avoid inconsistency, we firstly install the packaged python 2
@@ -54,8 +68,25 @@
Source install is supported on limited platforms. See the code, but
this includes Ubuntu and RedHat platforms.
-Using the tools
-===============
+Environment Variables
+=====================
+
+To simplify the common-case of "install a package" or "create a
+virtualenv" with the default system Python, the following variables
+are exported by this element:
+
+* ``DIB_PYTHON_PIP``
+* ``DIB_PYTHON_VIRTUALENV``
+
+This will create/install using the ``dib-python`` version for the
+platform (i.e. python2 for older distros, python3 for modern distros).
+Note that on Python 3 platforms it will use the inbuilt ``venv``
+(rather than the ``virtualenv`` package -- if you absolutely need
+features only ``virtualenv`` provides you should call it directly in
+your element; see below).
+
+Explicit use of the tools
+=========================
Due to the essentially unsolvable problem of "who owns the script", it
is recommended to *not* call ``pip`` or ``virtualenv`` directly. You
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/pip-and-virtualenv/environment.d/51-pip-and-virutalenv-default.bash
new/diskimage-builder-2.28.0/diskimage_builder/elements/pip-and-virtualenv/environment.d/51-pip-and-virutalenv-default.bash
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/pip-and-virtualenv/environment.d/51-pip-and-virutalenv-default.bash
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/pip-and-virtualenv/environment.d/51-pip-and-virutalenv-default.bash
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,33 @@
+# Due to the many historical problems mixing python2/3 versions and
+# upgrading packaged system pip/setuptools/virtualenv binaries with
+# upstream non-packaged versions, we wish to avoid this completely on
+# modern distros.
+if [[ $DISTRO_NAME =~ (centos|rhel) && $DIB_RELEASE -ge 8 ]]; then
+ export
DIB_INSTALLTYPE_pip_and_virtualenv=${DIB_INSTALLTYPE_pip_and_virtualenv:-package}
+
+ if [[ ${DIB_INSTALLTYPE_pip_and_virtualenv} == "source" ]]; then
+ echo "*** pip-and-virtualenv does not support 'source' install for
$DISTRO_NAME/$DIB_RELEASE"
+ exit 1
+ fi
+fi
+
+# The default variables setup below are only useful during the phases
+# that dib-python exists
+if [[ ! -e /usr/local/bin/dib-python ]]; then
+ return 0
+fi
+
+# NOTE(ianw): you don't want to call "dib-python -m pip" because that
+# can leave behind interpreters #!/usr/local/bin/dib-python in
+# scripts. De-reference the link
+_dib_python_path=$(readlink /usr/local/bin/dib-python)
+export DIB_PYTHON_PIP="$_dib_python_path -m pip"
+# We make an opinionated, but simplifying decision here that on
+# Python3 platforms, just use venv. There are some corner cases that
+# the external "virtualenv" package still handles better, but for most
+# purposes "venv" should be fine.
+if [[ $DIB_PYTHON_VERSION == 3 ]]; then
+ export DIB_PYTHON_VIRTUALENV="$_dib_python_path -m venv"
+else
+ export DIB_PYTHON_VIRTUALENV="$_dib_python_path -m virtualenv"
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/redhat-common/pkg-map
new/diskimage-builder-2.28.0/diskimage_builder/elements/redhat-common/pkg-map
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/redhat-common/pkg-map
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/redhat-common/pkg-map
2019-10-09 22:46:07.000000000 +0200
@@ -1,9 +1,23 @@
{
+ "distro": {
+ "fedora": {
+ "libselinux-python": "python3-libselinux",
+ "policycoreutils": "python3-policycoreutils",
+ "policycoreutils-python": "policycoreutils-python-utils"
+ }
+ },
"release": {
"rhel": {
"8": {
"libselinux-python": "python3-libselinux",
"policycoreutils": "python3-policycoreutils",
+ "policycoreutils-python": "policycoreutils-python-utils"
+ }
+ },
+ "centos": {
+ "8": {
+ "libselinux-python": "python3-libselinux",
+ "policycoreutils": "python3-policycoreutils",
"policycoreutils-python": "policycoreutils-python-utils"
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/rpm-distro/pre-install.d/01-override-yum-arch
new/diskimage-builder-2.28.0/diskimage_builder/elements/rpm-distro/pre-install.d/01-override-yum-arch
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/rpm-distro/pre-install.d/01-override-yum-arch
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/rpm-distro/pre-install.d/01-override-yum-arch
2019-10-09 22:46:07.000000000 +0200
@@ -28,7 +28,7 @@
exit 1
fi
-if [[ $DISTRO_NAME == "fedora" ]]; then
+if [[ ${YUM} == "dnf" ]]; then
mkdir -p /etc/dnf/vars
echo $basearch > /etc/dnf/vars/basearch
echo $arch > /etc/dnf/vars/arch
@@ -43,5 +43,5 @@
else
contentdir=altarch
fi
- echo $contentdir > /etc/yum/vars/contentdir
+ echo $contentdir > /etc/${YUM}/vars/contentdir
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/simple-init/environment.d/15-simple-init-networkmanager
new/diskimage-builder-2.28.0/diskimage_builder/elements/simple-init/environment.d/15-simple-init-networkmanager
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/simple-init/environment.d/15-simple-init-networkmanager
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/simple-init/environment.d/15-simple-init-networkmanager
2019-10-09 22:46:07.000000000 +0200
@@ -1 +1,12 @@
-export DIB_SIMPLE_INIT_NETWORKMANAGER=${DIB_SIMPLE_INIT_NETWORKMANAGER:-0}
+if [[ ${DISTRO_NAME} =~ (centos|fedora) ]]; then
+ export DIB_SIMPLE_INIT_NETWORKMANAGER=${DIB_SIMPLE_INIT_NETWORKMANAGER:-1}
+else
+ export DIB_SIMPLE_INIT_NETWORKMANAGER=${DIB_SIMPLE_INIT_NETWORKMANAGER:-0}
+fi
+
+if [[ ${DISTRO_NAME} == "centos" && $DIB_RELEASE -ge 8 ]] || [[ ${DISTRO_NAME}
== "fedora" ]]; then
+ if [[ $DIB_SIMPLE_INIT_NETWORKMANAGER == 0 ]]; then
+ echo "simple-init only supports NetworkManager mode on Fedora and
CentOS 8"
+ exit 1
+ fi
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean
new/diskimage-builder-2.28.0/diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/simple-init/install.d/simple-init-repo-install/40-glean
2019-10-09 22:46:07.000000000 +0200
@@ -21,8 +21,4 @@
set -eu
set -o pipefail
-if [ "$DIB_PYTHON_VERSION" == "3" ]; then
- pip3 install /tmp/glean.git
-else
- pip install /tmp/glean.git
-fi
+$DIB_PYTHON_PIP install /tmp/glean.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean
new/diskimage-builder-2.28.0/diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/simple-init/install.d/simple-init-source-install/40-glean
2019-10-09 22:46:07.000000000 +0200
@@ -21,8 +21,4 @@
set -eu
set -o pipefail
-if [ "$DIB_PYTHON_VERSION" == "3" ]; then
- pip3 install glean
-else
- pip install glean
-fi
+$DIB_PYTHON_PIP install glean
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/simple-init/post-install.d/80-simple-init
new/diskimage-builder-2.28.0/diskimage_builder/elements/simple-init/post-install.d/80-simple-init
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/simple-init/post-install.d/80-simple-init
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/simple-init/post-install.d/80-simple-init
2019-10-09 22:46:07.000000000 +0200
@@ -12,16 +12,24 @@
exit 0
;;
systemd)
- if [[ ${DISTRO_NAME} =~ (centos|rhel7|fedora) ]]; then
+ if [[ ${DISTRO_NAME} == centos && ${DIB_RELEASE} -eq 7 ]]; then
if [[ ${DIB_SIMPLE_INIT_NETWORKMANAGER} != 1 ]]; then
# NOTE(pabelanger): Glean requires network.service for
# these platforms when not using networkmanager
- systemctl enable network.service
+ if [[ ${DIB_RELEASE} -lt 8 ]]; then
+ # Not available on Centos 8
+ # NOTE(ianw) we should evaluate if Fedora needs this
+ systemctl enable network.service
+ fi
fi
elif [[ ${DISTRO_NAME} =~ (opensuse) ]]; then
# on suse, this is named wicked.service, but it's the same
# as network.service.
systemctl enable wicked.service
+ else
+ # NOTE(ianw): it might be better to whitelist platforms in
+ # the future, but for now assume it will "just work"
+ continue
fi
;;
openrc)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/yum/post-install.d/99-reset-yum-conf
new/diskimage-builder-2.28.0/diskimage_builder/elements/yum/post-install.d/99-reset-yum-conf
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/yum/post-install.d/99-reset-yum-conf
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/yum/post-install.d/99-reset-yum-conf
2019-10-09 22:46:07.000000000 +0200
@@ -6,7 +6,7 @@
set -eu
set -o pipefail
-if [[ $DISTRO_NAME == "fedora" && $DIB_RELEASE -ge 22 ]]; then
+if [[ ${YUM} == "dnf" ]]; then
cfg=/etc/dnf/dnf.conf
cachedir=/var/cache/dnf
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/yum/pre-install.d/01-yum-keepcache
new/diskimage-builder-2.28.0/diskimage_builder/elements/yum/pre-install.d/01-yum-keepcache
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/yum/pre-install.d/01-yum-keepcache
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/yum/pre-install.d/01-yum-keepcache
2019-10-09 22:46:07.000000000 +0200
@@ -6,7 +6,7 @@
set -eu
set -o pipefail
-if [[ $DISTRO_NAME == "fedora" && $DIB_RELEASE -ge 22 ]]; then
+if [[ ${YUM} == "dnf" ]]; then
# dnf is slightly different; doesn't have these by default
cfg=/etc/dnf/dnf.conf
echo "keepcache=1" >> $cfg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/package-installs.yaml
new/diskimage-builder-2.28.0/diskimage_builder/elements/yum-minimal/package-installs.yaml
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/package-installs.yaml
2019-09-09 08:16:15.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/yum-minimal/package-installs.yaml
2019-10-09 22:46:07.000000000 +0200
@@ -11,3 +11,10 @@
uninstall: true
linux-firmware-whence:
uninstall: true
+# NOTE(ianw) pkg-map restricts this to !rhel/centos 7; in 7
+# the "initscripts" package handles basic networking, in
+# 8+ it's the role of NetworkManager and dhcp-client. This
+# mirrors the default packages installed in upstream cloud images
+# to facilitate a basic network.
+NetworkManager:
+dhcp-client:
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/pkg-map
new/diskimage-builder-2.28.0/diskimage_builder/elements/yum-minimal/pkg-map
--- old/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/pkg-map
2019-09-09 08:16:11.000000000 +0200
+++ new/diskimage-builder-2.28.0/diskimage_builder/elements/yum-minimal/pkg-map
2019-10-09 22:46:07.000000000 +0200
@@ -1,5 +1,13 @@
{
- "family": {
+ "release": {
+ "centos": {
+ "7": {
+ "NetworkManager": "",
+ "dhcp-client": ""
+ }
+ }
+ },
+"family": {
"redhat": {
"lsb_release": "redhat-lsb-core"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/pre-install.d/03-yum-cleanup
new/diskimage-builder-2.28.0/diskimage_builder/elements/yum-minimal/pre-install.d/03-yum-cleanup
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/pre-install.d/03-yum-cleanup
2019-09-09 08:16:15.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/yum-minimal/pre-install.d/03-yum-cleanup
2019-10-09 22:46:07.000000000 +0200
@@ -23,9 +23,9 @@
# effectively: febootstrap-minimize --keep-zoneinfo --keep-rpmdb
--keep-services "$target"
-# This is only required on CentOS ... see notes in
+# This is only required on CentOS7 ... see notes in
# root.d/08-yum-chroot about %_install_langs
-if [[ $DISTRO_NAME != "fedora" ]]; then
+if [[ $DISTRO_NAME == "centos" && $DIB_RELEASE == "7" ]]; then
# Stripping *all* locales is a bad idea. For now, we take the
# suggestion in [1] for reducing this
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
new/diskimage-builder-2.28.0/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
---
old/diskimage-builder-2.27.0/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot
2019-10-09 22:46:07.000000000 +0200
@@ -95,7 +95,15 @@
# routines. In the gate, environment.d files for the funtional
# tests will set DIB_YUM_MINIMAL_BOOTSTRAP_REPOS -- this contains
# mirrors correct for the region setup by contrib/setup-gate-mirrors.sh
- local
repo=${DIB_YUM_MINIMAL_BOOTSTRAP_REPOS:-${TMP_HOOKS_PATH}/yum.repos.d}
+ local repo=${DIB_YUM_MINIMAL_BOOTSTRAP_REPOS:-}
+ if [[ -z ${repo} ]]; then
+ # take in preference more specific subdirs
+ if [[ -d ${TMP_HOOKS_PATH}/yum.repos.d/${DIB_RELEASE} ]]; then
+ repo=${TMP_HOOKS_PATH}/yum.repos.d/${DIB_RELEASE}
+ else
+ repo=${TMP_HOOKS_PATH}/yum.repos.d
+ fi
+ fi
# yumdownloader puts repo xml files and such into a directory
# ${TMPDIR}/yum-$USER-random. Since we don't need this once the
@@ -175,28 +183,15 @@
local _lang_pack=""
local _extra_pkgs=""
- if [ $DISTRO_NAME = "fedora" -a $DIB_RELEASE -le 23 ]; then
- # _install_langs is a rpm macro that limits the translation
- # files, etc installed by packages. For Fedora 23 [1], the
- # glibc-common package will obey this to only install the
- # listed locales, keeping things much smaller (we still have
- # to clean up locales manually on centos7). We install just
- # en_US because people often ssh in with that locale, but
- # leave out everything else. Note that yum has an option to
- # set this from the command-line [2], but the yum in trusty we
- # are using is too old to have it. So we set it directly in
- # the macros file
- #
- # [1]
http://pkgs.fedoraproject.org/cgit/rpms/glibc.git/commit/glibc.spec?h=f23&id=91764bd9ec690d4b8a886c0a3a104aac12d340d2
- # [2]
http://yum.baseurl.org/gitweb?p=yum.git;a=commit;h=26128173b362474456e8f0642073ecb0322ed031
- echo "%_install_langs C:en_US:en_US.UTF-8" >> $HOME/.rpmmacros
- elif [ $DISTRO_NAME = "fedora" -a $DIB_RELEASE -ge 24 ]; then
- # glibc on F24 has split locales into "langpack" packages.
- # Yum doesn't understand the weak-dependencies glibc now
- # uses to get the minimal-langpack and chooses a
- # random(ish) one that satisfies the locale dependency
- # (rhbz#1349258). Work-around this by explicitly requring
- # the minimal and english (for en_US.UTF-8) pack.
+ if [[ $DISTRO_NAME == "fedora" ]] || \
+ [[ $DISTRO_NAME == "centos" && $DIB_RELEASE -ge 8 ]]; then
+ # glibc from F24 onwards has split locales into "langpack"
+ # packages. Host yum doesn't understand the
+ # weak-dependencies glibc now uses to get the
+ # minimal-langpack and chooses a random(ish) one that
+ # satisfies the locale dependency (rhbz#1349258).
+ # Work-around this by explicitly requring the minimal and
+ # english (for en_US.UTF-8) pack.
_lang_pack="glibc-minimal-langpack glibc-langpack-en"
fi
@@ -258,12 +253,25 @@
_install_repos
-# install dnf for >= f22
-if [ $DIB_RELEASE -ge 22 ]; then
- # Fedora 27 has a "curl-minimal" package that will get pulled in as a
- # rpm dependency. This causes problems later if/when "curl" gets
- # installed. To avoid this, just install the full curl first up.
- _install_pkg_manager dnf dnf-plugins-core yum curl
+# Install package manager
+
+# We are somewhat fighting against the "yum" version on the host to
+# get things installed correctly. Fedora 27 onwards has a
+# "curl-minimal" package that will get pulled in by default for the
+# initial install (ianw: I think because the yum doesn't understand
+# weak dependencies correctly). This causes problems later if/when
+# "curl" gets installed (you need to add --allowerasing to let dnf get
+# rid of the old package). To avoid this, just install the full curl
+# and first up. On Centos, it's different again and we need to
+# specify libcurl as well, or the minimal libcurl packages come in
+# causing similar problems. *But* -- we can't also do that on Fedora
+# it seems, as it seems like as part of the Fedora modular updates
+# (https://docs.fedoraproject.org/en-US/modularity/) we can pick up
+# seemingly mismatched libraries.
+if [[ ${DISTRO_NAME} == 'fedora' ]]; then
+ _install_pkg_manager dnf dnf-plugins-core curl
+elif [[ ${DISTRO_NAME} == centos && $DIB_RELEASE -ge 8 ]]; then
+ _install_pkg_manager dnf dnf-plugins-core curl libcurl
else
_install_pkg_manager yum
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder.egg-info/PKG-INFO
new/diskimage-builder-2.28.0/diskimage_builder.egg-info/PKG-INFO
--- old/diskimage-builder-2.27.0/diskimage_builder.egg-info/PKG-INFO
2019-09-09 08:17:06.000000000 +0200
+++ new/diskimage-builder-2.28.0/diskimage_builder.egg-info/PKG-INFO
2019-10-09 22:47:28.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: diskimage-builder
-Version: 2.27.0
+Version: 2.28.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.27.0/diskimage_builder.egg-info/SOURCES.txt
new/diskimage-builder-2.28.0/diskimage_builder.egg-info/SOURCES.txt
--- old/diskimage-builder-2.27.0/diskimage_builder.egg-info/SOURCES.txt
2019-09-09 08:17:06.000000000 +0200
+++ new/diskimage-builder-2.28.0/diskimage_builder.egg-info/SOURCES.txt
2019-10-09 22:47:28.000000000 +0200
@@ -137,9 +137,15 @@
diskimage_builder/elements/centos-minimal/element-deps
diskimage_builder/elements/centos-minimal/element-provides
diskimage_builder/elements/centos-minimal/environment.d/10-centos-distro-name.bash
-diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/README.rst
-diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/element-deps
-diskimage_builder/elements/centos-minimal/yum.repos.d/yum.repo
+diskimage_builder/elements/centos-minimal/environment.d/11-yum-dnf.bash
+diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/README.rst
+diskimage_builder/elements/centos-minimal/test-elements/7-build-succeeds/element-deps
+diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst
+diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps
+diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash
+diskimage_builder/elements/centos-minimal/yum.repos.d/7/yum.repo
+diskimage_builder/elements/centos-minimal/yum.repos.d/8/appstream.repo
+diskimage_builder/elements/centos-minimal/yum.repos.d/8/base.repo
diskimage_builder/elements/centos7/README.rst
diskimage_builder/elements/centos7/element-deps
diskimage_builder/elements/centos7/element-provides
@@ -532,6 +538,7 @@
diskimage_builder/elements/pip-and-virtualenv/package-installs.yaml
diskimage_builder/elements/pip-and-virtualenv/pkg-map
diskimage_builder/elements/pip-and-virtualenv/source-repository-pip-and-virtualenv
+diskimage_builder/elements/pip-and-virtualenv/environment.d/51-pip-and-virutalenv-default.bash
diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip
diskimage_builder/elements/pip-and-virtualenv/post-install.d/89-clean-up-pip-cache
diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-fedora/element-deps
@@ -796,6 +803,7 @@
diskimage_builder/tests/test_loggingconfig.py
diskimage_builder/tests/test_no_dup_filenames.py
diskimage_builder/tests/functional/__init__.py
+doc/requirements.txt
doc/lib/element_deps.py
doc/source/ci.md
doc/source/conf.py
@@ -835,8 +843,10 @@
releasenotes/notes/block-device-partitioning-237249e7ed2bad26.yaml
releasenotes/notes/bootloader-commandline-d2db7524f1f9ad28.yaml
releasenotes/notes/bootloader-gpt-d1047f81f3a0631b.yaml
+releasenotes/notes/centos-minimal-8-aca6314862741177.yaml
releasenotes/notes/centos-retired-f17ae9f6f03e57e3.yaml
releasenotes/notes/dash-p-after-install-58a87549c1c906c3.yaml
+releasenotes/notes/debian-security-7279855cf464f88b.yaml
releasenotes/notes/dib-distribution-mirror-8c241c0d3d4a539a.yaml
releasenotes/notes/dib-init-system_fix_for_debian_jessie-c6f7261ee84dad27.yaml
releasenotes/notes/dib-run-parts-6f67d038aa5a4156.yaml
@@ -867,6 +877,7 @@
releasenotes/notes/opensuse-minimal-45267f5be1112c22.yaml
releasenotes/notes/package-install-arch-38bb5a6e61794fa5.yaml
releasenotes/notes/package-outside-debootstrap-ac93e9ce991819f1.yaml
+releasenotes/notes/pip-and-virtualenv-args-5d3f2512edd7f3a3.yaml
releasenotes/notes/post-root-stage-51da051bcdfbc55f.yaml
releasenotes/notes/pre-finalise-stage-574ae7886274bcba.yaml
releasenotes/notes/remove-dib-utils-37f70dfad54900a0.yaml
@@ -874,6 +885,7 @@
releasenotes/notes/root-journal-size-618e064d6681699a.yaml
releasenotes/notes/runtime-ssh-host-keys-7a2fc873cc90d33e.yaml
releasenotes/notes/selinux-permissive-pre-install-ce19461ef17ec972.yaml
+releasenotes/notes/simple-init-nm-5d19e249c0a4560b.yaml
releasenotes/notes/simple-init-nm-delay-f579e05467785219.yaml
releasenotes/notes/simple-init-nm-f0896124dee92a03.yaml
releasenotes/notes/skip-packages-env-c97e7b4820f9bfda.yaml
@@ -893,9 +905,12 @@
roles/dib-setup-gate-mirrors/README.rst
roles/dib-setup-gate-mirrors/defaults/main.yaml
roles/dib-setup-gate-mirrors/tasks/main.yaml
-roles/dib-setup-gate-mirrors/templates/centos-minimal/base.repo.j2
-roles/dib-setup-gate-mirrors/templates/centos-minimal/extras.repo.j2
-roles/dib-setup-gate-mirrors/templates/centos-minimal/updates.repo.j2
+roles/dib-setup-gate-mirrors/templates/centos-minimal/7/base.repo.j2
+roles/dib-setup-gate-mirrors/templates/centos-minimal/7/extras.repo.j2
+roles/dib-setup-gate-mirrors/templates/centos-minimal/7/updates.repo.j2
+roles/dib-setup-gate-mirrors/templates/centos-minimal/8/appstream.repo.j2
+roles/dib-setup-gate-mirrors/templates/centos-minimal/8/base.repo.j2
+roles/dib-setup-gate-mirrors/templates/centos-minimal/8/extras.repo.j2
roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2
roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2
tests/README.rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder.egg-info/pbr.json
new/diskimage-builder-2.28.0/diskimage_builder.egg-info/pbr.json
--- old/diskimage-builder-2.27.0/diskimage_builder.egg-info/pbr.json
2019-09-09 08:17:06.000000000 +0200
+++ new/diskimage-builder-2.28.0/diskimage_builder.egg-info/pbr.json
2019-10-09 22:47:28.000000000 +0200
@@ -1 +1 @@
-{"git_version": "33a089b0", "is_release": true}
\ No newline at end of file
+{"git_version": "5b5385cf", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/diskimage_builder.egg-info/requires.txt
new/diskimage-builder-2.28.0/diskimage_builder.egg-info/requires.txt
--- old/diskimage-builder-2.27.0/diskimage_builder.egg-info/requires.txt
2019-09-09 08:17:06.000000000 +0200
+++ new/diskimage-builder-2.28.0/diskimage_builder.egg-info/requires.txt
2019-10-09 22:47:28.000000000 +0200
@@ -3,6 +3,7 @@
PyYAML>=3.12
six>=1.10.0
stevedore>=1.20.0
+hacking<1.2.0,>=1.1.0
[:(python_version<'3.0')]
networkx<2.3,>=1.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.27.0/doc/requirements.txt
new/diskimage-builder-2.28.0/doc/requirements.txt
--- old/diskimage-builder-2.27.0/doc/requirements.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/diskimage-builder-2.28.0/doc/requirements.txt 2019-10-09
22:46:07.000000000 +0200
@@ -0,0 +1,8 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+
+openstackdocstheme>=1.18.1 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
+reno>=2.5.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.27.0/doc/source/index.rst
new/diskimage-builder-2.28.0/doc/source/index.rst
--- old/diskimage-builder-2.27.0/doc/source/index.rst 2019-09-09
08:16:11.000000000 +0200
+++ new/diskimage-builder-2.28.0/doc/source/index.rst 2019-10-09
22:46:07.000000000 +0200
@@ -56,9 +56,3 @@
developer/index
elements
specs/README
-
-.. # just link this on the dev page
-.. toctree::
- :hidden:
-
- api/autoindex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/releasenotes/notes/centos-minimal-8-aca6314862741177.yaml
new/diskimage-builder-2.28.0/releasenotes/notes/centos-minimal-8-aca6314862741177.yaml
---
old/diskimage-builder-2.27.0/releasenotes/notes/centos-minimal-8-aca6314862741177.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/releasenotes/notes/centos-minimal-8-aca6314862741177.yaml
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,5 @@
+---
+features:
+ - |
+ The ``centos-minimal`` supports CentOS 8 builds when run with
+ ``DIB_RELEASE=8``
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/releasenotes/notes/debian-security-7279855cf464f88b.yaml
new/diskimage-builder-2.28.0/releasenotes/notes/debian-security-7279855cf464f88b.yaml
---
old/diskimage-builder-2.27.0/releasenotes/notes/debian-security-7279855cf464f88b.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/releasenotes/notes/debian-security-7279855cf464f88b.yaml
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,7 @@
+---
+features:
+ - |
+ A new variable ``DIB_DEBIAN_SECURITY_MIRROR`` is added to override
+ the path to the security repositories. Previously this was
+ hard-coded to the upstream repositories, which could get out of
+ sync with mirrors specified with ``DIB_DISTRIBUTION_MIRROR``.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/releasenotes/notes/pip-and-virtualenv-args-5d3f2512edd7f3a3.yaml
new/diskimage-builder-2.28.0/releasenotes/notes/pip-and-virtualenv-args-5d3f2512edd7f3a3.yaml
---
old/diskimage-builder-2.27.0/releasenotes/notes/pip-and-virtualenv-args-5d3f2512edd7f3a3.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/releasenotes/notes/pip-and-virtualenv-args-5d3f2512edd7f3a3.yaml
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,10 @@
+---
+features:
+ - |
+ The ``pip-and-virtualenv`` element has added variables ``DIB_PYTHON_PIP``
+ and ``DIB_PYTHON_VIRTUALENV`` to make it more straight forward for other
+ elements to install packages or create virtualenv environment
+deprecations:
+ - |
+ Source install for ``pip-and-virtualenv`` is deprecated for RHEL
+ 8/CentOS 8
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/releasenotes/notes/simple-init-nm-5d19e249c0a4560b.yaml
new/diskimage-builder-2.28.0/releasenotes/notes/simple-init-nm-5d19e249c0a4560b.yaml
---
old/diskimage-builder-2.27.0/releasenotes/notes/simple-init-nm-5d19e249c0a4560b.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/releasenotes/notes/simple-init-nm-5d19e249c0a4560b.yaml
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ The ``simple-init`` element will now default to using NetworkManager
+ for CentOS and Fedora platforms. For CentOS 8 and Fedora, the
+ ``DIB_SIMPLE_INIT_NETWORKMANAGER=0`` option is no longer supported.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.27.0/requirements.txt
new/diskimage-builder-2.28.0/requirements.txt
--- old/diskimage-builder-2.27.0/requirements.txt 2019-09-09
08:16:15.000000000 +0200
+++ new/diskimage-builder-2.28.0/requirements.txt 2019-10-09
22:46:07.000000000 +0200
@@ -9,3 +9,5 @@
PyYAML>=3.12 # MIT
six>=1.10.0 # MIT
stevedore>=1.20.0 # Apache-2.0
+# NOTE(ianw) in here because dib-lint uses flake8
+hacking<1.2.0,>=1.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/tasks/main.yaml
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/tasks/main.yaml
--- old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/tasks/main.yaml
2019-09-09 08:16:11.000000000 +0200
+++ new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/tasks/main.yaml
2019-10-09 22:46:07.000000000 +0200
@@ -5,23 +5,40 @@
- debug: msg="zuul site mirror {{ zuul_site_mirror_fqdn }}"
- debug: msg="mirror_fqdn {{ mirror_fqdn }}"
-- name: Create centos-minimal directory
+- name: Create centos-minimal 7 directory
file:
- path: "{{ dib_gate_mirror_repos }}/centos-minimal/yum.repos.d"
+ path: "{{ dib_gate_mirror_repos }}/centos-minimal/7/yum.repos.d"
state: directory
mode: 0775
recurse: yes
-- name: Install centos-minimal repo files
+- name: Install centos-minimal 7 repo files
template:
- dest: "{{ dib_gate_mirror_repos
}}/centos-minimal/yum.repos.d/dib-mirror-{{ item }}"
+ dest: "{{ dib_gate_mirror_repos
}}/centos-minimal/7/yum.repos.d/dib-mirror-{{ item }}"
mode: 0644
- src: "centos-minimal/{{ item }}.j2"
+ src: "centos-minimal/7/{{ item }}.j2"
with_items:
- base.repo
- updates.repo
- extras.repo
+- name: Create centos-minimal 8 directory
+ file:
+ path: "{{ dib_gate_mirror_repos }}/centos-minimal/8/yum.repos.d"
+ state: directory
+ mode: 0775
+ recurse: yes
+
+- name: Install centos-minimal 8 repo files
+ template:
+ dest: "{{ dib_gate_mirror_repos
}}/centos-minimal/8/yum.repos.d/dib-mirror-{{ item }}"
+ mode: 0644
+ src: "centos-minimal/8/{{ item }}.j2"
+ with_items:
+ - base.repo
+ - appstream.repo
+ - extras.repo
+
- name: Create fedora-minimal directories
file:
path: "{{ dib_gate_mirror_repos }}/fedora-minimal/{{ item }}/yum.repos.d"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/7/base.repo.j2
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/7/base.repo.j2
---
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/7/base.repo.j2
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/7/base.repo.j2
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,4 @@
+[base]
+name=CentOS-$releasever - Base
+baseurl=http://{{ mirror_fqdn }}/centos/$releasever/os/$basearch/
+gpgcheck=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/7/extras.repo.j2
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/7/extras.repo.j2
---
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/7/extras.repo.j2
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/7/extras.repo.j2
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,5 @@
+#additional packages that may be useful
+[extras]
+name=CentOS-$releasever - Extras
+baseurl=http://{{ mirror_fqdn }}/centos/$releasever/extras/$basearch/
+gpgcheck=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/7/updates.repo.j2
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/7/updates.repo.j2
---
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/7/updates.repo.j2
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/7/updates.repo.j2
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,5 @@
+#released updates
+[updates]
+name=CentOS-$releasever - Updates
+baseurl=http://{{ mirror_fqdn }}/centos/$releasever/updates/$basearch/
+gpgcheck=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/appstream.repo.j2
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/appstream.repo.j2
---
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/appstream.repo.j2
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/appstream.repo.j2
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,4 @@
+[AppStream]
+name=CentOS-$releasever - AppStream
+baseurl=http://{{ mirror_fqdn }}/centos/$releasever/AppStream/$basearch/os/
+gpgcheck=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/base.repo.j2
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/base.repo.j2
---
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/base.repo.j2
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/base.repo.j2
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,4 @@
+[base]
+name=CentOS-$releasever - Base
+baseurl=http://{{ mirror_fqdn }}/centos/$releasever/BaseOS/$basearch/os/
+gpgcheck=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/extras.repo.j2
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/extras.repo.j2
---
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/extras.repo.j2
1970-01-01 01:00:00.000000000 +0100
+++
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/extras.repo.j2
2019-10-09 22:46:07.000000000 +0200
@@ -0,0 +1,5 @@
+#additional packages that may be useful
+[extras]
+name=CentOS-$releasever - Extras
+baseurl=http://{{ mirror_fqdn }}/centos/$releasever/extras/$basearch/os/
+gpgcheck=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/base.repo.j2
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/base.repo.j2
---
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/base.repo.j2
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/base.repo.j2
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-[base]
-name=CentOS-$releasever - Base
-baseurl=http://{{ mirror_fqdn }}/centos/$releasever/os/$basearch/
-gpgcheck=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/extras.repo.j2
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/extras.repo.j2
---
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/extras.repo.j2
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/extras.repo.j2
1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-#additional packages that may be useful
-[extras]
-name=CentOS-$releasever - Extras
-baseurl=http://{{ mirror_fqdn }}/centos/$releasever/extras/$basearch/
-gpgcheck=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/updates.repo.j2
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/updates.repo.j2
---
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/updates.repo.j2
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/centos-minimal/updates.repo.j2
1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-#released updates
-[updates]
-name=CentOS-$releasever - Updates
-baseurl=http://{{ mirror_fqdn }}/centos/$releasever/updates/$basearch/
-gpgcheck=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2
---
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2
2019-10-09 22:46:07.000000000 +0200
@@ -1,6 +1,5 @@
[updates]
name=Fedora $releasever - $basearch - Updates
-failovermethod=priority
baseurl=http://{{ mirror_fqdn
}}/fedora/updates/$releasever/Everything/$basearch/
enabled=1
gpgcheck=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2
---
old/diskimage-builder-2.27.0/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2
2019-09-09 08:16:11.000000000 +0200
+++
new/diskimage-builder-2.28.0/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2
2019-10-09 22:46:07.000000000 +0200
@@ -1,6 +1,5 @@
[fedora]
name=Fedora $releasever - $basearch
-failovermethod=priority
baseurl=http://{{ mirror_fqdn
}}/fedora/releases/$releasever/Everything/$basearch/os/
enabled=1
metadata_expire=7d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.27.0/test-requirements.txt
new/diskimage-builder-2.28.0/test-requirements.txt
--- old/diskimage-builder-2.27.0/test-requirements.txt 2019-09-09
08:16:15.000000000 +0200
+++ new/diskimage-builder-2.28.0/test-requirements.txt 2019-10-09
22:46:07.000000000 +0200
@@ -2,7 +2,6 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking<1.2.0,>=1.1.0
pylint==1.7.6;python_version=='2.7' # GPLv2
pylint;python_version>'3.0' #GPLv2
@@ -12,12 +11,4 @@
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
-# Doc requirements
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
-
-# releasenotes
-reno>=2.5.0 # Apache-2.0
-
coverage!=4.4,>=4.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diskimage-builder-2.27.0/tox.ini
new/diskimage-builder-2.28.0/tox.ini
--- old/diskimage-builder-2.27.0/tox.ini 2019-09-09 08:16:11.000000000
+0200
+++ new/diskimage-builder-2.28.0/tox.ini 2019-10-09 22:46:07.000000000
+0200
@@ -45,10 +45,16 @@
commands = python setup.py test --coverage --coverage-package-name
diskimage_builder --testr-args='{posargs}'
[testenv:docs]
+deps= -r{toxinidir}/doc/requirements.txt
basepython = python3
-commands = python setup.py build_sphinx
+whitelist_externals =
+ rm
+commands =
+ rm -rf doc/build
+ sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html
{posargs}
[testenv:releasenotes]
+deps = {[testenv:docs]deps}
basepython = python3
commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html
releasenotes/source releasenotes/build/html
