MAAS

Merge lp:~brendan-donegan/maas/qa-lab-tests_1.9_improve into lp:~maas-maintainers/maas/qa-lab-tests-1.9

  1. qa-lab-tests_1.9_improve
  2. Merge into qa-lab-tests-1.9
Proposed by Brendan Donegan
Status: Merged
Merged at revision: 330
Proposed branch: lp:~brendan-donegan/maas/qa-lab-tests_1.9_improve
Merge into: lp:~maas-maintainers/maas/qa-lab-tests-1.9
Diff against target: 47 lines (+9/-8)
2 files modified
config.py (+8/-7)
maas-package-test (+1/-1)
To merge this branch: bzr merge lp:~brendan-donegan/maas/qa-lab-tests_1.9_improve
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+300242@code.launchpad.net

Description of the change

Remove a couple of machines that might be broken from the config file (at least to keep it in sync with whats in trunk)

Also enable the test reporting which was added in trunk

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.py'
2--- config.py 2016-01-28 17:11:39 +0000
3+++ config.py 2016-07-15 19:40:37 +0000
4@@ -50,16 +50,18 @@
5 # lenovo-RD230-04, MAAS-04
6 "00:E0:81:DD:D1:0B": "10.245.143.104",
7 # lenovo-RD230-05, MAAS-05
8- "00:E0:81:DD:D4:11": "10.245.143.105",
9+ #"00:E0:81:DD:D4:11": "10.245.143.105", # This machines seem busted. TODO: Investigate
10 # lenovo-RD230-06, MAAS-06
11- "00:E0:81:D1:B1:47": "10.245.143.106",
12- }
13-
14-CLUSTER_CONTROLLER_NODES = {
15+ #"00:E0:81:D1:B1:47": "10.245.143.106", # This machine seems busted. TODO: Investigate
16+ # Took these two machines from the CLUSTER_CONTROLLER_NODES pool
17+ # as it seems that the other two were broken
18 # lenovo-RD230-07, MAAS-07
19 "00:E0:81:DD:D1:1B": "10.245.143.107",
20 # lenovo-RD230-08, MAAS-08
21 "00:E0:81:DD:D1:2B": "10.245.143.108",
22+}
23+
24+CLUSTER_CONTROLLER_NODES = {
25 # lenovo-RD230-09, MAAS-09
26 "00:E0:81:DD:D1:A3": "10.245.143.109",
27 # lenovo-RD230-10, MAAS-10
28@@ -68,8 +70,7 @@
29 "00:E0:81:DD:D0:FF": "10.245.143.111",
30 # lenovo-RD230-12, MAAS-12
31 "00:E0:81:DD:D4:F9": "10.245.143.112"
32- }
33-
34+}
35
36 LENOVO_LAB = REGION_CONTROLLER_NODES
37 if USE_CC_NODES:
38
39=== modified file 'maas-package-test'
40--- maas-package-test 2015-11-12 23:58:19 +0000
41+++ maas-package-test 2016-07-15 19:40:37 +0000
42@@ -5,4 +5,4 @@
43 # If any post-install changes are needed, this is where they should go.
44
45 # Run tests.
46-nosetests --verbose --stop debian/tests/maas-integration.py
47+nosetests3 --verbose --stop --with-xunit --xunit-file=$ADT_ARTIFACTS/nosetests.xml debian/tests/maas-integration.py

Subscribers

People subscribed via source and target branches