Merge lp:~robru/phablet-tools/citrain into lp:phablet-tools

[Robert Bruce Park]

Add scripts to ease interactions with CI Train silos.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:270
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/323/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/323/rebuild

review: Approve (continuous-integration)

[Oliver Grawert (ogra)]

please use ppa-purge to remove the ppa stuff from the machine (needs a package dependency too), the current code only removes the sources.list.d entry but leaves the keys dangling around ...

review: Needs Fixing

[Robert Bruce Park (robru)]

Thanks for your feedback ogra. The thing is, citrain-slurp can't just ppa-purge at the end of the script because it needs to leave those packages installed on purpose, so you can actually test them.

What I'll do is add a third script, citrain-purge which similarly takes a 3-digit silo number, then calls ppa-purge for you.

[lp:~robru/phablet-tools/citrain]

271. By Robert Bruce Park on 2014-05-13

Add citrain-purge tool.

[Oliver Grawert (ogra)]

sounds good :)

[lp:~robru/phablet-tools/citrain]

272. By Robert Bruce Park on 2014-05-13

Do zero-padding so users don't have to.

[Robert Bruce Park (robru)]

Ok ogra, citrain-purge added, and I also added printf statements so that the users don't need to type 3-digit silo numbers anymore (yay less typing!)

Please approve ;-)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:271
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/325/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/325/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:272
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/326/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/326/rebuild

review: Approve (continuous-integration)

[lp:~robru/phablet-tools/citrain]

273. By Robert Bruce Park on 2014-05-14

Split citrain scripts into separate -citrain package.

[Robert Bruce Park (robru)]

Alright guys, I created a new binary package for this. Let me know what you think now.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:273
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/329/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/329/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

review: Approve

[Sergio Schvezov (sergiusens)]

we will need to work out the multiple devices and emulator scenarios, but this is good for now.

review: Approve

[Robert Bruce Park (robru)]

Thanks sergio! I'll pursue landing this a bit later once we're less crunched for silos.

[lp:~robru/phablet-tools/citrain]

274. By Robert Bruce Park on 2014-05-15

Fix FTBFS.

=== added file 'citrain-purge'
--- citrain-purge	1970-01-01 00:00:00 +0000
+++ citrain-purge	2014-05-15 20:01:23 +0000
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+# 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 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) 2014 Canonical, Ltd.
+
+if ! echo $1 | egrep -q "^[0-9]{1,3}$"; then
+    echo "This tool will revert all binary packages from a CI Train silo back to"
+    echo "the stock packages available to the host machine."
+    echo
+    echo "Usage: $0 [silo number]"
+    exit 1
+fi
+
+silo_number=$(printf "%03d" $1)
+
+sudo ppa-purge ppa:ci-train-ppa-service/landing-$silo_number

=== added file 'citrain-push'
--- citrain-push	1970-01-01 00:00:00 +0000
+++ citrain-push	2014-05-15 20:01:23 +0000
@@ -0,0 +1,31 @@
+#!/bin/sh -e
+# 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 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) 2014 Canonical, Ltd.
+
+if ! echo $1 | egrep -q "^[0-9]{1,3}$"; then
+    echo "This tool will install all binary packages from a CI Train silo onto"
+    echo "a connected Ubuntu Touch device."
+    echo
+    echo "Usage: $0 [silo number]"
+    exit 1
+fi
+
+silo_number=$(printf "%03d" $1)
+
+wget -qO- http://ppa.launchpad.net/ci-train-ppa-service/landing-$silo_number/ubuntu/dists/devel/main/source/Sources \
+    | perl -ne 'chomp; s/, / -p /g; s/^Binary: / -p / && print' \
+    | xargs phablet-config writable-image \
+            --ppa ppa:ci-train-ppa-service/landing-$silo_number
+adb reboot

=== added file 'citrain-slurp'
--- citrain-slurp	1970-01-01 00:00:00 +0000
+++ citrain-slurp	2014-05-15 20:01:23 +0000
@@ -0,0 +1,33 @@
+#!/bin/sh -e
+# 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 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) 2014 Canonical, Ltd.
+
+if ! echo $1 | egrep -q "^[0-9]{1,3}$"; then
+    echo "This tool will install all binary packages from a CI Train silo onto"
+    echo "the host machine."
+    echo
+    echo "Usage: $0 [silo number]"
+    exit 1
+fi
+
+silo_number=$(printf "%03d" $1)
+
+sudo add-apt-repository ppa:ci-train-ppa-service/landing-$silo_number
+sudo apt-get update -qq
+wget -qO- http://ppa.launchpad.net/ci-train-ppa-service/landing-$silo_number/ubuntu/dists/devel/main/source/Sources \
+    | perl -ne 's/,//g; s/^Binary: // && print' \
+    | xargs sudo apt-get install --yes
+sudo rm -rf /etc/apt/sources.list.d/ci-train*
+sudo apt-get update -qq

=== modified file 'debian/control'
--- debian/control	2014-04-05 17:01:01 +0000
+++ debian/control	2014-05-15 20:01:23 +0000
@@ -14,7 +14,7 @@
                python-testscenarios,
                python-testtools,
                python-xdg,
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Section: admin
 # If you aren't a member of ~phablet-team but need to upload
 # packaging changes, just go ahead. ~phablet-team will notice
@@ -46,6 +46,8 @@
  pybootchartgui,
  ubuntu-dev-tools,
  ubuntu-device-flash,
+Suggests:
+ phablet-tools-citrain
 Description: Scripts to work with Phablet.
  Installs Touch Developer Preview on Nexus devices, specifically the following:
   - Galaxy Nexus
@@ -54,3 +56,21 @@
   - Nexus 10
  .
  Additional tools included to bootstrap from source and setup networking
+
+Package: phablet-tools-citrain
+Section: admin
+Architecture: all
+Depends:
+ android-tools-adb (>= 4.2.2),
+ apt,
+ ppa-purge,
+ wget,
+ ${misc:Depends},
+ ${perl:Depends},
+Recommends:
+ ubuntu-dev-tools,
+ ubuntu-device-flash,
+Description: Scripts to work with CI Train silos (PPAs).
+ Provides citrain-push, citrain-purge, and citrain-slurp for installing
+ and removing binary packages from CI Train silos on either your host system
+ or connected Ubuntu Touch device.

=== added file 'debian/phablet-tools-citrain.install'
--- debian/phablet-tools-citrain.install	1970-01-01 00:00:00 +0000
+++ debian/phablet-tools-citrain.install	2014-05-15 20:01:23 +0000
@@ -0,0 +1,1 @@
+usr/bin/citrain-*

=== added file 'debian/phablet-tools.install'
--- debian/phablet-tools.install	1970-01-01 00:00:00 +0000
+++ debian/phablet-tools.install	2014-05-15 20:01:23 +0000
@@ -0,0 +1,5 @@
+usr/bin/click-buddy
+usr/bin/phablet-*
+usr/bin/repo
+usr/lib/*
+usr/share/phabletutils/*

=== modified file 'setup.py'
--- setup.py	2014-04-05 17:01:01 +0000
+++ setup.py	2014-05-15 20:01:23 +0000
@@ -13,6 +13,9 @@
     ]
 
 SH_SCRIPTS = [
+    'citrain-purge',
+    'citrain-push',
+    'citrain-slurp',
     'phablet-network',
     'phablet-screenshot',
     'phablet-test-run',