Bug 496281 - Simplify "promote build" process so cronjobs not needed on

Releng HIPP

Change-Id: Ibb7fbbadd11d7e5e3e17a316fd2ab1d14c9ffda5
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

1 files changed, 6 insertions, 26 deletions

diff --git a/production/promote-build.sh b/production/promote-build.sh
index 2e1a41bfc..1d2f62b7a 100755
--- a/production/promote-build.sh
+++ b/production/promote-build.sh
@@ -68,31 +68,15 @@ then
   EBUILDER_HASH=master
 fi
 
-# Here is content of promotion script:
-ptimestamp=$( date +%Y%m%d%H%M )
-echo "#!/usr/bin/env bash" >  ${queueLocation}/${scriptName}
-echo "# promotion script created at $ptimestamp" >>  ${queueLocation}/${scriptName}
-
-echo "${UTILITIES_HOME}/sdk/promotion/syncDropLocation.sh $STREAM $BUILD_ID $EBUILDER_HASH $BUILD_ENV_FILE" >> ${queueLocation}/${scriptName}
-
-# we restrict "others" rights for a bit more security or safety from accidents
-chmod -v ug=rwx,o-rwx ${queueLocation}/${scriptName}
-
+# Here is command for promotion:
 
+${UTILITIES_HOME}/sdk/promotion/syncDropLocation.sh $STREAM $BUILD_ID $EBUILDER_HASH $BUILD_ENV_FILE
 
 # we do not promote equinox, if BUILD_FAILED since no need.
 # we also do not promote if Patch build or Y-build or experimental (since, to date, those are not "for" equinox). 
 if [[ -z "${BUILD_FAILED}" &&  $BUILD_TYPE =~ [IMN] ]]
 then
 
-  # the cron job must know about and use this same
-  # location to look for its promotions scripts. (i.e. tight coupling)
-  promoteScriptLocationEquinox=/shared/eclipse/equinox/promotion/queue
-
-  # Directory should normally exist -- best to create with committer's ID before hand,
-  # but in case not.
-  mkdir -p "${promoteScriptLocationEquinox}"
-
   equinoxPostingDirectory="$BUILD_ROOT/siteDir/equinox/drops"
   eqFromDir=${equinoxPostingDirectory}/${BUILD_ID}
   eqToDir="/home/data/httpd/download.eclipse.org/equinox/drops/"
@@ -105,18 +89,14 @@ then
   # correct permissions, but if not, we may need to set some permissions first,
   # then use -p on rsync
 
-  # Here is content of promotion script (note, use same ptimestamp created above):
-  echo "#!/usr/bin/env bash" >  ${promoteScriptLocationEquinox}/${scriptName}
-  echo "# promotion script created at $ptimestamp" >  ${promoteScriptLocationEquinox}/${scriptName}
-  echo "rsync --times --omit-dir-times --recursive \"${eqFromDir}\" \"${eqToDir}\"" >> ${promoteScriptLocationEquinox}/${scriptName}
-
-  # we restrict "others" rights for a bit more security or safety from accidents
-  chmod -v ug=rwx,o-rwx ${promoteScriptLocationEquinox}/${scriptName}
+  # Here is promotion command
+  rsync --times --omit-dir-times --recursive "${eqFromDir}" "${eqToDir}"
 
 else
-  echo "Did not create promote script for equinox since BUILD_FAILED"
+  echo "Did not promote equinox since BUILD_FAILED"
 fi
 
 echo "normal exit from promote phase of $(basename $0)"
 
 exit 0
+