Merge ~smoser/cloud-init:fix/disable-lxd-cosmic-tests-1795036 into cloud-init:master

Proposed by Scott Moser on 2018-09-28
Status: Merged
Approved by: Scott Moser on 2018-09-28
Approved revision: 61c22bb1dbc060da3ed0234f856dbad829b3e0e4
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~smoser/cloud-init:fix/disable-lxd-cosmic-tests-1795036
Merge into: cloud-init:master
Diff against target: 40 lines (+18/-0)
2 files modified
tests/cloud_tests/testcases/modules/lxd_bridge.py (+9/-0)
tests/cloud_tests/testcases/modules/lxd_dir.py (+9/-0)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve on 2018-09-28
Joshua Powers Approve on 2018-09-28
Ryan Harper 2018-09-28 Approve on 2018-09-28
Review via email: mp+355867@code.launchpad.net

Commit message

tests: disable lxd tests on cosmic

Skip lxd tests on cosmic for two reasons:
a.) bug 1795036 - 'lxd init' fails on cosmic kernel.
b.) apt install lxd installs via snap which can be slow
    as that will download core snap and lxd.

Description of the change

see commit message

To post a comment you must log in.
Ryan Harper (raharper) wrote :

Looks good to me.

review: Approve
Joshua Powers (powersj) wrote :

+1

review: Approve
Scott Moser (smoser) wrote :

once / if c-i says good, then i'll land.

then we'llre-build daily and kick off integration tests.

PASSED: Continuous integration, rev:61c22bb1dbc060da3ed0234f856dbad829b3e0e4
https://jenkins.ubuntu.com/server/job/cloud-init-ci/352/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/352/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/cloud_tests/testcases/modules/lxd_bridge.py b/tests/cloud_tests/testcases/modules/lxd_bridge.py
2index f6011de..8697ae9 100644
3--- a/tests/cloud_tests/testcases/modules/lxd_bridge.py
4+++ b/tests/cloud_tests/testcases/modules/lxd_bridge.py
5@@ -7,6 +7,15 @@ from tests.cloud_tests.testcases import base
6 class TestLxdBridge(base.CloudTestCase):
7 """Test LXD module."""
8
9+ def setUp(self):
10+ """Skip on cosmic for two reasons:
11+ a.) LP: #1795036 - 'lxd init' fails on cosmic kernel.
12+ b.) apt install lxd installs via snap which can be slow
13+ as that will download core snap and lxd."""
14+ if self.os_name == "cosmic":
15+ raise self.skipTest('Skipping test on cosmic (LP: #1795036).')
16+ return base.CloudTestCase.setUp(self)
17+
18 def test_lxd(self):
19 """Test lxd installed."""
20 out = self.get_data_file('lxd')
21diff --git a/tests/cloud_tests/testcases/modules/lxd_dir.py b/tests/cloud_tests/testcases/modules/lxd_dir.py
22index 26a3db3..8bd8c6e 100644
23--- a/tests/cloud_tests/testcases/modules/lxd_dir.py
24+++ b/tests/cloud_tests/testcases/modules/lxd_dir.py
25@@ -7,6 +7,15 @@ from tests.cloud_tests.testcases import base
26 class TestLxdDir(base.CloudTestCase):
27 """Test LXD module."""
28
29+ def setUp(self):
30+ """Skip on cosmic for two reasons:
31+ a.) LP: #1795036 - 'lxd init' fails on cosmic kernel.
32+ b.) apt install lxd installs via snap which can be slow
33+ as that will download core snap and lxd."""
34+ if self.os_name == "cosmic":
35+ raise self.skipTest('Skipping test on cosmic (LP: #1795036).')
36+ return base.CloudTestCase.setUp(self)
37+
38 def test_lxd(self):
39 """Test lxd installed."""
40 out = self.get_data_file('lxd')

Subscribers

People subscribed via source and target branches