Bug 560230 - Create build id using New York time in JIRO

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

5 files changed, 10 insertions, 10 deletions

diff --git a/cje-production/cleaners/cleanupEquinox.sh b/cje-production/cleaners/cleanupEquinox.sh
index 0eb056a90..38d500f5d 100755
--- a/cje-production/cleaners/cleanupEquinox.sh
+++ b/cje-production/cleaners/cleanupEquinox.sh
@@ -34,6 +34,6 @@ clean() {
 }
 
 
-echo -e "\n\tCurrent date: $(date +%Y\ %m%d\ %H:%M)"
+echo -e "\n\tCurrent date: $(TZ="America/New_York" date +%Y\ %m%d\ %H:%M)"
 echo -e "\tRemoving drops from downloads server at ${equinoxBuilds}\n"
 clean $equinoxBuilds I
diff --git a/cje-production/cleaners/cleanupNightlyRepo.sh b/cje-production/cleaners/cleanupNightlyRepo.sh
index 45cae134f..ea6d6574d 100755
--- a/cje-production/cleaners/cleanupNightlyRepo.sh
+++ b/cje-production/cleaners/cleanupNightlyRepo.sh
@@ -144,7 +144,7 @@ function cleanRepo ()
   # To allow this cron job to work from hudson, or traditional crontab
   devWorkspace=${workspace}/workspace-cleanup
 
-  echo -e "\tDEBUG: Cleaning repository ${eclipseRepo} on $HOSTNAME on $(date ) " >&2
+  echo -e "\tDEBUG: Cleaning repository ${eclipseRepo} on $HOSTNAME on $(TZ="America/New_York" date ) " >&2
   getReposToRemove "${eclipseRepo}" $buildType $nRetain
   RC=$?
   if [[ $RC == 0 ]]
diff --git a/cje-production/cleaners/dailyCleanDownloads.sh b/cje-production/cleaners/dailyCleanDownloads.sh
index 049be6180..edc091f57 100755
--- a/cje-production/cleaners/dailyCleanDownloads.sh
+++ b/cje-production/cleaners/dailyCleanDownloads.sh
@@ -14,7 +14,7 @@
 #*******************************************************************************
 
 # Utility to clean build machine
-echo -e "\n\tDaily clean of ${HOSTNAME} download server on $(date )\n"
+echo -e "\n\tDaily clean of ${HOSTNAME} download server on $(TZ="America/New_York" date )\n"
 
 #
 # Checks whether a build can be retained or not.
@@ -88,8 +88,8 @@ for buildname in ${allOldBuilds}; do
     mm=$(echo $buildId|cut -b6-7)  #extract month
     dd=$(echo $buildId|cut -b8-9)  #extract day
     day=${mm}/${dd}/${yy}          #construct build date
-    dayOfWeek=$(date -d $day +%u)  #get the day of the week like monday, tue, etc
-    weekNum=$(date -d $day +%U)    #get the week number from start of the year
+    dayOfWeek=$(TZ="America/New_York" date -d $day +%u)  #get the day of the week like monday, tue, etc
+    weekNum=$(TZ="America/New_York" date -d $day +%U)    #get the week number from start of the year
 
     #special case for Sunday. unix considers sunday as the start of the week. but for us we need to consider
     #monday as start of the week. For this purpose we subtract 1 to place the build in previous week
diff --git a/cje-production/mbscripts/mb010_createEnvfiles.sh b/cje-production/mbscripts/mb010_createEnvfiles.sh
index 530d4e531..505fcb16b 100755
--- a/cje-production/mbscripts/mb010_createEnvfiles.sh
+++ b/cje-production/mbscripts/mb010_createEnvfiles.sh
@@ -44,12 +44,12 @@ echo "<?php " > $BUILD_ENV_FILE_PHP
 
 # We set RAWDATE first thing here to make the "start of build" timestamp more accurate.
 # Note that a roundup is added to compensate the occasional delay.
-RAWDATE=$(date +%s)
+RAWDATE=$(TZ="America/New_York" date +%s)
 REMAINDER=$((RAWDATE % 600))
 RAWDATE_TRUNC=$((RAWDATE - REMAINDER))
 export RAWDATE
-fn-addToPropFiles TIMESTAMP "\"$(date +%Y%m%d-%H%M --date='@'$RAWDATE_TRUNC)\""
-fn-addToPropFiles BUILD_PRETTY_DATE "\"$(date --date='@'$RAWDATE_TRUNC)\""
+fn-addToPropFiles TIMESTAMP "\"$(TZ="America/New_York" date +%Y%m%d-%H%M --date='@'$RAWDATE_TRUNC)\""
+fn-addToPropFiles BUILD_PRETTY_DATE "\"$(TZ="America/New_York" date --date='@'$RAWDATE_TRUNC)\""
 
 while read propLine
 do
diff --git a/cje-production/mbscripts/mb110_tagBuildInputs.sh b/cje-production/mbscripts/mb110_tagBuildInputs.sh
index 25d56c308..db6de9cc7 100755
--- a/cje-production/mbscripts/mb110_tagBuildInputs.sh
+++ b/cje-production/mbscripts/mb110_tagBuildInputs.sh
@@ -23,8 +23,8 @@ fi
 source $CJE_ROOT/scripts/common-functions.shsource
 source $1
 
-reportDate=$(date +%s)
-reportTimestamp=$(date +%Y%m%d-%H%M --date='@'$reportDate)
+reportDate=$(TZ="America/New_York" date +%s)
+reportTimestamp=$(TZ="America/New_York" date +%Y%m%d-%H%M --date='@'$reportDate)
 gitLogFile=$CJE_ROOT/$DROP_DIR/$BUILD_ID/gitLog.html
 mkdir -p $CJE_ROOT/$DROP_DIR/$BUILD_ID