Merge lp:~dpigott/lava-lab/add-more-fastmodels-servers into lp:lava-lab

Proposed by Dave Pigott
Status: Merged
Merged at revision: 153
Proposed branch: lp:~dpigott/lava-lab/add-more-fastmodels-servers
Merge into: lp:lava-lab
Diff against target: 104 lines (+45/-1)
9 files modified
lava/devices/fastmodels04/production/rtsm_ve-armv8_06.conf (+7/-0)
lava/devices/fastmodels05/production/rtsm_ve-armv8_07.conf (+7/-0)
lava/devices/fastmodels06/production/rtsm_ve-armv8_08.conf (+7/-0)
lava/devices/fastmodels07/production/rtsm_ve-armv8_09.conf (+7/-0)
lp_users/lp-manage-local.conf-fastmodels04 (+4/-0)
lp_users/lp-manage-local.conf-fastmodels05 (+4/-0)
lp_users/lp-manage-local.conf-fastmodels06 (+4/-0)
lp_users/lp-manage-local.conf-fastmodels07 (+4/-0)
top.sls (+1/-1)
To merge this branch: bzr merge lp:~dpigott/lava-lab/add-more-fastmodels-servers
Reviewer Review Type Date Requested Status
Dave Pigott Approve
Review via email: mp+166503@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dave Pigott (dpigott) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'lava/devices/fastmodels04'
2=== added directory 'lava/devices/fastmodels04/production'
3=== added file 'lava/devices/fastmodels04/production/rtsm_ve-armv8_06.conf'
4--- lava/devices/fastmodels04/production/rtsm_ve-armv8_06.conf 1970-01-01 00:00:00 +0000
5+++ lava/devices/fastmodels04/production/rtsm_ve-armv8_06.conf 2013-05-30 13:14:28 +0000
6@@ -0,0 +1,7 @@
7+# DO NOT EDIT - MANAGED BY SALT!
8+
9+device_type = fastmodel_v8
10+
11+license_file = "8224@control"
12+
13+android_adb_port = 5555
14
15=== added directory 'lava/devices/fastmodels05'
16=== added directory 'lava/devices/fastmodels05/production'
17=== added file 'lava/devices/fastmodels05/production/rtsm_ve-armv8_07.conf'
18--- lava/devices/fastmodels05/production/rtsm_ve-armv8_07.conf 1970-01-01 00:00:00 +0000
19+++ lava/devices/fastmodels05/production/rtsm_ve-armv8_07.conf 2013-05-30 13:14:28 +0000
20@@ -0,0 +1,7 @@
21+# DO NOT EDIT - MANAGED BY SALT!
22+
23+device_type = fastmodel_v8
24+
25+license_file = "8224@control"
26+
27+android_adb_port = 5555
28
29=== added directory 'lava/devices/fastmodels06'
30=== added directory 'lava/devices/fastmodels06/production'
31=== added file 'lava/devices/fastmodels06/production/rtsm_ve-armv8_08.conf'
32--- lava/devices/fastmodels06/production/rtsm_ve-armv8_08.conf 1970-01-01 00:00:00 +0000
33+++ lava/devices/fastmodels06/production/rtsm_ve-armv8_08.conf 2013-05-30 13:14:28 +0000
34@@ -0,0 +1,7 @@
35+# DO NOT EDIT - MANAGED BY SALT!
36+
37+device_type = fastmodel_v8
38+
39+license_file = "8224@control"
40+
41+android_adb_port = 5555
42
43=== added directory 'lava/devices/fastmodels07'
44=== added directory 'lava/devices/fastmodels07/production'
45=== added file 'lava/devices/fastmodels07/production/rtsm_ve-armv8_09.conf'
46--- lava/devices/fastmodels07/production/rtsm_ve-armv8_09.conf 1970-01-01 00:00:00 +0000
47+++ lava/devices/fastmodels07/production/rtsm_ve-armv8_09.conf 2013-05-30 13:14:28 +0000
48@@ -0,0 +1,7 @@
49+# DO NOT EDIT - MANAGED BY SALT!
50+
51+device_type = fastmodel_v8
52+
53+license_file = "8224@control"
54+
55+android_adb_port = 5555
56
57=== added file 'lp_users/lp-manage-local.conf-fastmodels04'
58--- lp_users/lp-manage-local.conf-fastmodels04 1970-01-01 00:00:00 +0000
59+++ lp_users/lp-manage-local.conf-fastmodels04 2013-05-30 13:14:28 +0000
60@@ -0,0 +1,4 @@
61+[__main__]
62+
63+sudoers: mwhudson, dpigott, stylesen, terceiro, tyler-baker, matthew-hart
64+lp-groups: linaro-validation
65
66=== added file 'lp_users/lp-manage-local.conf-fastmodels05'
67--- lp_users/lp-manage-local.conf-fastmodels05 1970-01-01 00:00:00 +0000
68+++ lp_users/lp-manage-local.conf-fastmodels05 2013-05-30 13:14:28 +0000
69@@ -0,0 +1,4 @@
70+[__main__]
71+
72+sudoers: mwhudson, dpigott, stylesen, terceiro, tyler-baker, matthew-hart
73+lp-groups: linaro-validation
74
75=== added file 'lp_users/lp-manage-local.conf-fastmodels06'
76--- lp_users/lp-manage-local.conf-fastmodels06 1970-01-01 00:00:00 +0000
77+++ lp_users/lp-manage-local.conf-fastmodels06 2013-05-30 13:14:28 +0000
78@@ -0,0 +1,4 @@
79+[__main__]
80+
81+sudoers: mwhudson, dpigott, stylesen, terceiro, tyler-baker, matthew-hart
82+lp-groups: linaro-validation
83
84=== added file 'lp_users/lp-manage-local.conf-fastmodels07'
85--- lp_users/lp-manage-local.conf-fastmodels07 1970-01-01 00:00:00 +0000
86+++ lp_users/lp-manage-local.conf-fastmodels07 2013-05-30 13:14:28 +0000
87@@ -0,0 +1,4 @@
88+[__main__]
89+
90+sudoers: mwhudson, dpigott, stylesen, terceiro, tyler-baker, matthew-hart
91+lp-groups: linaro-validation
92
93=== modified file 'top.sls'
94--- top.sls 2013-05-29 13:30:28 +0000
95+++ top.sls 2013-05-30 13:14:28 +0000
96@@ -3,7 +3,7 @@
97 - sshd
98 - lp_users
99
100- 'control,staging,dogfood,fastmodels01,fastmodels02,fastmodels03,dispatcher01,hackbox':
101+ 'control,staging,dogfood,fastmodels01,fastmodels02,fastmodels03,fastmodels04,fastmodels05,fastmodels06,fastmodels07,dispatcher01,hackbox':
102 - match: list
103 - instance_manager
104 - nfs

Subscribers

People subscribed via source and target branches