diff --git a/Jenkinsfile b/Jenkinsfile index 9715dedd..e9c2315c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,12 +21,28 @@ 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" ]) + sh 'ls' + sh 'mv bin/* ../bin/.' + } + } } } stage('Build') { steps { - echo 'step 2' + script { + try{ + 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}" + sh "rm -f ./debug" + handleError(message) + } + } } } stage('Push') { @@ -48,7 +64,7 @@ pipeline { } post { always { - echo 'I will always say Hello again!' + echo 'Done Building.' } failure { // slackSend color: 'good', message: "Build failed" 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