src/utils/qa/weeklybld/doNewBranch.csh 1.34

Index: src/utils/qa/weeklybld/doNewBranch.csh
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/utils/qa/weeklybld/doNewBranch.csh,v
retrieving revision 1.33
retrieving revision 1.34
diff -b -B -U 1000000 -r1.33 -r1.34
--- src/utils/qa/weeklybld/doNewBranch.csh	10 Nov 2009 06:29:19 -0000	1.33
+++ src/utils/qa/weeklybld/doNewBranch.csh	10 Feb 2010 19:55:21 -0000	1.34
@@ -1,163 +1,159 @@
 #!/bin/tcsh
 #
 # WARNING: this does not like to be run with final & to detach from terminal.
 #  Heather says perhaps running with "nohup" in front of the command might
 #  make it work better.
 #
 if ( "$HOST" != "hgwbeta" ) then
  echo "Error: this script must be run from hgwbeta."
  exit 1
 endif
 
 cd $WEEKLYBLD
 
 echo "BRANCHNN=$BRANCHNN"
 echo "TODAY=$TODAY       (last build day)"
 echo "LASTWEEK=$LASTWEEK   (previous build day)"
 echo "REVIEWDAY=$REVIEWDAY   (review day, day2)"
 echo "LASTREVIEWDAY=$LASTREVIEWDAY   (previous review day, day2)"
 
 
 if ( "$TODAY" == "" ) then
  echo "TODAY undefined."
  exit 1
 endif
 if ( "$BRANCHNN" == "" ) then
  echo "BRANCHNN undefined."
  exit 1
 endif
 if ( "$LASTWEEK" == "" ) then
  echo "LASTWEEK undefined."
  exit 1
 endif
 if ( "$REVIEWDAY" == "" ) then
  echo "REVIEWDAY undefined."
  exit 1
 endif
 if ( "$LASTREVIEWDAY" == "" ) then
  echo "LASTREVIEWDAY undefined."
  exit 1
 endif
 
 if ( "$1" != "real" ) then
 	echo
 	echo "Not real.   To make real changes, put real as cmdline parm."
 	echo
 	exit 0
 endif 
 
 echo
 echo "Now beginning to build new branch $BRANCHNN [${0}: `date`]"
 
 echo
 
 #echo debug: disabled ok cleanup
 if ( -e CvsReports.ok ) then
     rm CvsReports.ok
 endif
 if (-e 32bitUtils.ok) then
     rm 32bitUtils.ok
 endif
 
 #echo debug: disabled cgiVersion
 ./updateCgiVersion.csh real
 
 if ( $status ) then
  echo "cvs-cgi-version-update failed on $HOST [${0}: `date`]"
  exit 1
 endif
 echo "cvs-cgi-version-update done on $HOST [${0}: `date`]"
 
 
 echo
 #echo debug: disabled tagging
 ./tagNewBranch.csh real
 if ( $status ) then
  echo "tagNewBranch.csh failed on $HOST [${0}: `date`]"
  exit 1
 endif
 echo "tagNewBranch.csh done on $HOST [${0}: `date`]"
 echo "new branch v$BRANCHNN created."
 
 echo
 echo
 echo  "NOW STARTING CVS-Reports ON HGWDEV IN PARALLEL [${0}: `date`]"
 echo
 rm -f doNewCvs.log
 #echo debug: disabled buildCvsReports
 ssh -n hgwdev $WEEKLYBLD/buildCvsReports.csh branch real >& doNewCvs.log &
 # note - we are now running it in the background on hgwdev
 
+echo
+echo  "NOW STARTING 32-BIT BUILD ON $BOX32 IN PARALLEL [${0}: `date`]"
+echo
+rm -f doNew32.log
+#echo debug: disabled parallel build 32bit utils on dev
+ssh -n $BOX32 "$WEEKLYBLD/doNewBranch32.csh opensesame" >& doNew32.log &
+
+
 #---------------------
 
 echo "Unpack the new branch on BUILDDIR for beta [${0}: `date`]"
 #unpack the new branch on BUILDDIR for beta
 #echo debug: disabled coBranch.csh
 ./coBranch.csh
 if ( $status ) then
     echo "Unpack the new branch on BUILDDIR for beta FAILED [${0}: `date`]"
     echo "Waiting for any other processes to finish"
     wait
     exit 1
 endif
 
+# make the utils earlier in case it affects the other make steps
+echo "Build utils on beta [${0}: `date`]"
+echo
+#echo debug: disabled build utils on beta
+./buildUtils.csh
+if ( $status ) then
+    echo "Build utils on beta FAILED [${0}: `date`]"
+    echo "Waiting for any other processes to finish"
+    wait
+    exit 1
+endif
+
 echo
 echo "Build branch sandbox on beta [${0}: `date`]"
 # build branch sandbox on beta
 #echo debug: disabled build branch sandbox on beta
 ./buildBeta.csh
 if ( $status ) then
      echo "build on beta failed for v$BRANCHNN [${0}: `date`]"
     # echo "v$BRANCHNN build on beta failed." | mail -s "'v$BRANCHNN Build failed on beta'" $USER galt browser-qa
     echo "v$BRANCHNN build on beta failed [${0}: `date`]." | mail -s "'v$BRANCHNN Build failed on beta'" $USER
     echo "Waiting for any other processes to finish"
     wait
     exit 1
 endif
 echo "build on beta done for v$BRANCHNN [${0}: `date`]"
 echo "v$BRANCHNN built successfully on beta (day 9)." | mail -s "'v$BRANCHNN Build complete on beta (day 9).'" $USER galt kent browser-qa
 
 echo
 echo "Waiting for the background beta:cvs-reports to finish [${0}: `date`]"
+echo "Waiting for the background ${BOX32}:doNewBranch32.csh to finish [${0}: `date`]"
 wait
 echo "Wait complete, checking results. [${0}: `date`]"
 if ( -e CvsReports.ok ) then
     echo "CVS Reports finished ok. [${0}: `date`]"
     echo "buildCvsReports.csh done on hgwdev, sending email... [${0}: `date`]"
     echo "Ready for pairings, day 9, CVS reports completed for v${BRANCHNN} review http://hgwdev.cse.ucsc.edu/cvs-reports/ (history at http://hgwdev.cse.ucsc.edu/cvs-reports-history/)." | mail -s "Ready for pairings (day 9, v${BRANCHNN} review)." $USER donnak kuhn
 else
     echo "CVS Reports had some error, no ok file found. [${0}: `date`]"
 endif
-
-
 echo
-echo  "NOW STARTING 32-BIT BUILD ON $BOX32 IN PARALLEL [${0}: `date`]"
-echo
-rm -f doNew32.log
-#echo debug: disabled parallel build 32bit utils on dev
-ssh -n $BOX32 "$WEEKLYBLD/doNewBranch32.csh opensesame" >& doNew32.log &
-
-
-echo "Build utils on beta [${0}: `date`]"
-echo
-#echo debug: disabled build utils on beta
-./buildUtils.csh
-if ( $status ) then
-    echo "Build utils on beta FAILED [${0}: `date`]"
-    echo "Waiting for any other processes to finish"
-    wait
-    exit 1
-endif
-
-echo
-echo "Waiting for the background ${BOX32}:doNewBranch32.csh to finish [${0}: `date`]"
-wait
-echo "Wait complete, checking results. [${0}: `date`]"
-
 if (-e 32bitUtils.ok) then
     echo "32-bit utils build finished ok. [${0}: `date`]"
 else
     echo "32-bit utils build had some error, no ok file found. [${0}: `date`]"
 endif
 
 exit 0