Merge lp:~milo/linaro-ci/bug1091564 into lp:linaro-ci

Proposed by Milo Casagrande
Status: Rejected
Rejected by: Milo Casagrande
Proposed branch: lp:~milo/linaro-ci/bug1091564
Merge into: lp:linaro-ci
Diff against target: 89 lines (+14/-6)
5 files modified
find_latest.py (+6/-4)
get_latest_slo_hwpack (+4/-2)
jenkins_common_lib (+1/-0)
jenkins_kernel_build_inst (+1/-0)
jenkins_packaged_kernel_build_inst (+2/-0)
To merge this branch: bzr merge lp:~milo/linaro-ci/bug1091564
Reviewer Review Type Date Requested Status
Fathi Boudra Needs Fixing
Linaro Infrastructure Pending
Review via email: mp+140374@code.launchpad.net

Description of the change

Branch removes snowball from the test in order to get the correct snapshots.l.o URL.

It was using a wrong URL:

http://snapshots.linaro.org/quantal/hwpacks/lt-%s/

Instead of:

http://snapshots.linaro.org/quantal/hwpacks/%s/

To post a comment you must log in.
Revision history for this message
Fathi Boudra (fboudra) wrote :

Actually, it isn't specific to snowball.

What we want is a sane default: use engineering builds (linux-linaro) hwpacks
See http://snapshots.linaro.org/quantal/hwpacks
this is panda, snowball, origen and vexpress.

however, we'll need to be able to use member builds (lt-) hwpacks. An env var will be useful.

review: Needs Fixing
Revision history for this message
Milo Casagrande (milo) wrote :

On Tue, Dec 18, 2012 at 10:47 AM, Fathi Boudra <email address hidden> wrote:
> Review: Needs Fixing
>
> Actually, it isn't specific to snowball.
>
> What we want is a sane default: use engineering builds (linux-linaro) hwpacks
> See http://snapshots.linaro.org/quantal/hwpacks
> this is panda, snowball, origen and vexpress.
>
> however, we'll need to be able to use member builds (lt-) hwpacks. An env var will be useful.

Adding an env variable to control that is not that hard.

But I want to better understand the behavior: looking at the link
there, only "panda" has an "lt" hwpack, so should it be treated as
such?
Meaning, if the other boards are passed, never use the "lt" version,
and treat the panda one accordingly with the new env variable.
Is that what you meant?

--
Milo Casagrande
Infrastructure Engineer
Linaro.org <www.linaro.org> │ Open source software for ARM SoCs

lp:~milo/linaro-ci/bug1091564 updated
120. By Milo Casagrande

Added new env variable needed to use LT hwpacks.

Revision history for this message
Milo Casagrande (milo) wrote :

@Fathi: this should now be addressed.
I added a new env variable, called "use_lt_hwpack" that has to be set to either 1 or 0.
In the python script it actually gets converted into first an int, and then a bool. With that, you now have to explicitly say to use the LT hwpacks.

BTW, do we have a central place, in the wiki or somewhere else, where the scripts are explained or the env variables are described? Like a knowledge base or something...

Revision history for this message
Fathi Boudra (fboudra) wrote :

On 18 December 2012 17:30, Milo Casagrande <email address hidden> wrote:
> @Fathi: this should now be addressed.
> I added a new env variable, called "use_lt_hwpack" that has to be set to either 1 or 0.
> In the python script it actually gets converted into first an int, and then a bool. With that, you now have to explicitly say to use the LT hwpacks.

Thanks.

> BTW, do we have a central place, in the wiki or somewhere else, where the scripts are explained or the env variables are described? Like a knowledge base or something...

https://wiki.linaro.org/Platform/Infrastructure/LinaroCIBuildTestService

lp:~milo/linaro-ci/bug1091564 updated
121. By Milo Casagrande

Merged from trunk.

Unmerged revisions

121. By Milo Casagrande

Merged from trunk.

120. By Milo Casagrande

Added new env variable needed to use LT hwpacks.

119. By Milo Casagrande

Removed snowball hwpack check: was using wrong URL for snapshots.linaro.org.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'find_latest.py'
2--- find_latest.py 2012-12-13 10:33:52 +0000
3+++ find_latest.py 2012-12-21 09:26:19 +0000
4@@ -80,15 +80,17 @@
5 filename = find_latest(imageurl)
6 return filename
7
8-def find_latest_hwpack(hwpack):
9+
10+def find_latest_hwpack(hwpack, use_lt_hwpack=False):
11 """Find the latest hardware pack and return the build_id and url
12
13 :param hwpack: The name of the hardware pack to look for.
14+ :param use_lt_hwpack: If the LT hwpack has to be used.
15 """
16- if hwpack == "panda" or hwpack == "snowball":
17- url="http://snapshots.linaro.org/quantal/hwpacks/lt-%s/" % hwpack
18+ if use_lt_hwpack:
19+ url = "http://snapshots.linaro.org/quantal/hwpacks/lt-%s/" % hwpack
20 else:
21- url="http://snapshots.linaro.org/quantal/hwpacks/%s/" % hwpack
22+ url = "http://snapshots.linaro.org/quantal/hwpacks/%s/" % hwpack
23 filename = find_latest(url)
24 return filename
25
26
27=== modified file 'get_latest_slo_hwpack'
28--- get_latest_slo_hwpack 2012-05-17 09:58:53 +0000
29+++ get_latest_slo_hwpack 2012-12-21 09:26:19 +0000
30@@ -1,6 +1,7 @@
31 #!/usr/bin/python
32 """
33-Get the latest hwpack depending on the BOARD_TYPE from snapshots.linaro.org
34+Get the latest hwpack from snapshots.linaro.org depending on the BOARD_TYPE
35+and if to use the Landing Team hwpack.
36
37 """
38
39@@ -8,5 +9,6 @@
40 import os
41
42 hwpacktype = os.getenv("hwpack_type", "unknown")
43-hwpack_url = find_latest_hwpack(hwpacktype)
44+use_lt_hwpack = bool(int(os.getenv("use_lt_hwpack", 0)))
45+hwpack_url = find_latest_hwpack(hwpacktype, use_lt_hwpack)
46 print hwpack_url
47
48=== modified file 'jenkins_common_lib'
49--- jenkins_common_lib 2012-12-18 19:40:36 +0000
50+++ jenkins_common_lib 2012-12-21 09:26:19 +0000
51@@ -27,6 +27,7 @@
52 echo KERNEL_JOB_NAME=$JOB_NAME >> hwpack_info
53 echo GIT_LOG=`git log -n1 --pretty=oneline` >> hwpack_info
54 echo GIT_WEB_URL=$git_web_url >> hwpack_info
55+echo USE_LT_HWPACK=$use_lt_hwpack >> hwpack_info
56
57 if test -n "$device_tags"; then
58 echo DEVICE_TAGS=$device_tags >> hwpack_info
59
60=== modified file 'jenkins_kernel_build_inst'
61--- jenkins_kernel_build_inst 2012-12-19 11:50:56 +0000
62+++ jenkins_kernel_build_inst 2012-12-21 09:26:19 +0000
63@@ -53,6 +53,7 @@
64 use_config_fragment=0
65 fi
66
67+export use_lt_hwpack
68 export kernel_config
69 export hwpack_type
70 export board_type
71
72=== modified file 'jenkins_packaged_kernel_build_inst'
73--- jenkins_packaged_kernel_build_inst 2012-03-23 11:27:18 +0000
74+++ jenkins_packaged_kernel_build_inst 2012-12-21 09:26:19 +0000
75@@ -29,6 +29,7 @@
76 : ${DEBFULLNAME:="Linaro CI"}
77 : ${DEBEMAIL:="john.rigby@linaro.org"}
78 : ${force_build:=0}
79+: ${use_lt_hwpack:=0}
80
81 export GIT_COMMITTER_NAME
82 export GIT_COMMITTER_EMAIL
83@@ -356,5 +357,6 @@
84 URL=$JENKINS_HOME/jobs/$JOB_NAME/workspace/$new_hwpack_name
85 EXECUTION_TIME_IN_SEC=$(( $END - $START ))
86 HWPACK_BUILD_DATE=$(echo $new_hwpack_name | cut -d '_' -f3)
87+ USE_LT_HWPACK=$use_lt_hwpack
88 _HWPACK_INFO_END_
89 exit 0

Subscribers

People subscribed via source and target branches