Update Jenkinsfile with more steps

Adding back multiple-daemon tests support too

Signed-off-by: Vincent Demeester <[email protected]>

Author: vdemeester

Diff for: Dockerfile

@@ -1,5 +1,5 @@
 # This file describes the standard way to build libcompose, using docker
-FROM golang:1.6.0
+FROM golang:1.6.2
 
 
 # virtualenv is necessary to run acceptance tests

Diff for: Jenkinsfile

@@ -1,22 +1,33 @@
+
 wrappedNode(label: 'linux && x86_64') {
   deleteDir()
   checkout scm
   def image
   try {
-    // TODO: split up into phases, create real test reports, etc.
     stage "build image"
     image = docker.build("dockerbuildbot/libcompose:${gitCommit()}")
 
-    stage "validate, test, build"
-    withEnv(["TESTVERBOSE=1", "LIBCOMPOSE_IMAGE=${image.id}"]) {
-      withChownWorkspace {
-        timeout(60) {
-          sh "make -e all"
-        }
-      }
-    }
+    stage "validate"
+    makeTask(image, "validate")
+
+    stage "test"
+    makeTask(image, "test", ["TESTVERBOSE=1", "DAEMON_VERSION=all"])
+
+    stage "build"
+    makeTask(image, "cross-binary")
   } finally {
     try { archive "bundles" } catch (Exception exc) {}
     if (image) { sh "docker rmi ${image.id} ||:" }
   }
 }
+
+def makeTask(image, task, envVars=null) {
+  // could send in the full list of envVars for each call or provide default env vars like this:
+  withEnv((envVars ?: []) + ["LIBCOMPOSE_IMAGE=${image.id}"]) { // would need `def image` at top level of file instead of in the nested block
+    withChownWorkspace {
+      timeout(60) {
+        sh "make -e ${task}"
+      }
+    }
+  }
+}

Diff for: README.md

@@ -1,7 +1,7 @@
 # libcompose
 
 [![GoDoc](https://godoc.org/github.com/docker/libcompose?status.png)](https://godoc.org/github.com/docker/libcompose)
-[![Jenkins Build Status](https://jenkins.dockerproject.org/view/Libcompose/job/Libcompose%20Master/badge/icon)](https://jenkins.dockerproject.org/view/Libcompose/job/Libcompose%20Master/)
+[![Build Status](https://jenkins.dockerproject.org/job/docker/job/libcompose/branch/master/badge/icon)](https://jenkins.dockerproject.org/job/docker/job/libcompose/branch/master/)
 
 A Go library for Docker Compose. It does everything the command-line tool does, but from within Go -- read Compose files, start them, scale them, etc.