Skip to content

Commit

Permalink
Merge pull request #354 from mvo5/debug-adt
Browse files Browse the repository at this point in the history
tests: show lxd debug lot when running autopkgtest and include NMU diffs
  • Loading branch information
mvo5 authored Jan 30, 2024
2 parents 0cc13e8 + 19ce53c commit eaf8d5a
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 8 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,9 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install distro-info autopkgtest git-buildpackage
sudo snap install lxd --channel=stable
sudo usermod --append --groups lxd $(whoami)
sudo lxd init --auto
sudo autopkgtest-build-lxd ubuntu:$(distro-info --stable)
- name: build source
run: gbp buildpackage -us -uc -S -d -nc --git-ignore-branch --git-prebuild=
- name: autopkgtest
# skipping tests is ok
run: sudo autopkgtest -U ../build-area/*.dsc -- lxd autopkgtest/ubuntu/$(distro-info --stable)/amd64 || [ $? == 2 ]
# skipping tests is ok, virt-null is used because lxd keeps failing
# with: "Timed out waiting for container to boot"
run: sudo autopkgtest -U ../build-area/*.dsc -- null || [ $? == 2 ]
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/build/
/test/.coverage
/test/.mypy_cache/
/test/packages/test-package*.deb
/test/packages/test-package*
/test/u-u.lock
__pycache__/
data/50unattended-upgrades
Expand Down
30 changes: 30 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,33 @@
unattended-upgrades (2.9.1+nmu4) unstable; urgency=medium

* Non-maintainer upload.
* Don't run pyflakes, it dropped support for type comments.
(Closes: #1058172)

-- Stefano Rivera <[email protected]> Mon, 22 Jan 2024 16:11:59 -0400

unattended-upgrades (2.9.1+nmu3) unstable; urgency=medium

* test: don't confuse -dbg and -unsigned with current running kernel
(Closes: #983363, #1012226)

-- Paul Gevers <[email protected]> Sat, 31 Dec 2022 21:59:00 +0100

unattended-upgrades (2.9.1+nmu2) unstable; urgency=high

* Non-maintainer upload.
* setup.py: Disable automatic package discovery by setting py_modules
to empty. (Closes: #1020150)

-- Boyuan Yang <[email protected]> Sat, 22 Oct 2022 21:28:14 -0400

unattended-upgrades (2.9.1+nmu1) unstable; urgency=medium

* Non-maintainer upload.
* No source change upload to rebuild with debhelper 13.10.

-- Michael Biebl <[email protected]> Sat, 15 Oct 2022 12:54:44 +0200

unattended-upgrades (2.9.1) unstable; urgency=medium

[ Jean-Pierre Giraud ]
Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
name='unattended-upgrades',
version='0.1',
scripts=['unattended-upgrade'],
packages=[],
data_files=[
('../etc/logrotate.d/',
["data/logrotate.d/unattended-upgrades"]),
Expand All @@ -38,4 +39,5 @@
cmdclass={"build": build_extra.build_extra,
"build_i18n": build_i18n.build_i18n},
test_suite="test",
py_modules=[],
)
2 changes: 1 addition & 1 deletion test/autopkgtest_kernel_patterns.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def test_versioned(self):
running_regexp = running_kernel_pkgs_regexp()
running_kernel_version = subprocess.check_output(
["uname", "-r"], universal_newlines=True).rstrip()
running_escaped_regexp = ".*" + re.escape(running_kernel_version)
running_escaped_regexp = ".*" + re.escape(running_kernel_version) + '$'
try:
running_noflavor_regexp = "linux.*-" + re.escape(
re.match("[1-9][0-9]*\\.[0-9]+\\.[0-9]+-[0-9]+",
Expand Down

0 comments on commit eaf8d5a

Please sign in to comment.