From c27e192d0731fcd9d880c8abde729f4f88295472 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Tue, 4 Sep 2018 10:11:28 -0400 Subject: [PATCH 1/5] Update grouper.installer.properties --- 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 284e5dca..5e5778d8 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_108,grouper_v2_3_0_ui_patch_45,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_16 +grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_108,grouper_v2_3_0_ui_patch_45,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_20 #### 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 e7cbf6f72c9539e7dae8bffa76eab2ad298324a7 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Fri, 7 Sep 2018 09:15:02 -0400 Subject: [PATCH 2/5] Update grouper.installer.properties --- 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 5e5778d8..bc4e1b30 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_108,grouper_v2_3_0_ui_patch_45,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_12,grouper_v2_3_0_pspng_patch_20 #### 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 7b24ed0c528d37d9ff1323820c168b7050dbbe1d Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 10 Sep 2018 09:17:44 -0400 Subject: [PATCH 3/5] Update grouper.installer.properties --- 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 bc4e1b30..4b08cf86 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_12,grouper_v2_3_0_pspng_patch_21 #### 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 76ac8667cc6debf5405533a58c1dfd855a37609a Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Fri, 8 Feb 2019 16:31:42 -0500 Subject: [PATCH 4/5] Update grouper.installer.properties --- 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 4b08cf86..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_21 +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 From 8e0f56764a5087587ae00e0d055efda9f77f4bfe Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Tue, 12 Feb 2019 10:42:27 -0500 Subject: [PATCH 5/5] Update Jenkinsfile --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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/.' } } }