Merge pull request #10 from docker/runtime-tests

Adding some runtime tests to the suite
docker · Aug 3, 2016 · ef78cb01384f40aff704191d8b8ad9d26c98eaae · ef78cb0
2 parents 4212f68 + 12f5269
commit ef78cb01384f40aff704191d8b8ad9d26c98eaae
Unified Split

Showing with 37 additions and 6 deletions.

+2 −0 .gitignore

+4 −1 Dockerfile

+16 −1 Jenkinsfile

+0 −4 tests/image.bats

+15 −0 tests/running.bats
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,8 @@ bin/rebuild.sh
 bin/rerun.sh
 bin/run.sh
 bin/test.sh
+bin/start.sh
+bin/stop.sh
 root/**
 shibboleth-identity-provider.tar.gz
 test.log
diff --git a/Dockerfile b/Dockerfile
@@ -5,4 +5,7 @@ ARG imagename=shibboleth_idp
 ARG version=3.2.1
 ENV VERSION=$version
 
-RUN chown -R root:root /opt/shibboleth/shibboleth-identity-provider-$version
+RUN chown -R root:root /opt/shibboleth/shibboleth-identity-provider-$version
+
+EXPOSE 8080
+CMD ["catalina.sh", "run"]
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -20,7 +20,22 @@ node {
     dir('root'){
       git([ url: "https://github.internet2.edu/docker/shib-idp-conftree.git",
           branch: "test", credentialsId: "jenkins-github-access-token" ])
-    }    
+    }
+
+  stage 'Build'
+
+    def maintainer = maintainer()
+    def imagename = imagename()
+    def tag = env.BRANCH_NAME
+    if(!imagename){
+      echo "You must define an imagename in common.bash"
+      currentBuild.result = 'FAILURE'
+    }
+    if(maintainer){
+      echo "Building ${maintainer}:${tag} for ${maintainer}"
+    }
+
+    sh 'bin/rebuild.sh'
 
   stage 'Tests'
 

diff --git a/tests/image.bats b/tests/image.bats
@@ -2,10 +2,6 @@
 
 load ../common
 
-setup() {
-  ./bin/rebuild.sh
-}
-
 @test "Creates non-root Shib IDP home" {
   result="$(docker run -i $maintainer/$imagename ls /opt/shibboleth/current/bin/)"
   [ "$result" != '' ]

diff --git a/tests/running.bats b/tests/running.bats
@@ -0,0 +1,15 @@
+#!/usr/bin/env bats
+
+load ../common
+
+setup() {
+  bin/start.sh
+}
+
+@test "Leaves running process" {
+  result="$(docker ps | grep $imagename)"
+  [ "$result" != '' ]
+}
+teardown() {
+  bin/stop.sh
+}