Merge lp:~notnownikki/jenkins-launchpad-plugin/touch-image-builder into lp:~canonical-ci-engineering/jenkins-launchpad-plugin/touch-image-builder

[Nicola Heald]

* Removes contents of archive instead of the archive directory. This is so that directory can be bind mounted in another location outside of the build chroot.

* Moves the hardcoded list of vendors and devices to build into two variables at the start of the script. These can be overridden so that you can build for only one vendor/device.

[Francis Ginther (fginther)]

Please add some variable initialization to ubuntu-touch-image-setup.sh, (or better yet, source a common file with the variable init done only once) this could be executed prior to build-android.sh and would fail if the environment wasn't already setup.

BUILD_DEVICE_TARGETS=${BUILD_DEVICE_TARGETS:-"manta maguro mako grouper"}
BUILD_VENDOR_TARGETS=${BUILD_VENDOR_TARGETS:-"samsung lge audience broadcom nxp nvidia invensense elan widevine asus"}

review: Needs Fixing

[Nicola Heald (notnownikki)]

Do you mean, move those variable init lines to ubuntu-touch-image-setup.sh
and have build-android.sh fail if they're not set, or check for them
in ubuntu-touch-image-setup.sh and have ubuntu-touch-image-setup.sh fail if
they're not set?

On Thu, Feb 13, 2014 at 4:11 PM, Francis Ginther <
<email address hidden>> wrote:

> Review: Needs Fixing
>
> Please add some variable initialization to ubuntu-touch-image-setup.sh,
> (or better yet, source a common file with the variable init done only once)
> this could be executed prior to build-android.sh and would fail if the
> environment wasn't already setup.
>
> BUILD_DEVICE_TARGETS=${BUILD_DEVICE_TARGETS:-"manta maguro mako grouper"}
> BUILD_VENDOR_TARGETS=${BUILD_VENDOR_TARGETS:-"samsung lge audience
> broadcom nxp nvidia invensense elan widevine asus"}
> --
>
> https://code.launchpad.net/~mike-powerthroughwords/jenkins-launchpad-plugin/touch-image-builder/+merge/206204
> You are the owner of
> lp:~mike-powerthroughwords/jenkins-launchpad-plugin/touch-image-builder.
>

[Francis Ginther (fginther)]

Sorry, I should have been more clear. As two script use these two variables, can they be moved to an independent location (i.e. a file called define-environment) and then both scripts could just import the same definition with:

. define-environment

[Nicola Heald (notnownikki)]

Gotcha, and both scripts should complain if they're not set.

At the moment, the scripts build all vendors, all devices. Should that be
kept as the default behaviour id they're not overridden in the environment?

On Thu, Feb 13, 2014 at 8:48 PM, Francis Ginther <
<email address hidden>> wrote:

> Sorry, I should have been more clear. As two script use these two
> variables, can they be moved to an independent location (i.e. a file called
> define-environment) and then both scripts could just import the same
> definition with:
>
> . define-environment
> --
>
> https://code.launchpad.net/~mike-powerthroughwords/jenkins-launchpad-plugin/touch-image-builder/+merge/206204
> You are the owner of
> lp:~mike-powerthroughwords/jenkins-launchpad-plugin/touch-image-builder.
>

[Francis Ginther (fginther)]

Looks good, thanks for making the change.

review: Approve

=== modified file 'build-android.sh'
--- build-android.sh	2014-01-07 19:05:06 +0000
+++ build-android.sh	2014-02-14 11:32:26 +0000
@@ -18,6 +18,8 @@
 
 set -xe
 
+. define-environment
+
 export JENKINS_BUILD_NUMBER=$series-$BUILD_NUMBER
 export stamp=$(pwd)/ubuntu/assets/ubuntu_stamp
 
@@ -80,11 +82,11 @@
 if [ -d archive ]
 then
     echo Removing previously archived components
-    rm -rf archive
+    rm -rf archive/*
 fi
 
 echo Creating archive directory
-mkdir archive
+mkdir -p archive
 
 set -e
 echo Running repo sync
@@ -110,12 +112,12 @@
 fi
 
 echo Updating bzr branches
-for dir in vendor/samsung vendor/lge vendor/audience vendor/broadcom vendor/nxp vendor/nvidia vendor/invensense vendor/elan vendor/widevine vendor/asus
+for dir in ${BUILD_VENDOR_TARGETS}
 do
     echo Trying to update $dir
     if [ -d $dir ]
     then
-         cd $dir
+         cd vendor/$dir
          bzr pull
          croot
     fi
@@ -124,8 +126,7 @@
 export timestamp=$(date +%Y%m%d)
 create_build_stamp
 cp $stamp archive
-build_device manta
-build_device maguro
-build_device mako
-build_device grouper
-
+for device in ${BUILD_DEVICE_TARGETS}
+do
+    build_device $device
+done

=== added file 'define-environment'
--- define-environment	1970-01-01 00:00:00 +0000
+++ define-environment	2014-02-14 11:32:26 +0000
@@ -0,0 +1,3 @@
+export BUILD_DEVICE_TARGETS=${BUILD_DEVICE_TARGETS:-"manta maguro mako grouper"}
+export BUILD_VENDOR_TARGETS=${BUILD_VENDOR_TARGETS:-"samsung lge audience broadcom nxp nvidia invensense elan widevine asus"}
+

=== modified file 'ubuntu-touch-image-setup.sh'
--- ubuntu-touch-image-setup.sh	2014-01-07 14:11:10 +0000
+++ ubuntu-touch-image-setup.sh	2014-02-14 11:32:26 +0000
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -ex
 
+. define-environment
+
 FLAG_FILE=repo-init-complete
 
 #if [ -f $FLAG_FILE ]; then
@@ -36,19 +38,17 @@
 
 # Init repository
 phablet-dev-bootstrap . -c
-phablet-dev-bootstrap -v mako,maguro,manta,grouper . -c
+for device in ${BUILD_DEVICE_TARGETS}
+do
+    phablet-dev-bootstrap -v $device . -c
+done
 
 # Add private branches
 cd vendor
-bzr branch bzr+ssh://bazaar.launchpad.net/~rocket-scientists/aal+/cm-vendor-asus_jb/ asus
-bzr branch bzr+ssh://bazaar.launchpad.net/~rocket-scientists/aal+/cm-vendor-audience_jb/ audience
-bzr branch bzr+ssh://bazaar.launchpad.net/~rocket-scientists/aal+/cm-vendor-broadcom_jb/ broadcom
-bzr branch bzr+ssh://bazaar.launchpad.net/~rocket-scientists/aal+/cm-vendor-elan_jb/ elan
-bzr branch bzr+ssh://bazaar.launchpad.net/~rocket-scientists/aal+/cm-vendor-lge_jb/ lge
-bzr branch bzr+ssh://bazaar.launchpad.net/~rocket-scientists/aal+/cm-vendor-nvidia_jb/ nvidia
-bzr branch bzr+ssh://bazaar.launchpad.net/~rocket-scientists/aal+/cm-vendor-nxp_jb/ nxp
-bzr branch bzr+ssh://bazaar.launchpad.net/~rocket-scientists/aal+/cm-vendor-samsung_jb/ samsung
-bzr branch bzr+ssh://bazaar.launchpad.net/~rocket-scientists/aal+/cm-vendor-widevine_jb/ widevine
+for vendor in ${BUILD_VENDOR_TARGETS}
+do
+    bzr branch bzr+ssh://bazaar.launchpad.net/~rocket-scientists/aal+/cm-vendor-${vendor}_jb/ $vendor
+done
 cd ..
 
 touch $FLAG_FILE