From 2abfbfb9490ae3b819bf0051e8e24fecf9b80231 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 17 May 2018 12:20:00 -0400
Subject: [PATCH 1/6] try test-compose after build

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index e9c2315c..f49479e8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,6 +50,7 @@ pipeline {
                 script {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
                       def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+                      sh 'cd test-compose && ./compose/sh'
                       baseImg.push("$tag")
                    }
                }

From b256a937f2992e98d1a508046b798ff244fa808a Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 17 May 2018 12:21:20 -0400
Subject: [PATCH 2/6] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f49479e8..da00818f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,7 +50,7 @@ pipeline {
                 script {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
                       def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
-                      sh 'cd test-compose && ./compose/sh'
+                      sh 'cd test-compose && ./compose.sh'
                       baseImg.push("$tag")
                    }
                }

From 5bf134bf48621d04956119d58a8fddfa0736a911 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 17 May 2018 14:26:39 -0400
Subject: [PATCH 3/6] Update Jenkinsfile

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index da00818f..b7ada966 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,6 +51,7 @@ pipeline {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
                       def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
                       sh 'cd test-compose && ./compose.sh'
+                      sh 'cd test-compose && docker-compose down'
                       baseImg.push("$tag")
                    }
                }

From bac85a4a0f75b5fb44db44bd867340142e17266e Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 17 May 2018 14:28:16 -0400
Subject: [PATCH 4/6] Update Jenkinsfile

---
 Jenkinsfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b7ada966..8cb90349 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
                 }  
              }
         }    
-        stage('Build') {
+        stage('Clean') {
             steps {
                 script {
                    try{
@@ -45,12 +45,14 @@ pipeline {
                 }
             }
         } 
-        stage('Push') {
+        stage('Build') {
             steps {
                 script {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
                       def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+                      // test the environment 
                       sh 'cd test-compose && ./compose.sh'
+                      // bring down after testing
                       sh 'cd test-compose && docker-compose down'
                       baseImg.push("$tag")
                    }

From 00b49d961342cf036f1c3ea37463ffeeda9f789e Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 17 May 2018 16:01:16 -0400
Subject: [PATCH 5/6] testing a failure condition will be reverted

---
 test-compose/docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml
index ab5810f9..2274c777 100644
--- a/test-compose/docker-compose.yml
+++ b/test-compose/docker-compose.yml
@@ -1,3 +1,5 @@
+this should blow up
+asdfasdfasdfsadf
 version: "3.3"
 
 services:

From 13c7a1b861d3b7583af0ef28a8ef34998daa16f0 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 17 May 2018 16:16:22 -0400
Subject: [PATCH 6/6] reverting intentional failure

---
 test-compose/docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml
index 2274c777..ab5810f9 100644
--- a/test-compose/docker-compose.yml
+++ b/test-compose/docker-compose.yml
@@ -1,5 +1,3 @@
-this should blow up
-asdfasdfasdfsadf
 version: "3.3"
 
 services: