JAL-4409 Don't merge JVL configs when changing appbase

diff --git a/build.gradle b/build.gradle
index 97a41b0..4b2b3bd 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -265,7 +265,7 @@ ext {
      *   getdownAppBase = "${bamboo_buildResultsKey}/${bamboo_buildResultsArtifactPath}"
      * } else {
      */
-    getdownAppBase = "${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}"
+    getdownAppBase = "${bamboo_channelbase}/${bamboo_planKey}/${bamboo_getdown_channel_suffix}"
     /* } */
     jvlChannelName += "_${getdownChannelName}"
     // automatically add the test group Not-bamboo for exclusion 
@@ -2447,7 +2447,10 @@ task getdownWebsiteBuild() {
 
     getdownLaunchJvl = getdown_launch_jvl_name + ( (jvlChannelName != null && jvlChannelName.length() > 0)?"-${jvlChannelName}":"" ) + ".jvl"
     def launchJvl = file("${getdownAppBaseDir}/${getdownLaunchJvl}")
-    launchJvl.write("appbase=${getdownAppBase}")
+    def launch_lines = []
+    launch_lines.add("appbase = ${getdownAppBase}")
+    launch_lines.add("jvl_replace = true")
+    launchJvl.write(launch_lines.join("\n"))
 
     // files going into the getdown website dir: getdown-launcher.jar
     copy {

diff --git a/gradle.properties b/gradle.properties
index 35aa95d..9a30ce4 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -185,7 +185,7 @@ imagemagick_convert = ~/buildtools/imagemagick/bin/convert
 
 bamboo_channelbase = https://builds.jalview.org/browse
 bamboo_planKey = 
-bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown
+bamboo_getdown_channel_suffix = latest/artifact/shared/getdown
 #bamboo_buildResultsUrl =
 #bamboo_buildResultsArtifactPath = /artifact/shared/getdown
 #bamboo_buildResultsKey =