Hello community, here is the log from the commit of package diskimage-builder for openSUSE:Factory checked in at 2017-07-17 09:11:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diskimage-builder (Old) and /work/SRC/openSUSE:Factory/.diskimage-builder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diskimage-builder" Mon Jul 17 09:11:34 2017 rev:10 rq:510261 version:2.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/diskimage-builder/diskimage-builder.changes 2017-06-16 10:54:30.345843815 +0200 +++ /work/SRC/openSUSE:Factory/.diskimage-builder.new/diskimage-builder.changes 2017-07-17 09:11:36.224172038 +0200 @@ -1,0 +2,13 @@ +Fri Jul 14 11:11:17 UTC 2017 - mchand...@suse.de + +- Version bump to 2.6.1 + * On suse the python2 dev package is python-devel + * Move ironic-agent test to fedora-minimal + * Start at using CI mirrors for fedora/centos + * Use local mirror for ubuntu-minimal jobs + * Move apt-sources to ubuntu-minimal / move debian to skip list + * Sync after writing partition table + * Install systemd earlier for Stretch + * Fix mkfs failure when loop device is not ready + +------------------------------------------------------------------- Old: ---- diskimage-builder-2.6.0.tar.gz New: ---- diskimage-builder-2.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diskimage-builder.spec ++++++ --- /var/tmp/diff_new_pack.myOEu0/_old 2017-07-17 09:11:36.880079653 +0200 +++ /var/tmp/diff_new_pack.myOEu0/_new 2017-07-17 09:11:36.880079653 +0200 @@ -21,7 +21,7 @@ %global __requires_exclude_from ^%{python_sitelib}/diskimage_builder/elements/.*$ Name: diskimage-builder -Version: 2.6.0 +Version: 2.6.1 Release: 0 Summary: Image Building Tools for OpenStack License: Apache-2.0 ++++++ diskimage-builder-2.6.0.tar.gz -> diskimage-builder-2.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/ChangeLog new/diskimage-builder-2.6.1/ChangeLog --- old/diskimage-builder-2.6.0/ChangeLog 2017-06-13 07:13:38.000000000 +0200 +++ new/diskimage-builder-2.6.1/ChangeLog 2017-06-23 06:34:12.000000000 +0200 @@ -1,6 +1,18 @@ CHANGES ======= +2.6.1 +----- + +* On suse the python2 dev package is python-devel +* Move ironic-agent test to fedora-minimal +* Start at using CI mirrors for fedora/centos +* Use local mirror for ubuntu-minimal jobs +* Move apt-sources to ubuntu-minimal / move debian to skip list +* Sync after writing partition table +* Install systemd earlier for Stretch +* Fix mkfs failure when loop device is not ready + 2.6.0 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/PKG-INFO new/diskimage-builder-2.6.1/PKG-INFO --- old/diskimage-builder-2.6.0/PKG-INFO 2017-06-13 07:13:38.000000000 +0200 +++ new/diskimage-builder-2.6.1/PKG-INFO 2017-06-23 06:34:13.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: diskimage-builder -Version: 2.6.0 +Version: 2.6.1 Summary: Golden Disk Image builder. Home-page: https://docs.openstack.org/developer/diskimage-builder/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/contrib/setup-gate-mirrors.sh new/diskimage-builder-2.6.1/contrib/setup-gate-mirrors.sh --- old/diskimage-builder-2.6.0/contrib/setup-gate-mirrors.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.6.1/contrib/setup-gate-mirrors.sh 2017-06-23 06:33:30.000000000 +0200 @@ -0,0 +1,81 @@ +#!/bin/bash + +set -x + +# +# This tool creates repo/sources files that point to the mirrors for +# the host region in the OpenStack CI gate. +# + +# This pre-created on CI nodes by slave scripts +source /etc/ci/mirror_info.sh + +# Tests should probe for this directory and then use the repos/sources +# files inside it for the gate tests. +BASE_DIR=$WORKSPACE/dib-mirror + +mkdir -p $BASE_DIR + +## REPOS + +# all should start with "dib-mirror-" +# gpg check turned off, because we don't have the keys outside the chroot + +# fedora-minimal +FEDORA_MIN_DIR=$BASE_DIR/fedora-minimal/yum.repos.d +mkdir -p $FEDORA_MIN_DIR + +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 +gpgcheck=0 +skip_if_unavailable=False +deltarpm=False +deltarpm_percentage=0 +EOF + +cat <<EOF > $FEDORA_MIN_DIR/dib-mirror-fedora-updates.repo +[updates] +name=Fedora \$releasever - \$basearch - Updates +failovermethod=priority +baseurl=$NODEPOOL_FEDORA_MIRROR/updates/\$releasever/\$basearch/ +enabled=1 +gpgcheck=0 +metadata_expire=6h +skip_if_unavailable=False +deltarpm=False +deltarpm_percentage=0 +EOF + +# Centos Minimal +CENTOS_MIN_DIR=$BASE_DIR/centos-minimal/yum.repos.d +mkdir -p $CENTOS_MIN_DIR + +cat <<EOF > $CENTOS_MIN_DIR/dib-mirror-base.repo +[base] +name=CentOS-\$releasever - Base +baseurl=$NODEPOOL_CENTOS_MIRROR/\$releasever/os/\$basearch/ +gpgcheck=0 +EOF + +cat <<EOF > $CENTOS_MIN_DIR/dib-mirror-updates.repo +#released updates +[updates] +name=CentOS-\$releasever - Updates +baseurl=$NODEPOOL_CENTOS_MIRROR/\$releasever/updates/\$basearch/ +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/ +gpgcheck=0 +EOF + +## apt sources (todo) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/block_device/level1/mbr.py new/diskimage-builder-2.6.1/diskimage_builder/block_device/level1/mbr.py --- old/diskimage-builder-2.6.0/diskimage_builder/block_device/level1/mbr.py 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/block_device/level1/mbr.py 2017-06-23 06:33:30.000000000 +0200 @@ -11,10 +11,11 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. + import logging +import os import random - from struct import pack @@ -173,6 +174,8 @@ return self def __exit__(self, exc_type, exc_value, traceback): + self.image_fd.flush() + os.fsync(self.image_fd.fileno()) self.image_fd.close() def lba2chs(self, lba): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/block_device/level1/partitioning.py new/diskimage-builder-2.6.1/diskimage_builder/block_device/level1/partitioning.py --- old/diskimage-builder-2.6.0/diskimage_builder/block_device/level1/partitioning.py 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/block_device/level1/partitioning.py 2017-06-23 06:33:30.000000000 +0200 @@ -143,6 +143,9 @@ self.state['blockdev'][part_name] \ = {'device': partition_device_name} + # "saftey sync" to make sure the partitions are written + exec_sudo(["sync"]) + # now all the partitions are created, get device-mapper to # mount them if not os.path.exists("/.dockerenv"): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/block_device/tests/test_mbr.py new/diskimage-builder-2.6.1/diskimage_builder/block_device/tests/test_mbr.py --- old/diskimage-builder-2.6.0/diskimage_builder/block_device/tests/test_mbr.py 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/block_device/tests/test_mbr.py 2017-06-23 06:33:30.000000000 +0200 @@ -12,6 +12,7 @@ import fixtures import logging +import mock import os import subprocess @@ -62,11 +63,17 @@ logger.info("Running command: %s", self.partx_args) return subprocess.check_output(self.partx_args).decode("ascii") - def test_one_ext_partition(self): + @mock.patch('os.fsync', wraps=os.fsync) + def test_one_ext_partition(self, mock_os_fsync): """Creates one partition and check correctness with partx.""" with MBR(self.image_path, TestMBR.disk_size_1G, 1024 * 1024) as mbr: mbr.add_partition(False, False, TestMBR.disk_size_10M, 0x83) + + # the exit handler of MBR should have synced the raw device + # before exit + mock_os_fsync.assert_called() + output = self._run_partx(self.image_path) self.assertEqual( "1 2048 2097151 0xf 0x0 dos\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/apt-sources/test-elements/test-sources/element-deps new/diskimage-builder-2.6.1/diskimage_builder/elements/apt-sources/test-elements/test-sources/element-deps --- old/diskimage-builder-2.6.0/diskimage_builder/elements/apt-sources/test-elements/test-sources/element-deps 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/apt-sources/test-elements/test-sources/element-deps 2017-06-23 06:33:30.000000000 +0200 @@ -1,2 +1,3 @@ base -ubuntu +openstack-ci-mirrors +ubuntu-minimal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/element-deps new/diskimage-builder-2.6.1/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/element-deps --- old/diskimage-builder-2.6.0/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/element-deps 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/centos-minimal/test-elements/build-succeeds/element-deps 2017-06-23 06:33:30.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.6.0/diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps new/diskimage-builder-2.6.1/diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps --- old/diskimage-builder-2.6.0/diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/centos7/test-elements/build-succeeds/element-deps 2017-06-23 06:33:30.000000000 +0200 @@ -1 +1,2 @@ base +openstack-ci-mirrors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/debian-minimal/README.rst new/diskimage-builder-2.6.1/diskimage_builder/elements/debian-minimal/README.rst --- old/diskimage-builder-2.6.0/diskimage_builder/elements/debian-minimal/README.rst 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/debian-minimal/README.rst 2017-06-23 06:33:30.000000000 +0200 @@ -11,4 +11,6 @@ the variable ``DIB_RELEASE``. If a different release of Debian should be created, the variable ``DIB_RELEASE`` can be set appropriately. +Note that this element installs ``systemd-sysv`` as the init system + .. element_deps:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/debian-minimal/package-installs.yaml new/diskimage-builder-2.6.1/diskimage_builder/elements/debian-minimal/package-installs.yaml --- old/diskimage-builder-2.6.0/diskimage_builder/elements/debian-minimal/package-installs.yaml 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/debian-minimal/package-installs.yaml 2017-06-23 06:33:30.000000000 +0200 @@ -2,5 +2,3 @@ arch: amd64 linux-image-686: arch: i386 -systemd: -systemd-sysv: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/debian-minimal/pkg-map new/diskimage-builder-2.6.1/diskimage_builder/elements/debian-minimal/pkg-map --- old/diskimage-builder-2.6.0/diskimage_builder/elements/debian-minimal/pkg-map 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/debian-minimal/pkg-map 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -{ - "release": { - "debian": { - "testing": { - "systemd": "systemd", - "systemd-sysv": "systemd-sysv" - } - } - }, - "default": { - "systemd": "", - "systemd-sysv": "" - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/debian-minimal/root.d/75-debian-minimal-baseinstall new/diskimage-builder-2.6.1/diskimage_builder/elements/debian-minimal/root.d/75-debian-minimal-baseinstall --- old/diskimage-builder-2.6.0/diskimage_builder/elements/debian-minimal/root.d/75-debian-minimal-baseinstall 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/debian-minimal/root.d/75-debian-minimal-baseinstall 2017-06-23 06:33:30.000000000 +0200 @@ -16,6 +16,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +# dib-lint: disable=safe_sudo + if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then set -x fi @@ -54,13 +56,23 @@ $apt_get clean $apt_get dist-upgrade -y -$apt_get install -y busybox sudo +to_install="" + +# pre-stretch (9.0) brought this in via debootstrap, but init +# dependencies have narrowed in the container world, so now we add it +# explicitly here so it's brought in early. +to_install+="systemd-sysv " + +# default required +to_install+="busybox sudo " if [ "$DIB_PYTHON_VERSION" == "2" ]; then - $apt_get install -y python + to_install+="python " elif [ "$DIB_PYTHON_VERSION" == "3" ]; then - $apt_get install -y python3 + to_install+="python3 " else echo "ERROR: DIB_PYTHON_VERSION is '$DIB_PYTHON_VERSION' but needs to be 2 or 3" exit 1 fi + +$apt_get install -y $to_install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/debian-systemd/README.rst new/diskimage-builder-2.6.1/diskimage_builder/elements/debian-systemd/README.rst --- old/diskimage-builder-2.6.0/diskimage_builder/elements/debian-systemd/README.rst 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/debian-systemd/README.rst 2017-06-23 06:33:30.000000000 +0200 @@ -4,4 +4,7 @@ You may want to use `systemd` instead of the classic sysv init system. In this case, include this element in your element list. +Note that this works with the ``debian`` element, not the +``debian-minimal`` element. + .. element_deps:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/debian-upstart/README.rst new/diskimage-builder-2.6.1/diskimage_builder/elements/debian-upstart/README.rst --- old/diskimage-builder-2.6.0/diskimage_builder/elements/debian-upstart/README.rst 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/debian-upstart/README.rst 2017-06-23 06:33:30.000000000 +0200 @@ -5,4 +5,7 @@ with Upstart, or have need of it due to a need for upstart jobs, this element will build the image with upstart as the init system. +Note that this works with the ``debian`` element, not the +``debian-minimal`` element. + .. element_deps:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/fedora/test-elements/build-succeeds/element-deps new/diskimage-builder-2.6.1/diskimage_builder/elements/fedora/test-elements/build-succeeds/element-deps --- old/diskimage-builder-2.6.0/diskimage_builder/elements/fedora/test-elements/build-succeeds/element-deps 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/fedora/test-elements/build-succeeds/element-deps 2017-06-23 06:33:30.000000000 +0200 @@ -1 +1,2 @@ base +openstack-ci-mirrors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/fedora/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash new/diskimage-builder-2.6.1/diskimage_builder/elements/fedora/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash --- old/diskimage-builder-2.6.0/diskimage_builder/elements/fedora/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/fedora/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# Pin to this mirror because the roundrobin is fairly unreliable -export DIB_DISTRIBUTION_MIRROR=http://dl.fedoraproject.org/pub/fedora/linux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/element-deps new/diskimage-builder-2.6.1/diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/element-deps --- old/diskimage-builder-2.6.0/diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/element-deps 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/element-deps 2017-06-23 06:33:30.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.6.0/diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash new/diskimage-builder-2.6.1/diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash --- old/diskimage-builder-2.6.0/diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# Pin to this mirror because the roundrobin is fairly unreliable -export DIB_DISTRIBUTION_MIRROR=http://dl.fedoraproject.org/pub/fedora/linux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-deps new/diskimage-builder-2.6.1/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-deps --- old/diskimage-builder-2.6.0/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-deps 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-deps 2017-06-23 06:33:30.000000000 +0200 @@ -1 +1,2 @@ -fedora +fedora-minimal +openstack-ci-mirrors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/environment.d/10-fedora-pin-mirror.bash new/diskimage-builder-2.6.1/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/environment.d/10-fedora-pin-mirror.bash --- old/diskimage-builder-2.6.0/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/environment.d/10-fedora-pin-mirror.bash 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/environment.d/10-fedora-pin-mirror.bash 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# Pin to this mirror because the roundrobin is fairly unreliable -export DIB_DISTRIBUTION_MIRROR=http://dl.fedoraproject.org/pub/fedora/linux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/openstack-ci-mirrors/README.rst new/diskimage-builder-2.6.1/diskimage_builder/elements/openstack-ci-mirrors/README.rst --- old/diskimage-builder-2.6.0/diskimage_builder/elements/openstack-ci-mirrors/README.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/openstack-ci-mirrors/README.rst 2017-06-23 06:33:30.000000000 +0200 @@ -0,0 +1,8 @@ +==================== +openstack-ci-mirrors +==================== + +This element contains various settings to setup mirrors for openstack +ci gate testing in a generic fashion. It is intended to be used as a +dependency of testing elements that run in the gate. It should do +nothing outside that environment. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash new/diskimage-builder-2.6.1/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash --- old/diskimage-builder-2.6.0/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash 2017-06-23 06:33:30.000000000 +0200 @@ -0,0 +1,38 @@ +# Set DIB_DISTRIBUTION_MIRROR if running in openstack gate +if [ -f /etc/ci/mirror_info.sh ]; then + + # don't spam logs with this source + _xtrace=$(set +o | grep xtrace) + set +o xtrace + source /etc/ci/mirror_info.sh + $_xtrace + + # note 11- is after 10- which is where DISTRO_NAME is set usually + + if [[ "${DISTRO_NAME}" == "ubuntu" ]]; then + export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_UBUNTU_MIRROR + export DIB_DEBOOTSTRAP_EXTRA_ARGS+=" --no-check-gpg" + elif [[ "${DISTRO_NAME}" == "debian" ]]; then + export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_DEBIAN_MIRROR + export DIB_DEBOOTSTRAP_EXTRA_ARGS+=" --no-check-gpg" + elif [[ "${DISTRO_NAME}" == "fedora" ]]; then + export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_FEDORA_MIRROR + elif [[ "${DISTRO_NAME}" == "centos" ]]; then + export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_CENTOS_MIRROR + elif [[ "${DISTRO_NAME}" == "centos7" ]]; then + export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_CENTOS_MIRROR + fi + +fi + +# This is repo files pre-created for the fedora/centos-minimal jobs in +# the gate +if [[ -d ${WORKSPACE:-/not/a/path/}/dib-mirror ]]; then + + if [[ "${DISTRO_NAME}" == "fedora" ]]; then + export DIB_YUM_MINIMAL_BOOTSTRAP_REPOS=${WORKSPACE}/dib-mirror/fedora-minimal/yum.repos.d + elif [[ "${DISTRO_NAME}" == "centos" ]]; then + export DIB_YUM_MINIMAL_BOOTSTRAP_REPOS=${WORKSPACE}/dib-mirror/centos-minimal/yum.repos.d + fi + +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/openstack-ci-mirrors/root.d/10-apt-disable-gpg new/diskimage-builder-2.6.1/diskimage_builder/elements/openstack-ci-mirrors/root.d/10-apt-disable-gpg --- old/diskimage-builder-2.6.0/diskimage_builder/elements/openstack-ci-mirrors/root.d/10-apt-disable-gpg 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/openstack-ci-mirrors/root.d/10-apt-disable-gpg 2017-06-23 06:33:30.000000000 +0200 @@ -0,0 +1,37 @@ +#!/bin/bash +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +# dib-lint: disable=safe_sudo + +if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then + set -x +fi +set -eu +set -o pipefail + +# Disable gpg signing for apt openstack ci repos are created by reprepro +# and not signed. + +# This has to be after debootstrap, but before anything else tries to +# use the mirror. + +APT_DIR=${TARGET_ROOT}/etc/apt/apt.conf.d + +if [ -d ${APT_DIR} ]; then + FILE=${APT_DIR}/99unauthenticated + sudo dd of=${FILE} <<EOF +APT::Get::AllowUnauthenticated "true"; +EOF + sudo chmod 0644 ${FILE} +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/pip-and-virtualenv/pkg-map new/diskimage-builder-2.6.1/diskimage_builder/elements/pip-and-virtualenv/pkg-map --- old/diskimage-builder-2.6.0/diskimage_builder/elements/pip-and-virtualenv/pkg-map 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/pip-and-virtualenv/pkg-map 2017-06-23 06:33:30.000000000 +0200 @@ -10,7 +10,7 @@ }, "suse": { "python-xml": "python-xml", - "python-dev": "python2-devel", + "python-dev": "python-devel", "python3-dev": "python3-devel" }, "redhat": { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-fedora/element-deps new/diskimage-builder-2.6.1/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-fedora/element-deps --- old/diskimage-builder-2.6.0/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-fedora/element-deps 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-fedora/element-deps 2017-06-23 06:33:30.000000000 +0200 @@ -1 +1,2 @@ fedora-minimal +openstack-ci-mirrors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-ubuntu/element-deps new/diskimage-builder-2.6.1/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-ubuntu/element-deps --- old/diskimage-builder-2.6.0/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-ubuntu/element-deps 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/pip-and-virtualenv/test-elements/source-install-ubuntu/element-deps 2017-06-23 06:33:30.000000000 +0200 @@ -1 +1,2 @@ +openstack-ci-mirrors ubuntu-minimal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash new/diskimage-builder-2.6.1/diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash --- old/diskimage-builder-2.6.0/diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/ubuntu-minimal/environment.d/10-ubuntu-distro-name.bash 2017-06-23 06:33:30.000000000 +0200 @@ -1,6 +1,6 @@ export DISTRO_NAME=ubuntu export DIB_RELEASE=${DIB_RELEASE:-xenial} -export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main,restricted,universe} +export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main,universe} if [ -n "${DIB_UBUNTU_DISTRIBUTION_MIRROR:-}" ]; then DIB_DISTRIBUTION_MIRROR=$DIB_UBUNTU_DISTRIBUTION_MIRROR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/ubuntu-minimal/test-elements/trusty-build-succeeds/element-deps new/diskimage-builder-2.6.1/diskimage_builder/elements/ubuntu-minimal/test-elements/trusty-build-succeeds/element-deps --- old/diskimage-builder-2.6.0/diskimage_builder/elements/ubuntu-minimal/test-elements/trusty-build-succeeds/element-deps 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/ubuntu-minimal/test-elements/trusty-build-succeeds/element-deps 2017-06-23 06:33:30.000000000 +0200 @@ -0,0 +1 @@ +openstack-ci-mirrors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/ubuntu-minimal/test-elements/xenial-build-succeeds/element-deps new/diskimage-builder-2.6.1/diskimage_builder/elements/ubuntu-minimal/test-elements/xenial-build-succeeds/element-deps --- old/diskimage-builder-2.6.0/diskimage_builder/elements/ubuntu-minimal/test-elements/xenial-build-succeeds/element-deps 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/ubuntu-minimal/test-elements/xenial-build-succeeds/element-deps 2017-06-23 06:33:30.000000000 +0200 @@ -1 +1,2 @@ -vm \ No newline at end of file +openstack-ci-mirrors +vm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/yum-minimal/README.rst new/diskimage-builder-2.6.1/diskimage_builder/elements/yum-minimal/README.rst --- old/diskimage-builder-2.6.0/diskimage_builder/elements/yum-minimal/README.rst 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/yum-minimal/README.rst 2017-06-23 06:33:30.000000000 +0200 @@ -12,3 +12,9 @@ If you wish to have DHCP networking setup for eth0 & eth1 via /etc/sysconfig/network-config scripts/ifcfg-eth[0|1], set the environment variable `DIB_YUM_MINIMAL_CREATE_INTERFACES` to `1`. + +If you wish to build from specific mirrors, set +``DIB_YUM_MINIMAL_BOOTSTRAP_REPOS`` to a directory with the ``.repo`` +files to use during bootstrap and build. The repo files should be +named with a prefix ``dib-mirror-`` and will be removed from the final +image. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/yum-minimal/cleanup.d/95-remove-yum-mirror new/diskimage-builder-2.6.1/diskimage_builder/elements/yum-minimal/cleanup.d/95-remove-yum-mirror --- old/diskimage-builder-2.6.0/diskimage_builder/elements/yum-minimal/cleanup.d/95-remove-yum-mirror 1970-01-01 01:00:00.000000000 +0100 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/yum-minimal/cleanup.d/95-remove-yum-mirror 2017-06-23 06:33:30.000000000 +0200 @@ -0,0 +1,35 @@ +#!/bin/bash +# +# Copyright 2015 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + +# dib-lint: disable=safe_sudo + +if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then + set -x +fi +set -eu +set -o pipefail + +# This removes any build-time repos that might be set in 08-yum-chroot +if [[ -n ${DIB_YUM_MINIMAL_BOOTSTRAP_REPOS:-} ]]; then + + sudo rm -f $TMP_MOUNT_PATH/etc/yum.repos.d/dib-mirror*.repo + + for repo in $TMP_MOUNT_PATH/etc/yum.repos.d/*.USING_MIRROR; do + sudo mv $repo ${repo/.USING_MIRROR/} + done + +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/yum-minimal/package-installs.yaml new/diskimage-builder-2.6.1/diskimage_builder/elements/yum-minimal/package-installs.yaml --- old/diskimage-builder-2.6.0/diskimage_builder/elements/yum-minimal/package-installs.yaml 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/yum-minimal/package-installs.yaml 2017-06-23 06:33:30.000000000 +0200 @@ -9,3 +9,4 @@ selinux-policy: selinux-policy-targeted: libselinux-python: +redhat-rpm-config: \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot new/diskimage-builder-2.6.1/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot --- old/diskimage-builder-2.6.0/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot 2017-06-23 06:33:30.000000000 +0200 @@ -78,15 +78,23 @@ packages+="${DISTRO_NAME}-repos " fi + # By default, parent elements (fedora-minimal, centos-minimal) + # have a yum.repos.d directory in the element with a default repo; + # this is copied to TMP_HOOK_PATH by the usual hook-copying + # 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} + # yumdownloader puts repo xml files and such into a directory # ${TMPDIR}/yum-$USER-random. Since we don't need this once the # initial download happens, redirect TMPDIR for this call so we # can clean it up nicely local temp_tmp temp_tmp=$(mktemp -d) - TMPDIR=${temp_tmp} yumdownloader \ + TMPDIR=${temp_tmp} yumdownloader --verbose \ --releasever=$DIB_RELEASE \ - --setopt=reposdir=$TMP_HOOKS_PATH/yum.repos.d \ + --setopt=reposdir=$repo \ --destdir=$WORKING \ ${packages} && rc=$? || rc=$? rm -rf ${temp_tmp} @@ -97,6 +105,18 @@ # --nodeps works around these wanting /bin/sh in some fedora # releases, see rhbz#1265873 sudo $_RPM --root $TARGET_ROOT --nodeps -ivh $WORKING/*rpm + + # install the bootstrap mirror repos over the default ones, if + # set. we will remove this at the end so the final image has + # regular mirrors + if [[ -n ${DIB_YUM_MINIMAL_BOOTSTRAP_REPOS:-} ]]; then + for repo in $TARGET_ROOT/etc/yum.repos.d/*.repo; do + sudo mv $repo $repo.USING_MIRROR + done + sudo cp ${DIB_YUM_MINIMAL_BOOTSTRAP_REPOS}/* \ + $TARGET_ROOT/etc/yum.repos.d/ + fi + } # _install_pkg_manager packages... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder.egg-info/PKG-INFO new/diskimage-builder-2.6.1/diskimage_builder.egg-info/PKG-INFO --- old/diskimage-builder-2.6.0/diskimage_builder.egg-info/PKG-INFO 2017-06-13 07:13:38.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder.egg-info/PKG-INFO 2017-06-23 06:34:12.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: diskimage-builder -Version: 2.6.0 +Version: 2.6.1 Summary: Golden Disk Image builder. Home-page: https://docs.openstack.org/developer/diskimage-builder/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder.egg-info/SOURCES.txt new/diskimage-builder-2.6.1/diskimage_builder.egg-info/SOURCES.txt --- old/diskimage-builder-2.6.0/diskimage_builder.egg-info/SOURCES.txt 2017-06-13 07:13:38.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder.egg-info/SOURCES.txt 2017-06-23 06:34:13.000000000 +0200 @@ -12,6 +12,7 @@ test-requirements.txt tox.ini bin/dib-lint +contrib/setup-gate-mirrors.sh diskimage_builder/__init__.py diskimage_builder/disk_image_create.py diskimage_builder/element_dependencies.py @@ -111,6 +112,7 @@ 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/environment.d/00-bootloader.bash diskimage_builder/elements/centos/environment.d/10-centos6-distro-name.bash @@ -149,7 +151,6 @@ diskimage_builder/elements/debian-minimal/element-deps diskimage_builder/elements/debian-minimal/element-provides diskimage_builder/elements/debian-minimal/package-installs.yaml -diskimage_builder/elements/debian-minimal/pkg-map diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash diskimage_builder/elements/debian-minimal/root.d/75-debian-minimal-baseinstall diskimage_builder/elements/debian-minimal/test-elements/stable-build-succeeds/README.rst @@ -303,14 +304,13 @@ diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash diskimage_builder/elements/fedora-minimal/environment.d/11-yum-dnf.bash diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/README.rst -diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash +diskimage_builder/elements/fedora-minimal/test-elements/build-succeeds/element-deps diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash diskimage_builder/elements/fedora/environment.d/11-yum-dnf.bash diskimage_builder/elements/fedora/pre-install.d/01-set-fedora-mirror diskimage_builder/elements/fedora/root.d/10-fedora-cloud-image diskimage_builder/elements/fedora/test-elements/build-succeeds/element-deps -diskimage_builder/elements/fedora/test-elements/build-succeeds/environment.d/10-fedora-pin-mirror.bash diskimage_builder/elements/gentoo/README.rst diskimage_builder/elements/gentoo/element-deps diskimage_builder/elements/gentoo/element-provides @@ -381,7 +381,6 @@ diskimage_builder/elements/ironic-agent/post-install.d/80-ironic-agent diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-deps diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/element-type -diskimage_builder/elements/ironic-agent/test-elements/build-succeeds-fedora/environment.d/10-fedora-pin-mirror.bash diskimage_builder/elements/iso/README.rst diskimage_builder/elements/iso/element-deps diskimage_builder/elements/iso/package-installs.yaml @@ -418,6 +417,9 @@ diskimage_builder/elements/openssh-server/package-installs.yaml diskimage_builder/elements/openssh-server/pkg-map diskimage_builder/elements/openssh-server/post-install.d/80-enable-sshd-service +diskimage_builder/elements/openstack-ci-mirrors/README.rst +diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash +diskimage_builder/elements/openstack-ci-mirrors/root.d/10-apt-disable-gpg diskimage_builder/elements/opensuse/README.rst diskimage_builder/elements/opensuse/element-deps diskimage_builder/elements/opensuse/element-provides @@ -608,6 +610,7 @@ diskimage_builder/elements/ubuntu-minimal/pre-install.d/01-ubuntu-apt-update diskimage_builder/elements/ubuntu-minimal/root.d/75-ubuntu-minimal-baseinstall diskimage_builder/elements/ubuntu-minimal/test-elements/trusty-build-succeeds/README.rst +diskimage_builder/elements/ubuntu-minimal/test-elements/trusty-build-succeeds/element-deps diskimage_builder/elements/ubuntu-minimal/test-elements/trusty-build-succeeds/environment.d/10-set-distro.bash diskimage_builder/elements/ubuntu-minimal/test-elements/xenial-build-succeeds/README.rst diskimage_builder/elements/ubuntu-minimal/test-elements/xenial-build-succeeds/element-deps @@ -635,6 +638,7 @@ diskimage_builder/elements/yum-minimal/element-deps diskimage_builder/elements/yum-minimal/package-installs.yaml diskimage_builder/elements/yum-minimal/pkg-map +diskimage_builder/elements/yum-minimal/cleanup.d/95-remove-yum-mirror diskimage_builder/elements/yum-minimal/install.d/10-base-networking diskimage_builder/elements/yum-minimal/pre-install.d/03-yum-cleanup diskimage_builder/elements/yum-minimal/root.d/08-yum-chroot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/diskimage_builder.egg-info/pbr.json new/diskimage-builder-2.6.1/diskimage_builder.egg-info/pbr.json --- old/diskimage-builder-2.6.0/diskimage_builder.egg-info/pbr.json 2017-06-13 07:13:38.000000000 +0200 +++ new/diskimage-builder-2.6.1/diskimage_builder.egg-info/pbr.json 2017-06-23 06:34:12.000000000 +0200 @@ -1 +1 @@ -{"git_version": "1324f5b", "is_release": true} \ No newline at end of file +{"git_version": "559de43", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diskimage-builder-2.6.0/tests/run_functests.sh new/diskimage-builder-2.6.1/tests/run_functests.sh --- old/diskimage-builder-2.6.0/tests/run_functests.sh 2017-06-13 07:13:11.000000000 +0200 +++ new/diskimage-builder-2.6.1/tests/run_functests.sh 2017-06-23 06:33:30.000000000 +0200 @@ -11,6 +11,10 @@ import diskimage_builder.paths diskimage_builder.paths.show_path("elements")') +# XXX: This will move into the gate scripts, and happen before +# we run this script ... just here for initial bringup +./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh + # Setup sane locale defaults, because this information is leaked into DIB. export LANG=en_US.utf8 export LC_ALL= @@ -36,7 +40,12 @@ # in testing does not work always. debian-minimal/testing-build-succeeds # No longer reasonable to test upstream (lacks a mirror in infra) + # note this is centos6 centos/build-succeeds + # Needs infra mirroring to be stable + debian-minimal/stable-build-succeeds + debian-minimal/stable-vm + debian/build-succeeds ) # The default output formats (specified to disk-image-create's "-t"