Merge lp:~brendan-donegan/maas/qa-lab-tests_1.9_improve into lp:~maas-maintainers/maas/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
=== modified file 'config.py'
--- config.py 2016-01-28 17:11:39 +0000
+++ config.py 2016-07-15 19:40:37 +0000
@@ -50,16 +50,18 @@
50 # lenovo-RD230-04, MAAS-0450 # lenovo-RD230-04, MAAS-04
51 "00:E0:81:DD:D1:0B": "10.245.143.104",51 "00:E0:81:DD:D1:0B": "10.245.143.104",
52 # lenovo-RD230-05, MAAS-0552 # lenovo-RD230-05, MAAS-05
53 "00:E0:81:DD:D4:11": "10.245.143.105",53 #"00:E0:81:DD:D4:11": "10.245.143.105", # This machines seem busted. TODO: Investigate
54 # lenovo-RD230-06, MAAS-0654 # lenovo-RD230-06, MAAS-06
55 "00:E0:81:D1:B1:47": "10.245.143.106",55 #"00:E0:81:D1:B1:47": "10.245.143.106", # This machine seems busted. TODO: Investigate
56 }56 # Took these two machines from the CLUSTER_CONTROLLER_NODES pool
5757 # as it seems that the other two were broken
58CLUSTER_CONTROLLER_NODES = {
59 # lenovo-RD230-07, MAAS-0758 # lenovo-RD230-07, MAAS-07
60 "00:E0:81:DD:D1:1B": "10.245.143.107",59 "00:E0:81:DD:D1:1B": "10.245.143.107",
61 # lenovo-RD230-08, MAAS-0860 # lenovo-RD230-08, MAAS-08
62 "00:E0:81:DD:D1:2B": "10.245.143.108",61 "00:E0:81:DD:D1:2B": "10.245.143.108",
62}
63
64CLUSTER_CONTROLLER_NODES = {
63 # lenovo-RD230-09, MAAS-0965 # lenovo-RD230-09, MAAS-09
64 "00:E0:81:DD:D1:A3": "10.245.143.109",66 "00:E0:81:DD:D1:A3": "10.245.143.109",
65 # lenovo-RD230-10, MAAS-1067 # lenovo-RD230-10, MAAS-10
@@ -68,8 +70,7 @@
68 "00:E0:81:DD:D0:FF": "10.245.143.111",70 "00:E0:81:DD:D0:FF": "10.245.143.111",
69 # lenovo-RD230-12, MAAS-1271 # lenovo-RD230-12, MAAS-12
70 "00:E0:81:DD:D4:F9": "10.245.143.112"72 "00:E0:81:DD:D4:F9": "10.245.143.112"
71 }73}
72
7374
74LENOVO_LAB = REGION_CONTROLLER_NODES75LENOVO_LAB = REGION_CONTROLLER_NODES
75if USE_CC_NODES:76if USE_CC_NODES:
7677
=== modified file 'maas-package-test'
--- maas-package-test 2015-11-12 23:58:19 +0000
+++ maas-package-test 2016-07-15 19:40:37 +0000
@@ -5,4 +5,4 @@
5# If any post-install changes are needed, this is where they should go.5# If any post-install changes are needed, this is where they should go.
66
7# Run tests.7# Run tests.
8nosetests --verbose --stop debian/tests/maas-integration.py8nosetests3 --verbose --stop --with-xunit --xunit-file=$ADT_ARTIFACTS/nosetests.xml debian/tests/maas-integration.py

Subscribers

People subscribed via source and target branches