Fine-tuning test, and adding support for Jenkinsfile

Jenkinsfile

@@ -45,6 +45,17 @@ node('docker') {
       handleError(message)
     }
 
+  stage 'Compose'
+    try{
+      sh 'docker rm mariadb'
+      sh 'bin/compose.sh &> debug'
+    } catch(error) {
+      def error_details = readFile('./debug');
+      def message = "BUILD ERROR: There was a problem composing Shibboleth appliance (${tag}). \n\n ${error_details}"
+      sh "rm -f ./debug"
+      handleError(message, tag)
+    }    
+
   stage 'Tests'
 
     try{
@@ -56,6 +67,10 @@ node('docker') {
       handleError(message)
     }
 
+  stage 'Clean Up'
+
+    cleanup(tag)
+
   stage 'Notify'
 
     slackSend color: 'good', message: "grouper-appliance (${tag}) passes test battery"
@@ -72,10 +87,25 @@ def imagename() {
   matcher ? matcher[0][1] : null
 }
 
-def handleError(String message){
+def handleError(String message, String tag, Boolean doCleanup = true){
   echo "${message}"
   currentBuild.setResult("FAILED")
   slackSend color: 'danger', message: "${message}"
   //step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'chris.bynum@levvel.io', sendToIndividuals: true])
+  if (doCleanup) {
+    cleanup(tag)
+  }
   sh 'exit 1'
+}
+
+def cleanup(String tag) {
+    try{
+      sh 'bin/decompose.sh &> debug'
+      sh 'bin/prune.sh &> debug'
+    } catch(error) {
+      def error_details = readFile('./debug');
+      def message = "BUILD ERROR: There was a problem cleaning up Shibboleth appliance :${tag}. \n\n ${error_details}"
+      sh "rm -f ./debug"
+      handleError(message, tag, false)
+    }
 }

bin/ci-run.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# This file will run a container in the background
+source common.bash .
+
+docker run -d --name=$imagename -v $PWD/logs/tomcat:/usr/local/tomcat/logs:rw \
+           -v $PWD/logs/shibboleth_idp:/opt/shibboleth/shibboleth-identity-provider-$version/logs:rw \
+           -p 8080:8080 $maintainer/$imagename

bin/ci-stop.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# This file will run a container in the background
+source common.bash .
+
+rm logs/tomcat/*
+rm logs/shibboleth_idp/*
+echo "Cleaning up Docker image($maintainer/$imagename)"
+docker stop $imagename >> /dev/null
+docker rm $imagename
+exit 0

bin/compose.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "Composing"
+docker-compose up -d

bin/decompose.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "Decomposing"
+docker-compose stop

bin/download.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+source common.bash .
+
+rm -rf root
+if [ ! -f shibboleth-identity-provider.tar.gz ]; then
+    git clone git@github.internet2.edu:docker/shib-idp-conftree.git --depth 1 --branch test root
+fi

bin/prune.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+result=$(docker volume ls -qf dangling=true)
+
+if [ ! -z "$result" ]; then
+  docker volume rm $result
+fi

bin/recompose.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+source bin/decompose.sh && source bin/destroy.sh && source bin/prune.sh && source bin/build.sh && source bin/compose.sh

tests/image.bats

@@ -17,10 +17,6 @@ load ../common
   [ "$status" -eq 0 ]
 }
 
-@test "Has fired autorun firstrun" {
-  docker run -i $maintainer/$imagename find /opt/log/firstrun.log
-}
-
 @test "Has fired autorun onbuild" {
   docker run -i $maintainer/$imagename find /opt/log/autoexec.build.log
 }

tests/running.bats

@@ -0,0 +1,7 @@
+#!/usr/bin/env bats
+
+load ../common
+
+@test "Has fired autorun firstrun" {
+  docker run -i $maintainer/$imagename find /opt/log/autoexec.firstrun.log
+}