Merge lp:~stylesen/lava-dispatcher/multinode into lp:lava-dispatcher/multinode

Proposed by Senthil Kumaran S on 2013-07-03
Status: Merged
Approved by: Neil Williams on 2013-07-03
Approved revision: no longer in the source branch.
Merged at revision: 653
Proposed branch: lp:~stylesen/lava-dispatcher/multinode
Merge into: lp:lava-dispatcher/multinode
Diff against target: 211 lines (+57/-42)
6 files modified
lava_dispatcher/config.py (+2/-2)
lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf (+4/-4)
lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x1-a7x1.conf (+13/-7)
lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x4-a7x4.conf (+12/-6)
lava_dispatcher/device/fastmodel.py (+22/-19)
lava_dispatcher/device/target.py (+4/-4)
To merge this branch: bzr merge lp:~stylesen/lava-dispatcher/multinode
Reviewer Review Type Date Requested Status
Linaro Automation & Validation 2013-07-03 Pending
Review via email: mp+172761@code.launchpad.net

Description of the change

Bring up-to-date with trunk.

To post a comment you must log in.
653. By Neil Williams on 2013-07-03

Senthil Kumaran 2013-07-03 [merge] Bring up-to-date with trunk.
    Tyler Baker 2013-07-02 [merge] Fix for bug 1195536
    Yongqin Liu 2013-07-01 fix bug of use of simulator_kernel and simulator_initrd
    Yongqin Liu 2013-07-01 fix the bug of definition of simulator_kernel_files and simulator_initrd_files
    Yongqin Liu 2013-06-28 fix some other bugs
    Yongqin Liu 2013-06-28 fix the error about parameter of _copy_first_find_from_list
    Yongqin Liu 2013-06-28 change for copy necessary uImage and uInitrd files
    Yongqin Liu 2013-06-28 remove the directory of axf file path specified for simulator_axf_files
    Yongqin Liu 2013-06-28 1. fix the bug in _find_and_copy function,
    Tyler Baker 2013-07-02 Update Arndale boot command partitions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava_dispatcher/config.py'
2--- lava_dispatcher/config.py 2013-06-20 15:37:54 +0000
3+++ lava_dispatcher/config.py 2013-07-03 08:25:45 +0000
4@@ -85,8 +85,8 @@
5 simulator_version_command = schema.StringOption()
6 simulator_command = schema.StringOption()
7 simulator_axf_files = schema.ListOption()
8- simulator_kernel = schema.StringOption(default=None)
9- simulator_initrd = schema.StringOption(default=None)
10+ simulator_kernel_files = schema.ListOption(default=None)
11+ simulator_initrd_files = schema.ListOption(default=None)
12 simulator_dtb = schema.StringOption(default=None)
13 simulator_uefi = schema.StringOption(default=None)
14 simulator_boot_wrapper = schema.StringOption(default=None)
15
16=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf'
17--- lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf 2013-04-26 09:08:19 +0000
18+++ lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf 2013-07-03 08:25:45 +0000
19@@ -2,7 +2,7 @@
20 root_part = 3
21 boot_cmds = mmc rescan,
22 mmc part 1,
23- setenv bootcmd "'fatload mmc 1:5 0x40007000 uImage; fatload mmc 1:5 0x42000000 uInitrd; fatload mmc 1:5 0x41f00000 board.dtb; bootm 0x40007000 0x42000000 0x41f00000'",
24+ setenv bootcmd "'fatload mmc 0:5 0x40007000 uImage; fatload mmc 0:5 0x42000000 uInitrd; fatload mmc 0:5 0x41f00000 board.dtb; bootm 0x40007000 0x42000000 0x41f00000'",
25 setenv bootargs "'console=ttySAC2,115200n8 root=LABEL=testrootfs rootwait ro'",
26 boot
27
28@@ -19,9 +19,9 @@
29 data_part_android = 7
30
31 boot_cmds_android = mmc init,
32- mmc part 1,
33- setenv bootcmd "'fatload mmc 1:5 0x40007000 uImage;fatload mmc 1:5 0x42000000 uInitrd; bootm 0x40007000 0x42000000'",
34- setenv bootargs "'console=ttySAC2,115200n8 rootwait ro init=/init androidboot.console=ttySAC2'",
35+ mmc part 0,
36+ setenv bootcmd "'fatload mmc 0:5 0x40007000 uImage; fatload mmc 0:5 0x41000000 uInitrd; fatload mmc 0:5 0x41f00000 board.dtb; bootm 0x40007000 0x41000000 0x41f00000'",
37+ setenv bootargs "'console=tty0 console=ttySAC2,115200n8 androidboot.hardware=exynos5250-arndale rootwait ro rootdelay=3 init=/init androidboot.console=ttySAC2 console=ttySAC2'",
38 boot
39
40 bootloader_prompt = #
41
42=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x1-a7x1.conf'
43--- lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x1-a7x1.conf 2013-06-19 16:22:43 +0000
44+++ lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x1-a7x1.conf 2013-07-03 08:25:45 +0000
45@@ -45,17 +45,23 @@
46 sendline 2
47
48 simulator_axf_files =
49- img.axf
50- linux-system-ISW.axf
51- rtsm/linux-system-semi.axf
52-
53-simulator_kernel = vmlinuz.*
54-simulator_initrd = initrd.*
55+ img.axf
56+ linux-system-ISW.axf
57+ linux-system-semi.axf
58+
59+simulator_kernel_files =
60+ uImage
61+ vmlinuz.*
62+
63+simulator_initrd_files =
64+ uInitrd
65+ initrd.*
66+
67 simulator_dtb = rtsm_ve-ca15x1-ca7x1.dtb
68 simulator_uefi = uefi_rtsm_ve-ca15.bin
69
70 license_file = 8224@localhost
71-sim_bin = /opt/arm/RTSM_A15-A7x14_VE/Linux64_RTSM_VE_Cortex-A15x4-A7x4/RTSM_VE_Cortex-A15x4-A7x4
72+sim_bin = /opt/arm/RTSM_A15-A7x14_VE/Linux64_RTSM_VE_Cortex-A15x1-A7x1/RTSM_VE_Cortex-A15x1-A7x1
73 android_adb_port = 6555
74
75 simulator_version_command = %(sim_bin)s --version | grep "Fast Models" | sed 's/Fast Models \[//' | sed 's/\]//'
76
77=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x4-a7x4.conf'
78--- lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x4-a7x4.conf 2013-06-19 16:22:43 +0000
79+++ lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-a15x4-a7x4.conf 2013-07-03 08:25:45 +0000
80@@ -45,12 +45,18 @@
81 sendline 2
82
83 simulator_axf_files =
84- img.axf
85- linux-system-ISW.axf
86- rtsm/linux-system-semi.axf
87-
88-simulator_kernel = vmlinuz.*
89-simulator_initrd = initrd.*
90+ img.axf
91+ linux-system-ISW.axf
92+ linux-system-semi.axf
93+
94+simulator_kernel_files =
95+ uImage
96+ vmlinuz.*
97+
98+simulator_initrd_files =
99+ uInitrd
100+ initrd.*
101+
102 simulator_dtb = rtsm_ve-ca15x4-ca7x4.dtb
103 simulator_uefi = uefi_rtsm_ve-ca15.bin
104
105
106=== modified file 'lava_dispatcher/device/fastmodel.py'
107--- lava_dispatcher/device/fastmodel.py 2013-06-25 10:50:02 +0000
108+++ lava_dispatcher/device/fastmodel.py 2013-07-03 08:25:45 +0000
109@@ -23,10 +23,8 @@
110 import cStringIO
111 import logging
112 import os
113-import shutil
114 import stat
115 import subprocess
116-import re
117
118 import lava_dispatcher.device.boot_options as boot_options
119
120@@ -48,7 +46,6 @@
121 ensure_directory,
122 extract_targz,
123 DrainConsoleOutput,
124- string_to_list,
125 )
126
127
128@@ -93,24 +90,30 @@
129 subdir = os.path.join(mntdir, subdir)
130 self._copy_needed_files_from_directory(subdir)
131
132+ def _copy_first_find_from_list(self, subdir, odir, file_list):
133+ f_path = None
134+ for fname in file_list:
135+ f_path = self._find_and_copy(subdir, odir, fname)
136+ if f_path:
137+ break
138+
139+ return f_path
140+
141 def _copy_needed_files_from_directory(self, subdir):
142 odir = os.path.dirname(self._sd_image)
143 if self._bootloader == 'u_boot':
144 # Extract the bootwrapper from the image
145- for fname in self.config.simulator_axf_files:
146- if self._axf is None:
147- self._axf = self._find_and_copy(
148- subdir, odir, fname)
149- else:
150- break
151+ if self.config.simulator_axf_files and self._axf is None:
152+ self._axf = self._copy_first_find_from_list(subdir, odir,
153+ self.config.simulator_axf_files)
154 # Extract the kernel from the image
155- if self.config.simulator_kernel and self._kernel is None:
156- self._kernel = self._find_and_copy(
157- subdir, odir, self.config.simulator_kernel)
158+ if self.config.simulator_kernel_files and self._kernel is None:
159+ self._kernel = self._copy_first_find_from_list(subdir, odir,
160+ self.config.simulator_kernel_files)
161 # Extract the initrd from the image
162- if self.config.simulator_initrd and self._initrd is None:
163- self._initrd = self._find_and_copy(
164- subdir, odir, self.config.simulator_initrd)
165+ if self.config.simulator_initrd_files and self._initrd is None:
166+ self._initrd = self._copy_first_find_from_list(subdir, odir,
167+ self.config.simulator_initrd_files)
168 # Extract the dtb from the image
169 if self.config.simulator_dtb and self._dtb is None:
170 self._dtb = self._find_and_copy(
171@@ -128,13 +131,13 @@
172 raise RuntimeError('No AXF found, %r' %
173 self.config.simulator_axf_files)
174 # Kernel is needed only for b.L models
175- if self._kernel is None and self.config.simulator_kernel:
176+ if self._kernel is None and self.config.simulator_kernel_files:
177 raise RuntimeError('No KERNEL found, %r' %
178- self.config.simulator_kernel)
179+ self.config.simulator_kernel_files)
180 # Initrd is needed only for b.L models
181- if self._initrd is None and self.config.simulator_initrd:
182+ if self._initrd is None and self.config.simulator_initrd_files:
183 raise RuntimeError('No INITRD found, %r' %
184- self.config.simulator_initrd)
185+ self.config.simulator_initrd_files)
186 # DTB is needed only for b.L models
187 if self._dtb is None and self.config.simulator_dtb:
188 raise RuntimeError('No DTB found, %r' %
189
190=== modified file 'lava_dispatcher/device/target.py'
191--- lava_dispatcher/device/target.py 2013-06-19 21:49:04 +0000
192+++ lava_dispatcher/device/target.py 2013-07-03 08:25:45 +0000
193@@ -158,14 +158,14 @@
194 def _find_and_copy(self, rootdir, odir, pattern, name=None):
195 dest = None
196 for root, dirs, files in os.walk(rootdir):
197- for file in files:
198- if re.match(pattern, file):
199+ for file_name in files:
200+ if re.match(pattern, file_name):
201 if name:
202 dest = os.path.join(odir, name)
203 else:
204- dest = os.path.join(odir, file)
205+ dest = os.path.join(odir, file_name)
206 if rootdir != odir:
207- src = os.path.join(rootdir, file)
208+ src = os.path.join(root, file_name)
209 shutil.copyfile(src, dest)
210 return dest
211 else:

Subscribers

People subscribed via source and target branches

to status/vote changes: