From 72faf08c5a5993f53c610050ce6b7f7bb8e82ff1 Mon Sep 17 00:00:00 2001
From: Anibal Gomez <anibal.gomez@dotcms.com>
Date: Mon, 15 May 2017 15:37:22 -0600
Subject: [PATCH] dotCMS/core#11196: Adjusted Jenkins scripts releases (9)

---
 .../nightly_build/master_actual_build.sh      | 22 +++++++++----------
 .../nightly_build/master_post_build.sh        |  2 +-
 .../nightly_build/slave_post_build.sh         |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/jenkins_scripts/nightly_build/master_actual_build.sh b/jenkins_scripts/nightly_build/master_actual_build.sh
index 4f89873..862a6a0 100644
--- a/jenkins_scripts/nightly_build/master_actual_build.sh
+++ b/jenkins_scripts/nightly_build/master_actual_build.sh
@@ -11,24 +11,24 @@ echo "**** ENV ****"
 
 cd "$WORKSPACE"
 
-rm -rf "$WORKSPACE/repo/dotCMS/build/"
-rm -rf "$WORKSPACE/repo/dist-output"
+rm -rf "$WORKSPACE/${GIT_BRANCH_NAME}/dotCMS/build/"
+rm -rf "$WORKSPACE/${GIT_BRANCH_NAME}/dist-output"
 
-cd "$WORKSPACE/repo/dotCMS"
+cd "$WORKSPACE/${GIT_BRANCH_NAME}/dotCMS"
 
 #Cleaning up gradle cache
-rm -rf "$WORKSPACE/repo/dotCMS/.gradle/"
+rm -rf "$WORKSPACE/${GIT_BRANCH_NAME}/dotCMS/.gradle/"
 
 ./gradlew clean --no-daemon --refresh-dependencies
 ./gradlew createDist --no-daemon
 
 #VERSION=$(grep dotcms.release.version  src/main/webapp/WEB-INF/classes/release.properties | awk -F = '{ print $2 }')
-VERSION='master'
+VERSION="${GIT_BRANCH_NAME}"
 TIMESTAMP=$(date +"%Y%m%d%H%M%S")
 
 DISTRO="$JENKINS_HOME/distro"
 
-DIR="$WORKSPACE/repo/dist-output"
+DIR="$WORKSPACE/${GIT_BRANCH_NAME}/dist-output"
 
 rm -rf $DISTRO/ready/$VERSION/$TIMESTAMP
 mkdir -p $DISTRO/ready/$VERSION/$TIMESTAMP
@@ -36,13 +36,13 @@ mkdir -p $DISTRO/ready/${GIT_BRANCH#*/}
 
 if [ -f $DIR/dotcms_*.zip ]; then
 
-	echo "Distribution Created. Moving $WORKSPACE/repo/dist-output to $DISTRO/ready/$VERSION/$TIMESTAMP"
+	echo "Distribution Created. Moving $WORKSPACE/${GIT_BRANCH_NAME}/dist-output to $DISTRO/ready/$VERSION/$TIMESTAMP"
     if [ -d $DISTRO/ready/$VERSION/$TIMESTAMP ]; then
     	rm -rf $DISTRO/ready/$VERSION/$TIMESTAMP
   	fi
-    mv $DIR/dotcms_*.zip $DIR/dotcms_master.zip
-    mv $DIR/dotcms_*.tar.gz $DIR/dotcms_master.tar.gz
-	mv $WORKSPACE/repo/dist-output/* $DISTRO/ready/$VERSION/
+    mv $DIR/dotcms_*.zip $DIR/dotcms_${GIT_BRANCH_NAME}.zip
+    mv $DIR/dotcms_*.tar.gz $DIR/dotcms_${GIT_BRANCH_NAME}.tar.gz
+	mv $WORKSPACE/${GIT_BRANCH_NAME}/dist-output/* $DISTRO/ready/$VERSION/
     echo "DOTCMS_BUILD_VERSION=$VERSION" > $DISTRO/ready/${GIT_BRANCH#*/}/params
 else
 
@@ -50,7 +50,7 @@ else
 fi
 
 echo "$GIT_COMMIT" > $JENKINS_HOME/distro/ready/$VERSION/commit
-echo "master" > $JENKINS_HOME/distro/ready/$VERSION/branch
+echo "$GIT_BRANCH_NAME" > $JENKINS_HOME/distro/ready/$VERSION/branch
 
 echo "TIMESTAMP=$TIMESTAMP"
 echo "VERSION=$VERSION"
\ No newline at end of file
diff --git a/jenkins_scripts/nightly_build/master_post_build.sh b/jenkins_scripts/nightly_build/master_post_build.sh
index e055f8a..c9e310c 100644
--- a/jenkins_scripts/nightly_build/master_post_build.sh
+++ b/jenkins_scripts/nightly_build/master_post_build.sh
@@ -5,7 +5,7 @@
 trap 'echo "[$USER@$(hostname) $PWD]\$ $BASH_COMMAND"' DEBUG
 
 
-VERSION='master'
+VERSION="${GIT_BRANCH_NAME}"
 cd "$JENKINS_HOME/distro/ready/$VERSION/"
 GIT_COMMIT=$(cat commit)
 echo "latest were built for commit $GIT_COMMIT" 
diff --git a/jenkins_scripts/nightly_build/slave_post_build.sh b/jenkins_scripts/nightly_build/slave_post_build.sh
index 888adb6..875eaa8 100644
--- a/jenkins_scripts/nightly_build/slave_post_build.sh
+++ b/jenkins_scripts/nightly_build/slave_post_build.sh
@@ -8,7 +8,7 @@ trap 'echo "[$USER@$(hostname) $PWD]\$ $BASH_COMMAND"' DEBUG
 export AWS_CREDENTIAL_PROFILES_FILE=$JENKINS_HOME/credentials
 export AWS_CREDENTIAL_PRIVATE_KEY_FILE=$JENKINS_HOME/dotcms-dev-test-deploy-2017-02-0x5513.pem
 
-export VERSION='${GIT_BRANCH_NAME}'
+export VERSION="${GIT_BRANCH_NAME}"
 export TIMESTAMP=$(date +"%Y%m%d%H%M%S")