Merge lp:~milo/linaro-ci/external-fragments into lp:linaro-ci

[Milo Casagrande]

Add support for external conf fragment.

The following branch adds support for retrieving, and merging, one external kernel config file.

Three new env variables are necessary to be set in the CI job:
- $conf_external is used to store the name of the external file to retrieve (as in 'vexpress.conf')
- $conf_git and $conf_branch each store the git path and the branch name (as in 'landing-teams/working/arm/kernel.git' and 'integration-linaro-vexpress')

[lp:~milo/linaro-ci/external-fragments]

123. By Milo Casagrande on 2012-12-18

Merged bug1067838 into external-fragments.

124. By Milo Casagrande on 2012-12-19

Support multiple conf file from the same repository.

125. By Milo Casagrande on 2012-12-19

Merged from trunk.

[Deepti B. Kalakeri (deeptik)]

Overall changes looks good +1.
As dicussed on IRC I believe the changes are tested by Andrey and it is believed to work fine.

Can probably make the following changes when u merge it the changes.
It would be good if we made a note how the example values to these options would look like in the scripts probably better to have it in the jenkins_kernel_build_inst.
There is a small spell mistake in a comment at line 8 of the jenkins_common_lib, it should be Default instead of Defaul. ;)

review: Approve

[lp:~milo/linaro-ci/external-fragments]

126. By Milo Casagrande on 2012-12-21

Added description for the new env variables, added export stataments, fixed file path.

127. By Milo Casagrande on 2012-12-21

Merged from trunk.

128. By Milo Casagrande on 2012-12-21

Fixed typo.

[Milo Casagrande (milo)]

On Fri, Dec 21, 2012 at 11:43 AM, Deepti B. Kalakeri
<email address hidden> wrote:
> Review: Approve
>
> Overall changes looks good +1.
> As dicussed on IRC I believe the changes are tested by Andrey and it is believed to work fine.
>
> Can probably make the following changes when u merge it the changes.
> It would be good if we made a note how the example values to these options would look like in the scripts probably better to have it in the jenkins_kernel_build_inst.
> There is a small spell mistake in a comment at line 8 of the jenkins_common_lib, it should be Default instead of Defaul. ;)

Thanks Deepti!
Added a small description in 'jenkins_kernel_build_inst', also export
statements were missing there, so added those as well.

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

=== modified file 'jenkins_common_lib'
--- jenkins_common_lib	2012-12-18 19:40:36 +0000
+++ jenkins_common_lib	2012-12-21 15:29:23 +0000
@@ -3,6 +3,11 @@
 bundle_stream_name_path="/private/team/linaro/ci-$bundle_stream_name/"
 log_info=$BUILD_URL"consoleText"
 pkg_dir=$kernel_version"_output_dir"
+# Default directory where config fragments are or should be stored.
+conf_dir="linaro/configs"
+# Default gitweb access URL.
+default_git_url="http://git.linaro.org/gitweb?p=$conf_git;a=blob_plain;f=linaro/configs/$conf;hb=$conf_branch"
+
 echo > hwpack_info # start with empty
 echo KERNEL_CONFIG=$kernel_config >> hwpack_info
 echo OS_INFO=`cat /etc/lsb-release | grep DISTRIB_DESCRIPTION | cut -d '=' -f 2` >> hwpack_info
@@ -63,6 +68,29 @@
 }
 
 create_config_using_config_fragments() {
+    # Retrieve first, if defined, external conf fragment.
+    if test -n "$conf_git" -a -n "$conf_branch"; then
+        echo "Retrieving external configuration file"
+        if test -n "$conf_external"; then
+            # Check that we have a place where to store everything.
+            if ! test -d $conf_dir; then
+                mkdir -p $conf_dir
+            fi
+            for conf in `printf "$conf_external" | tr ',' ' '`
+            do
+                curl "$default_git_url" > "$conf_dir/$conf"
+                if test -e "$conf_dir/$conf"; then
+                    # Store everything in $conf_filenames
+                    conf_filenames="$conf_filenames $conf_dir/$conf"
+                else
+                    echo "Config file $conf not found at $default_git_url"
+                fi
+            done
+        else
+            echo "External configuration file to retrieve not defined, skipping"
+        fi
+    fi
+
     ARCH=arm scripts/kconfig/merge_config.sh $conf_filenames
     for cname in `find . -name \.config `
     do

=== modified file 'jenkins_kernel_build_inst'
--- jenkins_kernel_build_inst	2012-12-19 11:50:56 +0000
+++ jenkins_kernel_build_inst	2012-12-21 15:29:23 +0000
@@ -3,7 +3,27 @@
 # kernel_config='omap2plus_defconfig'
 # export board_type='panda'
 # kernel_flavour='omap4'
-# rootfs_type='nano-lava'
+# rootfs_type='nano'
+#
+# The following three variables:
+# conf_git
+# conf_branch
+# conf_external
+#
+# are used to retrieve kernel config fragments from an external source tree
+# in git.linaro.org.
+# The URL where the files are taken is built in this way:
+# http://git.linaro.org/gitweb?p=$conf_git;a=blob_plain;f=linaro/configs/$conf;hb=$conf_branch
+# conf_git: is the git tree where to look into, like landing-teams/working/arm/kernel.git
+# conf_branch: is the branch to use, like HEAD
+# conf_external: is a comma separated list of kernel config file names to retrieve, it is
+# possible to list also only one file name
+#
+# An example of usage of these variables:
+# conf_git='landing-teams/working/arm/kernel.git'
+# conf_branch='HEAD'
+# conf_fragment='android.conf,imx5.conf'
+
 set -xe
 
 if test -z "$kernel_config"; then
@@ -47,12 +67,15 @@
 fi
 
 if test -z "$conf_filenames"; then
-  conf_filenames='omap4.conf'
+  conf_filenames='linaro/configs/omap4.conf'
 fi
 if test -z "$use_config_fragment"; then
   use_config_fragment=0
 fi
 
+export conf_git
+export conf_branch
+export conf_external
 export kernel_config
 export hwpack_type
 export board_type