From ff5fac501b857f6635a0b25068b3469c4beebd85 Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Tue, 7 Dec 2021 12:48:50 -0700 Subject: [PATCH 1/5] travis - don't run integration tests if no deb --- .travis.yml | 7 ++++--- tests/unittests/test_fail.py | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 tests/unittests/test_fail.py diff --git a/.travis.yml b/.travis.yml index 1582e8294ac..8034018adb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,9 +119,10 @@ matrix: sudo tar --sparse --xattrs --xattrs-include=* -cf "$TRAVIS_BUILD_DIR/chroots/xenial-amd64.tar" -C /var/lib/schroot/chroots/xenial-amd64 . fi # Use sudo to get a new shell where we're in the sbuild group - - sudo -E su $USER -c 'sbuild --nolog --no-run-lintian --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' + # Don't run integration tests when build failes + - | sudo -E su $USER -c 'sbuild --nolog --no-run-lintian --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 env: TOXENV=xenial 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 c7aabc4ab99b542c7021b3f835b983c983ef09ad Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Wed, 8 Dec 2021 15:14:08 -0700 Subject: [PATCH 2/5] run travis, run --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8034018adb4..9c78fe07ce8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,10 +119,10 @@ matrix: sudo tar --sparse --xattrs --xattrs-include=* -cf "$TRAVIS_BUILD_DIR/chroots/xenial-amd64.tar" -C /var/lib/schroot/chroots/xenial-amd64 . fi # Use sudo to get a new shell where we're in the sbuild group - # Don't run integration tests when build failes - - | sudo -E su $USER -c 'sbuild --nolog --no-run-lintian --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' + # Don't run integration tests when build fails + - sudo -E su $USER -c 'sbuild --nolog --no-run-lintian --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 env: TOXENV=xenial From a0ddcc1e23ef8c2a6ac74406c3e3ff50b4dc729d Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Wed, 8 Dec 2021 16:15:52 -0700 Subject: [PATCH 3/5] fixup --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c78fe07ce8..2e649af6d2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -120,9 +120,10 @@ matrix: fi # 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' - - ssh-keygen -P "" -q -f ~/.ssh/id_rsa - - sg lxd -c 'CLOUD_INIT_CLOUD_INIT_SOURCE="$(ls *.deb)" tox -e integration-tests-ci' + - | + sudo -E su $USER -c 'sbuild --nolog --no-run-lintian --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 env: TOXENV=xenial From a3fcc3a0539ddb375e0e09ee4644d3c4d7d836f9 Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Wed, 8 Dec 2021 16:28:18 -0700 Subject: [PATCH 4/5] fixup --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e649af6d2b..9470cc31de8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -121,8 +121,8 @@ 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' & - ssh-keygen -P "" -q -f ~/.ssh/id_rsa & + sudo -E su $USER -c 'sbuild --nolog --no-run-lintian --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 env: From 09b890fa85344e1e36a36affb390e71b70796500 Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Wed, 8 Dec 2021 16:47:38 -0700 Subject: [PATCH 5/5] remove failing test --- 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