JAL-4409 Changes in BUILD channel appbase to tie in with Getdown DEVELOP Launcher...

diff --git a/build.gradle b/build.gradle
index d057994..217ee28 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -257,9 +257,13 @@ ext {
 
     case "BUILD":
     // TODO: get bamboo build artifact URL for getdown artifacts
-    getdown_channel_base = bamboo_channelbase
     getdownChannelName = string("${bamboo_planKey}/${JAVA_VERSION}")
-    getdownAppBase = string("${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}/${JAVA_VERSION}")
+
+    if (bamboo_buildResultsUrl && bamboo_buildResultsKey) {
+      getdownAppBase = "${bamboo_buildResultsKey}/${bamboo_buildResultsArtifactPath}"
+    } else {
+      getdownAppBase = "${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}"
+    }
     jvlChannelName += "_${getdownChannelName}"
     // automatically add the test group Not-bamboo for exclusion 
     if ("".equals(testng_excluded_groups)) { 

diff --git a/gradle.properties b/gradle.properties
index e5b2f12..359f229 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -185,7 +185,10 @@ imagemagick_convert = ~/buildtools/imagemagick/bin/convert
 
 bamboo_channelbase = https://builds.jalview.org/browse
 bamboo_planKey = 
-bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown-build-for-website/default
+bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown
+bamboo_buildResultsUrl =
+bamboo_buildResultsArtifactPath = /artifact/shared/getdown
+bamboo_buildResultsKey =
 
 eclipse_codestyle_file = utils/eclipse/JalviewCodeStyle.xml
 eclipse_extra_jdt_prefs_file = utils/eclipse/org.eclipse.jdt.core.jalview.prefs