Merge lp:~notnownikki/jenkins-launchpad-plugin/android-multiple-target-fixes into lp:~private-ps-quality-team/jenkins-launchpad-plugin/trunk

[Nicola Heald]

* Only removes old build assets for the device target we're building. (Otherwise, it erased all previous assets when we were building for multiple targets, and we only got one build)

* Change into the correct directory when checking out multiple vendors

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:15
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mike-powerthroughwords/jenkins-launchpad-plugin/android-multiple-target-fixes/+merge/207481/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/jenkins-launchpad-plugin-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/jenkins-launchpad-plugin-trusty-amd64-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/jenkins-launchpad-plugin-ci/32/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:15
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mike-powerthroughwords/jenkins-launchpad-plugin/android-multiple-target-fixes/+merge/207486/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/jenkins-launchpad-plugin-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/jenkins-launchpad-plugin-trusty-amd64-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/jenkins-launchpad-plugin-ci/33/rebuild

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

The target branch for this should be:
lp:~canonical-ci-engineering/jenkins-launchpad-plugin/touch-image-builder

The touch-image-builder isn't a launchpad project.

review: Needs Fixing

Unmerged revisions

15. By Nicola Heald on 2014-02-20

Make sure we're in the right directory when checking out multiple vendors, only remove assets for old build for the device we're making.

14. By Francis Ginther on 2014-02-14

Allow for custom vendors and devices and bind mounting of the archive directory (thanks Mike Heald).

13. By Francis Ginther on 2014-01-07

Making build more verbose and easier to read.

12. By Francis Ginther on 2014-01-07

Do the setup every time, but remove the package installs.

11. By Francis Ginther on 2013-12-20

Remove bootstrap of goldfish.

10. By Francis Ginther on 2013-12-20

Fix TOOL_DIR pull.

9. By Francis Ginther on 2013-12-20

Add pull or branch logic for TOOLS_DIR.

8. By Francis Ginther on 2013-12-20

Remove JOB_DIR as this will run from within the jenkins job.

7. By Francis Ginther on 2013-12-20

Add set -ex to setup script.

6. By Francis Ginther on 2013-12-18

Add ubuntu-touch-image.sh as a master script.

=== added file 'build-android.sh'
--- build-android.sh	1970-01-01 00:00:00 +0000
+++ build-android.sh	2014-02-20 16:19:43 +0000
@@ -0,0 +1,137 @@
+#!/bin/bash
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the applicable version of the GNU Lesser General Public
+# License for more details.
+#.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright (C) 2013 Canonical, Ltd.
+
+# The android build gets confused with this set
+
+set -xe
+
+echo Defining environment
+
+. define-environment
+
+echo Environment defined
+
+export JENKINS_BUILD_NUMBER=$series-$BUILD_NUMBER
+export stamp=$(pwd)/ubuntu/assets/ubuntu_stamp
+
+# if BUILD_NUMBER is set, Android uses it in it's artifact filename
+unset BUILD_NUMBER
+#export http_proxy=http://10.128.92.2:3128
+#export https_proxy=http://10.128.92.2:3128
+export
+
+sum_append() {
+    cd archive
+    sha256 $1 > $1.sha256
+    cd -
+}
+
+repo_dump_heads() {
+	repo list | awk -F' ' '{print $1}' | while read project; do
+		gitlog=`git --git-dir=$PWD/$project/.git log -n 1 --pretty="format:%h : %s"`
+		echo "$project : $gitlog"
+	done
+}
+
+create_build_stamp() {
+    echo Creating build stamp
+    if [ -f $stamp ]
+    then
+        rm $stamp
+        if [ -n "$1" ]
+        then
+            echo HARDWARE=$1 >> $stamp
+        fi
+        echo JENKINS_BUILD=$JENKINS_BUILD_NUMBER >> $stamp
+        echo -e "\nAndroid repo head list:" >> $stamp
+        repo_dump_heads >> $stamp
+    fi
+}
+
+build_device() {
+    echo Building $1
+    create_build_stamp $1
+    breakfast $1
+    # The -j1 is only for debugging now
+    make -j1 showcommands bacon BUILD_WITH_COLORS=0
+
+    if [ $? != 0 ]
+    then
+        echo Build for $1 failed
+        exit 1
+    fi 
+    mv $OUT/cm-10.1-*-$CM_BUILD.zip archive/$series-preinstalled-armel+$CM_BUILD.zip
+    mv $OUT/recovery.img archive/$series-preinstalled-recovery-armel+$CM_BUILD.img
+    mv $OUT/system.img archive/$series-preinstalled-system-armel+$CM_BUILD.img
+    mv $OUT/boot.img archive/$series-preinstalled-boot-armel+$CM_BUILD.img
+    sum_append $series-preinstalled-armel+$CM_BUILD.zip
+    sum_append $series-preinstalled-recovery-armel+$CM_BUILD.img
+    sum_append $series-preinstalled-system-armel+$CM_BUILD.img
+    sum_append $series-preinstalled-boot-armel+$CM_BUILD.img
+}
+
+if [ -d archive ]
+then
+    echo Removing previously archived components for ${CM_BUILD}
+    rm -rf archive/*${CM_BUILD}*
+fi
+
+echo Creating archive directory
+mkdir -p archive
+
+set -e
+echo Running repo sync
+export android_changelog=$(mktemp)
+repo sync 2>&1 | tee -a $android_changelog
+repo manifest -o android_manifest.xml -r
+# Clean empty lines as repo output is not so friendly
+sed -i '${/^$/d}' $android_changelog
+set +e
+
+. build/envsetup.sh
+
+if [ "$clobber" == "true" ]
+then
+    echo
+    echo Cleaning
+    echo
+    make clobber
+else
+    echo
+    echo Performing an incremental build
+    echo
+fi
+
+echo Updating bzr branches
+for dir in ${BUILD_VENDOR_TARGETS}
+do
+    echo Trying to update $dir
+    if [ -d $dir ]
+    then
+         cd vendor/$dir
+         bzr pull
+         croot
+         cd ..
+    fi
+done
+
+export timestamp=$(date +%Y%m%d)
+create_build_stamp
+cp $stamp archive
+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-20 16:19:43 +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"}
+

=== added file 'ubuntu-touch-image-setup.sh'
--- ubuntu-touch-image-setup.sh	1970-01-01 00:00:00 +0000
+++ ubuntu-touch-image-setup.sh	2014-02-20 16:19:43 +0000
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -ex
+
+. define-environment
+
+FLAG_FILE=repo-init-complete
+
+#if [ -f $FLAG_FILE ]; then
+#    echo "Skipping repository init"
+#    exit 0
+#fi
+
+TOOLS_DIR=~/phablet-build-scripts
+# REPO_DIR is equivalent to the jenkins job workspace
+REPO_DIR=$WORKSPACE
+
+# Setup phablet-tools
+#sudo add-apt-repository ppa:phablet-team/tools
+#sudo apt-get update
+#sudo apt-get install -y phablet-tools android-tools-adb android-tools-fastboot
+
+# Setup build dependencies
+#sudo apt-get install -y git gnupg flex bison gperf build-essential \
+#    zip bzr curl libc6-dev libncurses5-dev:i386 x11proto-core-dev \
+#    libx11-dev:i386 libreadline6-dev:i386 libgl1-mesa-glx:i386 \
+#    libgl1-mesa-dev g++-multilib mingw32 ubuntu-dev-tools tofrodos \
+#    python-markdown libxml2-utils xsltproc zlib1g-dev:i386 schedtool bsdiff
+#sudo apt-get install -y openjdk-6-jdk
+
+# Setup tools
+if [ -d $TOOLS_DIR ]; then
+    cd $TOOLS_DIR
+    bzr pull
+    cd -
+else
+    bzr branch lp:touch-preview-images/phablet-build-scripts $TOOLS_DIR
+fi
+
+# Init repository
+phablet-dev-bootstrap . -c
+for device in ${BUILD_DEVICE_TARGETS}
+do
+    phablet-dev-bootstrap -v $device . -c
+done
+
+# Add private branches
+cd vendor
+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

=== added file 'ubuntu-touch-image.sh'
--- ubuntu-touch-image.sh	1970-01-01 00:00:00 +0000
+++ ubuntu-touch-image.sh	2014-02-20 16:19:43 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -ex
+
+./ubuntu-touch-image-setup.sh
+./build-android.sh