Diff of the two buildlogs:

--
--- b1/build.log	2025-03-02 17:24:03.174176288 +0000
+++ b2/build.log	2025-03-02 17:26:12.592311711 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Sun Mar  2 05:17:50 -12 2025
-I: pbuilder-time-stamp: 1740935870
+I: Current time: Sun Apr  5 13:47:04 +14 2026
+I: pbuilder-time-stamp: 1775346424
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz]
 I: copying local configuration
@@ -24,52 +24,84 @@
 dpkg-source: info: applying fix-syntax-warning.patch
 I: Not using root during the build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/2663531/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/2548955/tmp/hooks/D01_modify_environment starting
+debug: Running on ionos5-amd64.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 Apr  4 23:47 /bin/sh -> /bin/bash
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/2548955/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/2548955/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build/reproducible-path'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='amd64'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=20 '
-  DISTRIBUTION='trixie'
-  HOME='/root'
-  HOST_ARCH='amd64'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:.
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="x86_64-pc-linux-gnu")
+  BASH_VERSION='5.2.37(1)-release'
+  BUILDDIR=/build/reproducible-path
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=amd64
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=42 '
+  DIRSTACK=()
+  DISTRIBUTION=trixie
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=x86_64
+  HOST_ARCH=amd64
   IFS=' 	
   '
-  INVOCATION_ID='25c9c968492247dbb32327d14666bc92'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='2663531'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=9030eb5d56454866b9f0d976470b04f6
+  LANG=C
+  LANGUAGE=et_EE:et
+  LC_ALL=C
+  MACHTYPE=x86_64-pc-linux-gnu
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnu
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=2548955
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.eem9aBXE/pbuilderrc_Zod8 --distribution trixie --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.eem9aBXE/b1 --logfile b1/build.log python-os-collect-config_13.1.0-5.dsc'
-  SUDO_GID='111'
-  SUDO_UID='106'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://46.16.76.132:3128'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.eem9aBXE/pbuilderrc_54M1 --distribution trixie --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.eem9aBXE/b2 --logfile b2/build.log python-os-collect-config_13.1.0-5.dsc'
+  SUDO_GID=110
+  SUDO_UID=105
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://213.165.73.152:3128
 I: uname -a
-  Linux ionos11-amd64 6.1.0-31-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.128-1 (2025-02-07) x86_64 GNU/Linux
+  Linux i-capture-the-hostname 6.12.9+bpo-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.12.9-1~bpo12+1 (2025-01-19) x86_64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 Nov 22 14:40 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/2663531/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Nov 22  2024 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/2548955/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -344,7 +376,7 @@
 Get: 193 http://deb.debian.org/debian trixie/main amd64 python3-stestr all 4.1.0-3 [56.9 kB]
 Get: 194 http://deb.debian.org/debian trixie/main amd64 python3-testscenarios all 0.5.0-4 [12.8 kB]
 Get: 195 http://deb.debian.org/debian trixie/main amd64 python3-zaqarclient all 2.8.0-3 [40.5 kB]
-Fetched 57.8 MB in 20s (2920 kB/s)
+Fetched 57.8 MB in 2s (23.4 MB/s)
 Preconfiguring packages ...
 Selecting previously unselected package libpython3.13-minimal:amd64.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19802 files and directories currently installed.)
@@ -968,8 +1000,8 @@
 Setting up tzdata (2025a-2) ...
 
 Current default time zone: 'Etc/UTC'
-Local time is now:      Sun Mar  2 17:21:30 UTC 2025.
-Universal Time is now:  Sun Mar  2 17:21:30 UTC 2025.
+Local time is now:      Sat Apr  4 23:47:58 UTC 2026.
+Universal Time is now:  Sat Apr  4 23:47:58 UTC 2026.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 Setting up autotools-dev (20220109.1) ...
@@ -1164,7 +1196,11 @@
 Building tag database...
  -> Finished parsing the build-deps
 I: Building the package
-I: Running cd /build/reproducible-path/python-os-collect-config-13.1.0/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../python-os-collect-config_13.1.0-5_source.changes
+I: user script /srv/workspace/pbuilder/2548955/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for trixie
+I: user script /srv/workspace/pbuilder/2548955/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/python-os-collect-config-13.1.0/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../python-os-collect-config_13.1.0-5_source.changes
 dpkg-buildpackage: info: source package python-os-collect-config
 dpkg-buildpackage: info: source version 13.1.0-5
 dpkg-buildpackage: info: source distribution unstable
@@ -1256,21 +1292,26 @@
 py3versions: no X-Python3-Version in control file, using supported versions
 pkgos-dh_auto_install --no-py2 --in-tmp
 + PKGOS_IN_TMP=no
-+ echo WARNING: --no-py2 is deprecated and always on.
++ for i in $@
++ case "${1}" in
++ echo 'WARNING: --no-py2 is deprecated and always on.'
 WARNING: --no-py2 is deprecated and always on.
 + shift
++ for i in $@
++ case "${1}" in
 + PKGOS_IN_TMP=yes
 + shift
-+ dpkg-parsechangelog -SSource
+++ dpkg-parsechangelog -SSource
 + SRC_PKG_NAME=python-os-collect-config
-+ echo python-os-collect-config
-+ sed s/python-//
+++ echo python-os-collect-config
+++ sed s/python-//
 + PY_MODULE_NAME=os-collect-config
-+ py3versions -vr
+++ py3versions -vr
 + PYTHON3S=3.13
-+ [ yes = yes ]
++ '[' yes = yes ']'
 + TARGET_DIR=tmp
-+ pwd
++ for pyvers in ${PYTHON3S}
+++ pwd
 + python3.13 setup.py install --install-layout=deb --root /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp
 /usr/lib/python3/dist-packages/setuptools/__init__.py:94: _DeprecatedInstaller: setuptools.installer and fetch_build_eggs are deprecated.
 !!
@@ -1315,36 +1356,37 @@
 [pbr] AUTHORS complete (0.0s)
 running build
 running build_py
+creating build/lib/os_collect_config
+copying os_collect_config/keystone.py -> build/lib/os_collect_config
+copying os_collect_config/ec2.py -> build/lib/os_collect_config
+copying os_collect_config/collect.py -> build/lib/os_collect_config
+copying os_collect_config/config_drive.py -> build/lib/os_collect_config
+copying os_collect_config/zaqar.py -> build/lib/os_collect_config
+copying os_collect_config/common.py -> build/lib/os_collect_config
+copying os_collect_config/merger.py -> build/lib/os_collect_config
+copying os_collect_config/exc.py -> build/lib/os_collect_config
+copying os_collect_config/local.py -> build/lib/os_collect_config
+copying os_collect_config/request.py -> build/lib/os_collect_config
+copying os_collect_config/version.py -> build/lib/os_collect_config
+copying os_collect_config/__init__.py -> build/lib/os_collect_config
+copying os_collect_config/heat.py -> build/lib/os_collect_config
+copying os_collect_config/heat_local.py -> build/lib/os_collect_config
+copying os_collect_config/cfn.py -> build/lib/os_collect_config
+copying os_collect_config/cache.py -> build/lib/os_collect_config
 creating build/lib/os_collect_config/tests
-copying os_collect_config/tests/__init__.py -> build/lib/os_collect_config/tests
+copying os_collect_config/tests/test_merger.py -> build/lib/os_collect_config/tests
+copying os_collect_config/tests/test_cfn.py -> build/lib/os_collect_config/tests
 copying os_collect_config/tests/test_config_drive.py -> build/lib/os_collect_config/tests
 copying os_collect_config/tests/test_zaqar.py -> build/lib/os_collect_config/tests
-copying os_collect_config/tests/test_cfn.py -> build/lib/os_collect_config/tests
+copying os_collect_config/tests/test_collect.py -> build/lib/os_collect_config/tests
+copying os_collect_config/tests/test_heat.py -> build/lib/os_collect_config/tests
+copying os_collect_config/tests/test_ec2.py -> build/lib/os_collect_config/tests
+copying os_collect_config/tests/test_keystone.py -> build/lib/os_collect_config/tests
 copying os_collect_config/tests/test_local.py -> build/lib/os_collect_config/tests
+copying os_collect_config/tests/__init__.py -> build/lib/os_collect_config/tests
 copying os_collect_config/tests/test_request.py -> build/lib/os_collect_config/tests
-copying os_collect_config/tests/test_keystone.py -> build/lib/os_collect_config/tests
-copying os_collect_config/tests/test_ec2.py -> build/lib/os_collect_config/tests
-copying os_collect_config/tests/test_merger.py -> build/lib/os_collect_config/tests
 copying os_collect_config/tests/test_cache.py -> build/lib/os_collect_config/tests
-copying os_collect_config/tests/test_collect.py -> build/lib/os_collect_config/tests
-copying os_collect_config/tests/test_heat.py -> build/lib/os_collect_config/tests
 copying os_collect_config/tests/test_heat_local.py -> build/lib/os_collect_config/tests
-copying os_collect_config/__init__.py -> build/lib/os_collect_config
-copying os_collect_config/heat.py -> build/lib/os_collect_config
-copying os_collect_config/cache.py -> build/lib/os_collect_config
-copying os_collect_config/collect.py -> build/lib/os_collect_config
-copying os_collect_config/merger.py -> build/lib/os_collect_config
-copying os_collect_config/request.py -> build/lib/os_collect_config
-copying os_collect_config/zaqar.py -> build/lib/os_collect_config
-copying os_collect_config/cfn.py -> build/lib/os_collect_config
-copying os_collect_config/ec2.py -> build/lib/os_collect_config
-copying os_collect_config/local.py -> build/lib/os_collect_config
-copying os_collect_config/common.py -> build/lib/os_collect_config
-copying os_collect_config/version.py -> build/lib/os_collect_config
-copying os_collect_config/heat_local.py -> build/lib/os_collect_config
-copying os_collect_config/config_drive.py -> build/lib/os_collect_config
-copying os_collect_config/exc.py -> build/lib/os_collect_config
-copying os_collect_config/keystone.py -> build/lib/os_collect_config
 running egg_info
 creating os_collect_config.egg-info
 writing os_collect_config.egg-info/PKG-INFO
@@ -1370,74 +1412,74 @@
 running install_lib
 creating /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages
 creating /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
-copying build/lib/os_collect_config/__init__.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
-copying build/lib/os_collect_config/heat.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
-copying build/lib/os_collect_config/cache.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
+copying build/lib/os_collect_config/keystone.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
+copying build/lib/os_collect_config/ec2.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
 copying build/lib/os_collect_config/collect.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
-copying build/lib/os_collect_config/merger.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
-copying build/lib/os_collect_config/request.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
+copying build/lib/os_collect_config/config_drive.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
 copying build/lib/os_collect_config/zaqar.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
-copying build/lib/os_collect_config/cfn.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
+copying build/lib/os_collect_config/common.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
+copying build/lib/os_collect_config/merger.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
+copying build/lib/os_collect_config/exc.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
 creating /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
-copying build/lib/os_collect_config/tests/__init__.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
+copying build/lib/os_collect_config/tests/test_merger.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
+copying build/lib/os_collect_config/tests/test_cfn.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
 copying build/lib/os_collect_config/tests/test_config_drive.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
 copying build/lib/os_collect_config/tests/test_zaqar.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
-copying build/lib/os_collect_config/tests/test_cfn.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
+copying build/lib/os_collect_config/tests/test_collect.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
+copying build/lib/os_collect_config/tests/test_heat.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
+copying build/lib/os_collect_config/tests/test_ec2.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
+copying build/lib/os_collect_config/tests/test_keystone.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
 copying build/lib/os_collect_config/tests/test_local.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
+copying build/lib/os_collect_config/tests/__init__.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
 copying build/lib/os_collect_config/tests/test_request.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
-copying build/lib/os_collect_config/tests/test_keystone.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
-copying build/lib/os_collect_config/tests/test_ec2.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
-copying build/lib/os_collect_config/tests/test_merger.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
 copying build/lib/os_collect_config/tests/test_cache.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
-copying build/lib/os_collect_config/tests/test_collect.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
-copying build/lib/os_collect_config/tests/test_heat.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
 copying build/lib/os_collect_config/tests/test_heat_local.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests
-copying build/lib/os_collect_config/ec2.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
 copying build/lib/os_collect_config/local.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
-copying build/lib/os_collect_config/common.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
+copying build/lib/os_collect_config/request.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
 copying build/lib/os_collect_config/version.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
+copying build/lib/os_collect_config/__init__.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
+copying build/lib/os_collect_config/heat.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
 copying build/lib/os_collect_config/heat_local.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
-copying build/lib/os_collect_config/config_drive.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
-copying build/lib/os_collect_config/exc.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
-copying build/lib/os_collect_config/keystone.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/__init__.py to __init__.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/heat.py to heat.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/cache.py to cache.cpython-313.pyc
+copying build/lib/os_collect_config/cfn.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
+copying build/lib/os_collect_config/cache.py -> /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/keystone.py to keystone.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/ec2.py to ec2.cpython-313.pyc
 byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/collect.py to collect.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/merger.py to merger.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/request.py to request.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/config_drive.py to config_drive.cpython-313.pyc
 byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/zaqar.py to zaqar.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/cfn.py to cfn.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/__init__.py to __init__.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/common.py to common.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/merger.py to merger.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/exc.py to exc.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_merger.py to test_merger.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_cfn.py to test_cfn.cpython-313.pyc
 byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_config_drive.py to test_config_drive.cpython-313.pyc
 byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_zaqar.py to test_zaqar.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_cfn.py to test_cfn.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_collect.py to test_collect.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_heat.py to test_heat.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_ec2.py to test_ec2.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_keystone.py to test_keystone.cpython-313.pyc
 byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_local.py to test_local.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/__init__.py to __init__.cpython-313.pyc
 byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_request.py to test_request.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_keystone.py to test_keystone.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_ec2.py to test_ec2.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_merger.py to test_merger.cpython-313.pyc
 byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_cache.py to test_cache.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_collect.py to test_collect.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_heat.py to test_heat.cpython-313.pyc
 byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/tests/test_heat_local.py to test_heat_local.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/ec2.py to ec2.cpython-313.pyc
 byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/local.py to local.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/common.py to common.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/request.py to request.cpython-313.pyc
 byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/version.py to version.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/__init__.py to __init__.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/heat.py to heat.cpython-313.pyc
 byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/heat_local.py to heat_local.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/config_drive.py to config_drive.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/exc.py to exc.cpython-313.pyc
-byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/keystone.py to keystone.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/cfn.py to cfn.cpython-313.pyc
+byte-compiling /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config/cache.py to cache.cpython-313.pyc
 running install_egg_info
 Copying os_collect_config.egg-info to /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages/os_collect_config-13.1.0.egg-info
 Skipping SOURCES.txt
 running install_scripts
 Installing os-collect-config script to /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/bin
-+ pwd
-+ rm -rf /build/reproducible-path/python-os-collect-config-13.1.0/debian/python*/usr/lib/python*/dist-packages/*.pth
-+ pwd
-+ rm -rf /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python*/dist-packages/*.pth
+++ pwd
++ rm -rf '/build/reproducible-path/python-os-collect-config-13.1.0/debian/python*/usr/lib/python*/dist-packages/*.pth'
+++ pwd
++ rm -rf '/build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python*/dist-packages/*.pth'
 pkgos-dh_auto_test --no-py2
 + PKGOS_TEST_PARALLEL=yes
 + PKGOS_TEST_SERIAL=no
@@ -1445,65 +1487,75 @@
 + PYTHON3S=disabled
 + TEST_PARALLEL_OPT=--parallel
 + TEST_SERIAL_OPT=
-+ echo WARNING: --no-py2 is deprecated, and always on.
++ for i in $@
++ case "${1}" in
++ echo 'WARNING: --no-py2 is deprecated, and always on.'
 WARNING: --no-py2 is deprecated, and always on.
 + shift
-+ py3versions -vr
+++ py3versions -vr
 + PYTHON3S=3.13
-+ [ yes = no ]
-+ [ no = yes ]
-+ [ 3.13 = disabled ]
-+ echo 3.13
-+ cut -d. -f1
++ '[' yes = no ']'
++ '[' no = yes ']'
++ for pyvers in ${PYTHON3S}
++ '[' 3.13 = disabled ']'
+++ echo 3.13
+++ cut -d. -f1
 + PYMAJOR=3
-+ echo ===> Testing with python (python3)
++ echo '===> Testing with python (python3)'
 ===> Testing with python (python3)
-+ pwd
-+ [ -d /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages ]
-+ [ -z  ]
-+ pwd
-+ echo Implicitly adding PYTHONPATH=/build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages
+++ pwd
++ '[' -d /build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages ']'
++ '[' -z '' ']'
+++ pwd
++ echo 'Implicitly adding PYTHONPATH=/build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages'
 Implicitly adding PYTHONPATH=/build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages
-+ pwd
+++ pwd
 + export PYTHONPATH=/build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages
-+ [ -e .stestr.conf ]
-+ [ -x /usr/bin/python3-stestr ]
++ PYTHONPATH=/build/reproducible-path/python-os-collect-config-13.1.0/debian/tmp/usr/lib/python3/dist-packages
++ '[' -e .stestr.conf ']'
++ '[' -x /usr/bin/python3-stestr ']'
 + STESTR=stestr
 + rm -rf .stestr
-+ PYTHON=python3.13 stestr run --parallel --subunit
++ PYTHON=python3.13
++ stestr run --parallel --subunit
 + subunit2pyunit
-os_collect_config.tests.test_collect.TestHup.test_reexec_self
-os_collect_config.tests.test_collect.TestHup.test_reexec_self ... ok
-os_collect_config.tests.test_collect.TestHup.test_reexec_self_signal
-os_collect_config.tests.test_collect.TestHup.test_reexec_self_signal ... ok
-os_collect_config.tests.test_request.TestRequestSoftwareConfig.test_collect_request
-os_collect_config.tests.test_request.TestRequestSoftwareConfig.test_collect_request ... ok
-os_collect_config.tests.test_request.TestRequest.test_check_fetch_content
-os_collect_config.tests.test_request.TestRequest.test_check_fetch_content ... ok
-os_collect_config.tests.test_request.TestRequest.test_collect_request
-os_collect_config.tests.test_request.TestRequest.test_collect_request ... ok
+No name found for a deployment under deployments.
 os_collect_config.tests.test_config_drive.TestConfigDrive.test_all_devices
 os_collect_config.tests.test_config_drive.TestConfigDrive.test_all_devices ... ok
+os_collect_config.tests.test_ec2.TestEc2.test_collect_config_drive
+os_collect_config.tests.test_ec2.TestEc2.test_collect_config_drive ... ok
+os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2
+os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2 ... ok
+os_collect_config.tests.test_merger.TestMerger.test_merged_list_from_content
+os_collect_config.tests.test_merger.TestMerger.test_merged_list_from_content ... ok
 os_collect_config.tests.test_config_drive.TestConfigDrive.test_already_mounted
 os_collect_config.tests.test_config_drive.TestConfigDrive.test_already_mounted ... ok
+os_collect_config.tests.test_request.TestRequestSoftwareConfig.test_collect_request
+os_collect_config.tests.test_request.TestRequestSoftwareConfig.test_collect_request ... ok
+os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_filenotfound
+os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_filenotfound ... ok
+os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_nofile
+os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_nofile ... ok
+os_collect_config.tests.test_heat.TestHeat.test_collect_heat
+os_collect_config.tests.test_heat.TestHeat.test_collect_heat ... ok
+os_collect_config.tests.test_collect.TestHup.test_reexec_self
+os_collect_config.tests.test_collect.TestHup.test_reexec_self ... ok
 os_collect_config.tests.test_config_drive.TestConfigDrive.test_config_drive
 os_collect_config.tests.test_config_drive.TestConfigDrive.test_config_drive ... ok
 os_collect_config.tests.test_config_drive.TestConfigDrive.test_ensure_mounted
 os_collect_config.tests.test_config_drive.TestConfigDrive.test_ensure_mounted ... ok
-os_collect_config.tests.test_config_drive.TestConfigDrive.test_get_metadata
-os_collect_config.tests.test_config_drive.TestConfigDrive.test_get_metadata ... ok
-os_collect_config.tests.test_config_drive.TestConfigDrive.test_parse_shell_var
-os_collect_config.tests.test_config_drive.TestConfigDrive.test_parse_shell_var ... ok
-os_collect_config.tests.test_request.TestRequest.test_collect_request_fail
-os_collect_config.tests.test_request.TestRequest.test_collect_request_fail ... ok
-os_collect_config.tests.test_cfn.TestCfnSoftwareConfig.test_collect_cfn_deployments_not_list
-os_collect_config.tests.test_cfn.TestCfnSoftwareConfig.test_collect_cfn_deployments_not_list ... ok
-os_collect_config.tests.test_cfn.TestCfnSoftwareConfig.test_collect_cfn_software_config
-os_collect_config.tests.test_cfn.TestCfnSoftwareConfig.test_collect_cfn_software_config ... ok
-os_collect_config.tests.test_request.TestRequest.test_collect_request_no_metadata_url
-os_collect_config.tests.test_request.TestRequest.test_collect_request_no_metadata_url ... ok
+os_collect_config.tests.test_collect.TestConf.test_setup_conf
+os_collect_config.tests.test_collect.TestConf.test_setup_conf ... ok
 os_collect_config.tests.test_heat.TestHeatSoftwareConfig.test_collect_heat
 os_collect_config.tests.test_heat.TestHeatSoftwareConfig.test_collect_heat ... ok
+os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_onefile
+os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_onefile ... ok
+os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar
+os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar ... ok
+os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_deployments
+os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_deployments ... ok
+os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2_collected
+os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2_collected ... ok
 os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn
 os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn ... ok
 os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_bad_path
@@ -1512,32 +1564,46 @@
 os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_fail ... ok
 os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_metadata_url_overrides_hint
 os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_metadata_url_overrides_hint ... ok
-os_collect_config.tests.test_collect.TestCollect.test_main
-os_collect_config.tests.test_collect.TestCollect.test_main ... ok
-os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_cfn_unconfigured
-os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_cfn_unconfigured ... ok
+os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_ec2_nofile
+os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_ec2_nofile ... ok
+os_collect_config.tests.test_request.TestRequest.test_check_fetch_content
+os_collect_config.tests.test_request.TestRequest.test_check_fetch_content ... ok
+os_collect_config.tests.test_request.TestRequest.test_collect_request
+os_collect_config.tests.test_request.TestRequest.test_collect_request ... ok
+os_collect_config.tests.test_local.TestLocal.test_collect_invalid_json_fail
+os_collect_config.tests.test_local.TestLocal.test_collect_invalid_json_fail ... ok
+os_collect_config.tests.test_request.TestRequest.test_collect_request_fail
+os_collect_config.tests.test_request.TestRequest.test_collect_request_fail ... ok
+os_collect_config.tests.test_request.TestRequest.test_collect_request_no_metadata_url
+os_collect_config.tests.test_request.TestRequest.test_collect_request_no_metadata_url ... ok
 os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_missing_sub_path
 os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_missing_sub_path ... ok
+os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_heat_local
+os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_heat_local ... ok
+os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_heat_local_twice
+os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_heat_local_twice ... ok
+os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_heat_local_with_invalid_metadata
+os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_heat_local_with_invalid_metadata ... ok
 os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_no_metadata_url
 os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_no_metadata_url ... ok
-os_collect_config.tests.test_collect.TestCollect.test_main_command_failed_no_caching
-os_collect_config.tests.test_collect.TestCollect.test_main_command_failed_no_caching ... ok
-os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_no_path
-os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_no_path ... ok
-os_collect_config.tests.test_local.TestLocal.test_collect_invalid_json_fail
-os_collect_config.tests.test_local.TestLocal.test_collect_invalid_json_fail ... ok
-os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_ec2_unavailable
-os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_ec2_unavailable ... ok
 os_collect_config.tests.test_local.TestLocal.test_collect_local
 os_collect_config.tests.test_local.TestLocal.test_collect_local ... ok
-os_collect_config.tests.test_ec2.TestEc2.test_collect_config_drive
-os_collect_config.tests.test_ec2.TestEc2.test_collect_config_drive ... ok
+os_collect_config.tests.test_config_drive.TestConfigDrive.test_get_metadata
+os_collect_config.tests.test_config_drive.TestConfigDrive.test_get_metadata ... ok
+os_collect_config.tests.test_config_drive.TestConfigDrive.test_parse_shell_var
+os_collect_config.tests.test_config_drive.TestConfigDrive.test_parse_shell_var ... ok
+os_collect_config.tests.test_heat.TestHeat.test_collect_heat_fail
+os_collect_config.tests.test_heat.TestHeat.test_collect_heat_fail ... ok
+os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_auth_url
+os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_auth_url ... ok
+os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_password
+os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_password ... ok
+os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_project_id
+os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_project_id ... ok
+os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_cfn_unconfigured
+os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_cfn_unconfigured ... ok
 os_collect_config.tests.test_local.TestLocal.test_collect_local_orders_multiple
 os_collect_config.tests.test_local.TestLocal.test_collect_local_orders_multiple ... ok
-os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_sub_path
-os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_sub_path ... ok
-os_collect_config.tests.test_cfn.TestCfn.test_collect_with_ca_cert
-os_collect_config.tests.test_cfn.TestCfn.test_collect_with_ca_cert ... ok
 os_collect_config.tests.test_local.TestLocal.test_collect_local_owner_not_uid
 os_collect_config.tests.test_local.TestLocal.test_collect_local_owner_not_uid ... ok
 os_collect_config.tests.test_local.TestLocal.test_collect_local_path_nonexist
@@ -1546,53 +1612,38 @@
 os_collect_config.tests.test_local.TestLocal.test_collect_local_world_writable ... ok
 os_collect_config.tests.test_local.TestLocal.test_collect_local_world_writable_dir
 os_collect_config.tests.test_local.TestLocal.test_collect_local_world_writable_dir ... ok
-os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2
-os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2 ... ok
-os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2_collected
-os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2_collected ... ok
-os_collect_config.tests.test_heat.TestHeat.test_collect_heat
-os_collect_config.tests.test_heat.TestHeat.test_collect_heat ... ok
-os_collect_config.tests.test_heat.TestHeat.test_collect_heat_fail
-os_collect_config.tests.test_heat.TestHeat.test_collect_heat_fail ... ok
-os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2_fail
-os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2_fail ... ok
-os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_auth_url
-os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_auth_url ... ok
-os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2_invalid_cache
-os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2_invalid_cache ... ok
-os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_password
-os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_password ... ok
-os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_project_id
-os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_project_id ... ok
+os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_no_path
+os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_no_path ... ok
+os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_sub_path
+os_collect_config.tests.test_cfn.TestCfn.test_collect_cfn_sub_path ... ok
 os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_resource_name
 os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_resource_name ... ok
 os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_stack_id
 os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_stack_id ... ok
+os_collect_config.tests.test_cfn.TestCfn.test_collect_with_ca_cert
+os_collect_config.tests.test_cfn.TestCfn.test_collect_with_ca_cert ... ok
+os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_ec2_unavailable
+os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_ec2_unavailable ... ok
 os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_user_id
 os_collect_config.tests.test_heat.TestHeat.test_collect_heat_no_user_id ... ok
-os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_ec2_nofile
-os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_ec2_nofile ... ok
-os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_heat_local
-os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_heat_local ... ok
-os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_heat_local_twice
-os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_heat_local_twice ... ok
-os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_heat_local_with_invalid_metadata
-os_collect_config.tests.test_heat_local.TestHeatLocal.test_collect_heat_local_with_invalid_metadata ... ok
-No name found for a deployment under deployments.
-os_collect_config.tests.test_merger.TestMerger.test_merged_list_from_content
-os_collect_config.tests.test_merger.TestMerger.test_merged_list_from_content ... ok
-os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar
-os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar ... ok
-os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_deployments
-os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_deployments ... ok
+os_collect_config.tests.test_collect.TestCollect.test_main
+os_collect_config.tests.test_collect.TestCollect.test_main ... ok
+os_collect_config.tests.test_collect.TestCollect.test_main_command_failed_no_caching
+os_collect_config.tests.test_collect.TestCollect.test_main_command_failed_no_caching ... ok
+os_collect_config.tests.test_collect.TestHup.test_reexec_self_signal
+os_collect_config.tests.test_collect.TestHup.test_reexec_self_signal ... ok
 os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_fail
 os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_fail ... ok
-os_collect_config.tests.test_collect.TestConf.test_setup_conf
-os_collect_config.tests.test_collect.TestConf.test_setup_conf ... ok
 os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_no_auth_url
 os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_no_auth_url ... ok
-os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_filenotfound
-os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_filenotfound ... ok
+os_collect_config.tests.test_cfn.TestCfnSoftwareConfig.test_collect_cfn_deployments_not_list
+os_collect_config.tests.test_cfn.TestCfnSoftwareConfig.test_collect_cfn_deployments_not_list ... ok
+os_collect_config.tests.test_cfn.TestCfnSoftwareConfig.test_collect_cfn_software_config
+os_collect_config.tests.test_cfn.TestCfnSoftwareConfig.test_collect_cfn_software_config ... ok
+os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2_fail
+os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2_fail ... ok
+os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2_invalid_cache
+os_collect_config.tests.test_ec2.TestEc2.test_collect_ec2_invalid_cache ... ok
 os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_no_ca_file
 os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_no_ca_file ... ok
 os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_no_password
@@ -1605,44 +1656,36 @@
 os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_no_user_id ... ok
 os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_websocket
 os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_websocket ... ok
-os_collect_config.tests.test_collect.TestCollect.test_main_force_command
-os_collect_config.tests.test_collect.TestCollect.test_main_force_command ... ok
-os_collect_config.tests.test_collect.TestCollect.test_main_invalid_collector
-os_collect_config.tests.test_collect.TestCollect.test_main_invalid_collector ... ok
 os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_websocket_recv
 os_collect_config.tests.test_zaqar.TestZaqar.test_collect_zaqar_websocket_recv ... ok
+os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_twofiles
+os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_twofiles ... ok
 os_collect_config.tests.test_cache.TestCache.test_cache
 os_collect_config.tests.test_cache.TestCache.test_cache ... ok
+os_collect_config.tests.test_collect.TestCollect.test_main_force_command
+os_collect_config.tests.test_collect.TestCollect.test_main_force_command ... ok
+os_collect_config.tests.test_collect.TestCollect.test_main_invalid_collector
+os_collect_config.tests.test_collect.TestCollect.test_main_invalid_collector ... ok
 os_collect_config.tests.test_collect.TestCollect.test_main_just_local
 os_collect_config.tests.test_collect.TestCollect.test_main_just_local ... ok
-os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_nofile
-os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_nofile ... ok
 os_collect_config.tests.test_collect.TestCollect.test_main_min_polling_interval
 os_collect_config.tests.test_collect.TestCollect.test_main_min_polling_interval ... ok
-os_collect_config.tests.test_cache.TestCache.test_cache_ignores_json_inequality
-os_collect_config.tests.test_cache.TestCache.test_cache_ignores_json_inequality ... ok
-os_collect_config.tests.test_cache.TestCache.test_commit_no_cache
-os_collect_config.tests.test_cache.TestCache.test_commit_no_cache ... ok
-os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_no_change
-os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_no_change ... ok
 os_collect_config.tests.test_collect.TestCollect.test_main_no_command
 os_collect_config.tests.test_collect.TestCollect.test_main_no_command ... ok
-os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_onefile
-os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_onefile ... ok
 os_collect_config.tests.test_collect.TestCollect.test_main_no_sleep_with_no_command
 os_collect_config.tests.test_collect.TestCollect.test_main_no_sleep_with_no_command ... ok
+os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_no_change
+os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_no_change ... ok
 os_collect_config.tests.test_collect.TestCollect.test_main_print_cachedir
 os_collect_config.tests.test_collect.TestCollect.test_main_print_cachedir ... ok
 os_collect_config.tests.test_collect.TestCollect.test_main_print_only
 os_collect_config.tests.test_collect.TestCollect.test_main_print_only ... ok
 os_collect_config.tests.test_collect.TestCollect.test_main_sleep
 os_collect_config.tests.test_collect.TestCollect.test_main_sleep ... ok
-os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_twofiles
-os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_twofiles ... ok
 os_collect_config.tests.test_collect.TestCollect.test_main_with_splay
 os_collect_config.tests.test_collect.TestCollect.test_main_with_splay ... ok
 {
- "tmpwioh4ddn": {
+ "tmprce919d4": {
   "localstrA": "A",
   "localint9": 9,
   "localmap_xy": {
@@ -1653,6 +1696,10 @@
 }
 {}
 {}
+os_collect_config.tests.test_cache.TestCache.test_cache_ignores_json_inequality
+os_collect_config.tests.test_cache.TestCache.test_cache_ignores_json_inequality ... ok
+os_collect_config.tests.test_cache.TestCache.test_commit_no_cache
+os_collect_config.tests.test_cache.TestCache.test_commit_no_cache ... ok
 os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_no_change_softwareconfig
 os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_no_change_softwareconfig ... ok
 os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_nostore
@@ -1673,22 +1720,22 @@
 os_collect_config.tests.test_keystone.KeystoneTest.test_discover_v3_unsupported ... ok
 
 ----------------------------------------------------------------------
-Ran 93 tests in 17.910s
+Ran 93 tests in 27.468s
 
 OK
 + stestr slowest
 Test id                                                                                        Runtime (s)
 ---------------------------------------------------------------------------------------------  -----------
-os_collect_config.tests.test_keystone.KeystoneTest.test_cache_auth_ref                         7.108
-os_collect_config.tests.test_keystone.KeystoneTest.test_discover_v3_unsupported                2.540
-os_collect_config.tests.test_keystone.KeystoneTest.test_discover_fail                          2.469
-os_collect_config.tests.test_keystone.KeystoneTest.test_cache_is_created                       1.818
-os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_no_change                 1.268
-os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_no_change_softwareconfig  1.017
-os_collect_config.tests.test_cache.TestCache.test_cache                                        0.647
-os_collect_config.tests.test_collect.TestCollect.test_main_force_command                       0.596
-os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_nofile                      0.542
-os_collect_config.tests.test_collect.TestCollect.test_main_just_local                          0.461
+os_collect_config.tests.test_keystone.KeystoneTest.test_cache_auth_ref                         9.980
+os_collect_config.tests.test_keystone.KeystoneTest.test_discover_v3_unsupported                5.050
+os_collect_config.tests.test_keystone.KeystoneTest.test_cache_is_created                       5.032
+os_collect_config.tests.test_keystone.KeystoneTest.test_discover_fail                          4.909
+os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_no_change                 0.872
+os_collect_config.tests.test_cache.TestCache.test_cache                                        0.846
+os_collect_config.tests.test_collect.TestCollectAll.test_collect_all_no_change_softwareconfig  0.834
+os_collect_config.tests.test_collect.TestCollect.test_main_force_command                       0.806
+os_collect_config.tests.test_collect.TestFileHash.test_getfilehash_twofiles                    0.535
+os_collect_config.tests.test_cache.TestCache.test_cache_ignores_json_inequality                0.452
 + rm -rf .stestr
 make[1]: Leaving directory '/build/reproducible-path/python-os-collect-config-13.1.0'
    dh_install -O--buildsystem=pybuild
@@ -1721,14 +1768,14 @@
 	cat /usr/share/openstack-pkg-tools/init-script-template >>$MYINIT.init ; \
 	pkgos-gen-systemd-unit $i ; \
 done
-+ ls -1 debian/*.init.in
+++ ls -1 'debian/*.init.in'
 ls: cannot access 'debian/*.init.in': No such file or directory
 # If there's a service.in file, use that one instead of the generated one
 set -e ; set -x ; for i in `ls -1 debian/*.service.in`; do \
 	MYPKG=`echo $i | sed s/.service.in//` ; \
 	cp $MYPKG.service.in $MYPKG.service ; \
 done
-+ ls -1 debian/*.service.in
+++ ls -1 'debian/*.service.in'
 ls: cannot access 'debian/*.service.in': No such file or directory
 # Generate the systemd unit if there's no already existing .service.in
 set -e ; set -x ; for i in `ls debian/*.init.in` ; do \
@@ -1737,7 +1784,7 @@
 		pkgos-gen-systemd-unit $i ; \
 	fi \
 done
-+ ls debian/*.init.in
+++ ls 'debian/*.init.in'
 ls: cannot access 'debian/*.init.in': No such file or directory
 dh_installinit --error-handler=true
 make[1]: Leaving directory '/build/reproducible-path/python-os-collect-config-13.1.0'
@@ -1752,14 +1799,14 @@
 	cat /usr/share/openstack-pkg-tools/init-script-template >>$MYINIT.init ; \
 	pkgos-gen-systemd-unit $i ; \
 done
-+ ls -1 debian/*.init.in
+++ ls -1 'debian/*.init.in'
 ls: cannot access 'debian/*.init.in': No such file or directory
 # If there's a service.in file, use that one instead of the generated one
 set -e ; set -x ; for i in `ls -1 debian/*.service.in`; do \
 	MYPKG=`echo $i | sed s/.service.in//` ; \
 	cp $MYPKG.service.in $MYPKG.service ; \
 done
-+ ls -1 debian/*.service.in
+++ ls -1 'debian/*.service.in'
 ls: cannot access 'debian/*.service.in': No such file or directory
 # Generate the systemd unit if there's no already existing .service.in
 set -e ; set -x ; for i in `ls debian/*.init.in` ; do \
@@ -1768,7 +1815,7 @@
 		pkgos-gen-systemd-unit $i ; \
 	fi \
 done
-+ ls debian/*.init.in
+++ ls 'debian/*.init.in'
 ls: cannot access 'debian/*.init.in': No such file or directory
 dh_installsystemd
 make[1]: Leaving directory '/build/reproducible-path/python-os-collect-config-13.1.0'
@@ -1800,12 +1847,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: not including original source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/2548955/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/2548955/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/2663531 and its subdirectories
-I: Current time: Sun Mar  2 05:24:02 -12 2025
-I: pbuilder-time-stamp: 1740936242
+I: removing directory /srv/workspace/pbuilder/2548955 and its subdirectories
+I: Current time: Sun Apr  5 13:49:11 +14 2026
+I: pbuilder-time-stamp: 1775346551