Merge lp:~cjohnston/uci-engine/pkg-chk into lp:uci-engine

[Chris Johnston]

Add a test to tarmac.sh to ensure that the packages required to run the test suite are installed.

When setting up the new tarmac instance I ran into an issue where I forgot a package to install in order to run the tests. The test suite ran for a bit and then had an error. This just makes it error earlier on and with a nice output telling you what you need to do.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:425
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/500/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/500/rebuild

review: Needs Fixing (continuous-integration)

[lp:~cjohnston/uci-engine/pkg-chk]

425. By Chris Johnston on 2014-04-11

Add a check to tarmac to see if the packages required for running the test suite are installed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:425
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/501/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/501/rebuild

review: Approve (continuous-integration)

[Andy Doan (doanac)]

On 04/11/2014 03:40 PM, Chris Johnston wrote:
> +pkgs='python-pip python-virtualenv python-setuptools python-dev make'
> +MISSING=0
> +dpkg -s $pkgs 2>/dev/null >/dev/null || MISSING=1
> +if [ $MISSING -eq 1 ] ; then

You can make this more compact with:

  pkgs='python-pip python-virtualenv python-setuptools python-dev make'
  if ! dpkg -s $pkgs 2>/dev/null >/dev/null ; then

[lp:~cjohnston/uci-engine/pkg-chk]

426. By Chris Johnston on 2014-04-11

Smaller is better

[Chris Johnston (cjohnston)]

Fixed in revno 426

review: Needs Resubmitting

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:426
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/502/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/502/rebuild

review: Approve (continuous-integration)

[Andy Doan (doanac)]

review: Approve

=== modified file 'tarmac.sh'
--- tarmac.sh	2014-03-26 15:35:02 +0000
+++ tarmac.sh	2014-04-11 21:46:12 +0000
@@ -14,11 +14,19 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# REQUIRES: python-pip python-virtualenv python-setuptools python-dev
+# REQUIRES: python-pip python-virtualenv python-setuptools python-dev make
 
 export CI_DEPS_BRANCH="lp:~canonical-ci-engineering/uci-engine/deps"
 
 set -e
+
+pkgs='python-pip python-virtualenv python-setuptools python-dev make'
+if ! dpkg -s $pkgs 2>/dev/null >/dev/null ; then
+    echo "Required packages are missing. Please ensure that the missing packages are installed."
+    echo "Run: sudo apt-get install $pkgs"
+    exit 1
+fi
+
 if [ -z $1 ] ; then
     # Create a temporary venv
     venv=$(mktemp -d)