diff --git a/Jenkinsfile b/Jenkinsfile index 8cb90349..f97f1526 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,12 +21,11 @@ pipeline { echo "You must define an imagename in common.bash" currentBuild.result = 'FAILURE' } - sh 'mkdir -p bin' - sh 'mkdir -p tmp' + sh 'mkdir -p tmp && mkdir -p bin' dir('tmp'){ git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ]) - sh 'ls' - sh 'mv bin/* ../bin/.' + sh 'rm -rf ../bin/*' + sh 'mv ./bin/* ../bin/.' } } } diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties index bc4e1b30..b2acf050 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_109,grouper_v2_3_0_ui_patch_47,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_20 +grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_109,grouper_v2_3_0_ui_patch_47,grouper_v2_3_0_ws_patch_13,grouper_v2_3_0_pspng_patch_24 #### 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