From 501167ca3e7d8f330d7fe02306af3aa9377a9097 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 2 May 2018 09:48:58 -0400 Subject: [PATCH 1/6] updating patch level --- container_files/grouper.installer.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties index e611d249..dfd3ac5e 100644 --- a/container_files/grouper.installer.properties +++ b/container_files/grouper.installer.properties @@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install grouperInstaller.autorun.installAllPatches = false grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true -grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_103,grouper_v2_3_0_ui_patch_42,grouper_v2_3_0_ws_patch_11,grouper_v2_3_0_pspng_patch_16 +grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_104,grouper_v2_3_0_ui_patch_42,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_16 #### set this to true to try to use defaults for everything. Only things without default values will need to be set grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true From 64e3953a77d22fc3769b584d5046994eaddd8821 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 2 May 2018 10:13:32 -0400 Subject: [PATCH 2/6] Update Jenkinsfile --- Jenkinsfile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9715dedd..02056edd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,12 +21,27 @@ pipeline { echo "You must define an imagename in common.bash" currentBuild.result = 'FAILURE' } - } + sh 'mkdir -p tmp' + dir('tmp'){ + git([ url: "https://github.internet2.edu/docker/util.git", + credentialsId: "jenkins-github-access-token" ]) + sh 'ls' + sh 'mv bin/* ../bin/.' + } } } stage('Build') { steps { - echo 'step 2' + script { + try{ + sh 'bin/rebuild.sh >> debug' + } catch(error) { + def error_details = readFile('./debug'); + def message = "BUILD ERROR: There was a problem building the Base Image. \n\n ${error_details}" + sh "rm -f ./debug" + handleError(message) + } + } } } stage('Push') { From d9391b1793b28c2fc351133841d8f594d070f7b1 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 2 May 2018 10:20:54 -0400 Subject: [PATCH 3/6] Update Jenkinsfile --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 02056edd..f183d865 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,10 +23,10 @@ pipeline { } sh 'mkdir -p tmp' dir('tmp'){ - git([ url: "https://github.internet2.edu/docker/util.git", - credentialsId: "jenkins-github-access-token" ]) - sh 'ls' - sh 'mv bin/* ../bin/.' + git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ]) + sh 'ls' + sh 'mv bin/* ../bin/.' + } } } } @@ -63,7 +63,7 @@ pipeline { } post { always { - echo 'I will always say Hello again!' + echo 'Done Building.' } failure { // slackSend color: 'good', message: "Build failed" From e8eba92a540a17a04dfd12b84476f373dc5111c7 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 2 May 2018 10:23:02 -0400 Subject: [PATCH 4/6] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index f183d865..020eb0df 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,6 +21,7 @@ pipeline { echo "You must define an imagename in common.bash" currentBuild.result = 'FAILURE' } + sh 'mkdir -p ../bin' sh 'mkdir -p tmp' dir('tmp'){ git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ]) From bfbfdd4e152916ca9c4f5c98afd566cd97586368 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 2 May 2018 10:24:39 -0400 Subject: [PATCH 5/6] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 020eb0df..4ad40b94 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,7 @@ pipeline { echo "You must define an imagename in common.bash" currentBuild.result = 'FAILURE' } - sh 'mkdir -p ../bin' + sh 'mkdir -p bin' sh 'mkdir -p tmp' dir('tmp'){ git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ]) From c369a62684a21d38ae20dd228bec53fa92ab241c Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 2 May 2018 10:26:52 -0400 Subject: [PATCH 6/6] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4ad40b94..e9c2315c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { steps { script { try{ - sh 'bin/rebuild.sh >> debug' + sh 'bin/destroy.sh >> debug' } catch(error) { def error_details = readFile('./debug'); def message = "BUILD ERROR: There was a problem building the Base Image. \n\n ${error_details}"