From e08b8670764bf33f55a15062f7b4f51e9d2d6c49 Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Wed, 8 Dec 2021 22:34:14 -0700 Subject: [PATCH 1/5] Rebase --- .travis.yml | 2 +- packages/debian/rules | 2 +- tests/unittests/test_fail.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 tests/unittests/test_fail.py diff --git a/.travis.yml b/.travis.yml index c458db48aa6..39aa87fda9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -121,7 +121,7 @@ matrix: # Use sudo to get a new shell where we're in the sbuild group # Don't run integration tests when build fails - | - sudo -E su $USER -c 'sbuild --nolog --no-run-lintian --verbose --dist=xenial cloud-init_*.dsc' && + sudo -E su $USER -c 'sbuild --nolog --no-run-lintian --no-run-autopkgtest --verbose --dist=xenial cloud-init_*.dsc' && ssh-keygen -P "" -q -f ~/.ssh/id_rsa && sg lxd -c 'CLOUD_INIT_CLOUD_INIT_SOURCE="$(ls *.deb)" tox -e integration-tests-ci' - python: 3.5 diff --git a/packages/debian/rules b/packages/debian/rules index d138deebe35..6c0c64b1304 100755 --- a/packages/debian/rules +++ b/packages/debian/rules @@ -4,7 +4,7 @@ export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM) DEB_VERSION := $(shell dpkg-parsechangelog --show-field=Version) %: - dh $@ --with python3,systemd --buildsystem pybuild + dh $@ --with python3,systemd --buildsystem pybuild --disable test override_dh_install: dh_install diff --git a/tests/unittests/test_fail.py b/tests/unittests/test_fail.py new file mode 100644 index 00000000000..830f31841a3 --- /dev/null +++ b/tests/unittests/test_fail.py @@ -0,0 +1,2 @@ +def test_fail(): + assert False From 1de65f369bb7421935adaf343e4f4416f24859e8 Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Thu, 6 Jan 2022 15:00:40 -0700 Subject: [PATCH 2/5] disable checking --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 39aa87fda9e..c507a884f92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,7 @@ script: env: TOXENV=py3 PYTEST_ADDOPTS=-v # List all tests run by pytest + DEB_BUILD_OPTIONS=nocheck matrix: fast_finish: true From a7a7d719cecf3147a4fe1bef3f45123191521407 Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Thu, 6 Jan 2022 15:09:26 -0700 Subject: [PATCH 3/5] fixup --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c507a884f92..9fb6c1a6ed7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,6 @@ script: env: TOXENV=py3 PYTEST_ADDOPTS=-v # List all tests run by pytest - DEB_BUILD_OPTIONS=nocheck matrix: fast_finish: true @@ -122,7 +121,7 @@ matrix: # Use sudo to get a new shell where we're in the sbuild group # Don't run integration tests when build fails - | - sudo -E su $USER -c 'sbuild --nolog --no-run-lintian --no-run-autopkgtest --verbose --dist=xenial cloud-init_*.dsc' && + sudo -E su $USER -c 'DEB_BUILD_OPTIONS=nocheck sbuild --nolog --no-run-lintian --no-run-autopkgtest --verbose --dist=xenial cloud-init_*.dsc' && ssh-keygen -P "" -q -f ~/.ssh/id_rsa && sg lxd -c 'CLOUD_INIT_CLOUD_INIT_SOURCE="$(ls *.deb)" tox -e integration-tests-ci' - python: 3.5 From 12fbfcb3f06ad3bdf13a51115b7d95190647b26e Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Thu, 6 Jan 2022 15:24:14 -0700 Subject: [PATCH 4/5] remove failtest --- tests/unittests/test_fail.py | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 tests/unittests/test_fail.py diff --git a/tests/unittests/test_fail.py b/tests/unittests/test_fail.py deleted file mode 100644 index 830f31841a3..00000000000 --- a/tests/unittests/test_fail.py +++ /dev/null @@ -1,2 +0,0 @@ -def test_fail(): - assert False From 4007b04019ad35023175aebf17f8ea608166468a Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Fri, 7 Jan 2022 08:19:13 -0700 Subject: [PATCH 5/5] don't change dh command --- packages/debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/debian/rules b/packages/debian/rules index 6c0c64b1304..d138deebe35 100755 --- a/packages/debian/rules +++ b/packages/debian/rules @@ -4,7 +4,7 @@ export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM) DEB_VERSION := $(shell dpkg-parsechangelog --show-field=Version) %: - dh $@ --with python3,systemd --buildsystem pybuild --disable test + dh $@ --with python3,systemd --buildsystem pybuild override_dh_install: dh_install