[releng] Fix publish scripts to remove duplicated variables

Change-Id: Ieb8454ff0a4f0586f8e7575760e6958e791b05b6 Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>
eclipse-capella · Nov 29, 2017 · ec26bf3 · ec26bf3
1 parent d9407ac
commit ec26bf3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/releng/plugins/org.polarsys.capella.rcp.publish/scripts/utils/global-parameters.sh b/releng/plugins/org.polarsys.capella.rcp.publish/scripts/utils/global-parameters.sh
@@ -38,8 +38,8 @@ export PRODUCT_NAME=capella
 # Target platform path
 export TARGET_PATH="releng/plugins/org.polarsys.capella.targets/full"
 
-# Job name
-export JOB_NAME=capella-master
+# Job name (already provided by jenkins)
+# export JOB_NAME=capella-master
 
 # The root folder for all Capella artifacts
 export PUBLISH_FOLDER_ROOT="/home/data/httpd/download.polarsys.org/$PRODUCT_NAME/core"

diff --git a/releng/plugins/org.polarsys.capella.rcp.publish/scripts/utils/publish-parameters.sh b/releng/plugins/org.polarsys.capella.rcp.publish/scripts/utils/publish-parameters.sh
@@ -35,7 +35,7 @@ export BUILD_TYPE=$2
 export BUILD_TYPE_PREFIX=$3
 
 # The full version (should be taken as an argument)
-export VERSION="1.2.0"
+export VERSION=${version}
 
 # Streams are of the form 1.0.x: only keep major and minor version number parts
 export STREAM=$(echo "$VERSION" | sed -r -e 's/^([0-9]+\.[0-9]+\.).*$/\1x/')