Merge pull request #1717 from marklogic/feature/jenkins-fix

Tearing down Docker after each test stage

Author: rjrudin

Jenkinsfile

@@ -132,23 +132,35 @@ def runAllTests(Boolean useReverseProxy, String image){
             '''
 }
 
+def tearDownDocker() {
+	sh label:'tearDownDocker', script: '''#!/bin/bash
+		cd java-client-api/test-app
+		docker compose down -v || true
+		docker volume prune -f
+	'''
+}
+
 pipeline{
   agent {label 'javaClientLinuxPool'}
+
   options {
     checkoutToSubdirectory 'java-client-api'
     buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '7', numToKeepStr: '10')
   }
-  parameters{
+
+  parameters {
     booleanParam(name: 'regressions', defaultValue: false, description: 'indicator if build is for regressions')
     string(name: 'Email', defaultValue: '' ,description: 'Who should I say send the email to?')
     string(name: 'JAVA_VERSION', defaultValue: 'JAVA8' ,description: 'Who should I say send the email to?')
   }
-  environment{
+
+  environment {
     JAVA_HOME_DIR= getJava()
     GRADLE_DIR   =".gradle"
     DMC_USER     = credentials('MLBUILD_USER')
     DMC_PASSWORD = credentials('MLBUILD_PASSWORD')
   }
+
   stages {
     stage('pull-request-tests') {
       when {
@@ -158,8 +170,6 @@ pipeline{
       }
       steps {
 	      setupDockerMarkLogic("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11")
-
-
         sh label:'run marklogic-client-api tests', script: '''#!/bin/bash
           export JAVA_HOME=$JAVA_HOME_DIR
           export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
@@ -170,15 +180,11 @@ pipeline{
         '''
         junit '**/build/**/TEST*.xml'
       }
-      post{
-        always{
-          sh label:'dockerCleanup', script: '''#!/bin/bash
-				    cd java-client-api/test-app
-            docker compose down -v || true
-            docker volume prune -f
-          '''
-        }
-      }
+			post {
+				always {
+					tearDownDocker()
+				}
+			}
     }
     stage('publish'){
       when {
@@ -197,15 +203,6 @@ pipeline{
           ./gradlew publish
         '''
       }
-      post{
-        always{
-          sh label:'dockerCleanup', script: '''#!/bin/bash
-				    cd java-client-api/test-app
-            docker compose down -v || true
-            docker volume prune -f
-          '''
-        }
-      }
     }
 
 		stage('regressions-11.2.0') {
@@ -216,9 +213,14 @@ pipeline{
 				}
 			}
 			steps {
-			runAllTests(false, "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:11.2.0-ubi")
+				runAllTests(false, "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:11.2.0-ubi")
 				junit '**/build/**/TEST*.xml'
 			}
+			post {
+				always {
+					tearDownDocker()
+				}
+			}
 		}
 
 		stage('regressions-11') {
@@ -232,6 +234,11 @@ pipeline{
 				runAllTests(false, "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11")
 				junit '**/build/**/TEST*.xml'
 			}
+			post {
+				always {
+					tearDownDocker()
+				}
+			}
 		}
 
 		stage('regressions-11-reverseProxy') {
@@ -245,6 +252,11 @@ pipeline{
 				runAllTests(true, "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11")
 				junit '**/build/**/TEST*.xml'
 			}
+			post {
+				always {
+					tearDownDocker()
+				}
+			}
 		}
 
 		stage('regressions-12') {
@@ -258,6 +270,11 @@ pipeline{
 				runAllTests(false, "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
 				junit '**/build/**/TEST*.xml'
 			}
+			post {
+				always {
+					tearDownDocker()
+				}
+			}
 		}
 
 		stage('regressions-10.0') {
@@ -271,6 +288,11 @@ pipeline{
 				runAllTests(false, "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10")
 				junit '**/build/**/TEST*.xml'
 			}
+			post {
+				always {
+					tearDownDocker()
+				}
+			}
 		}
 
   }