From 1006ed316d141285af30cadfd8f9c47c5c9051bf Mon Sep 17 00:00:00 2001 From: "kestes%walrus.com" Date: Wed, 14 Nov 2001 21:22:13 +0000 Subject: [PATCH] make the checkouts of -D be in sync with the tinderbox boxes by ensuring -D is really the start time. --- .../src/clientbin/generic.sample.buildcf | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/webtools/tinderbox2/src/clientbin/generic.sample.buildcf b/webtools/tinderbox2/src/clientbin/generic.sample.buildcf index ea0188f447a5..e74d60e5d6dc 100644 --- a/webtools/tinderbox2/src/clientbin/generic.sample.buildcf +++ b/webtools/tinderbox2/src/clientbin/generic.sample.buildcf @@ -24,8 +24,8 @@ # vairiables substituted. -# $Revision: 1.3 $ -# $Date: 2001/10/09 15:51:35 $ +# $Revision: 1.4 $ +# $Date: 2001/11/14 21:22:13 $ # $Author: kestes%walrus.com $ # $Source: /home/hwine/cvs_conversion/cvsroot/mozilla/webtools/tinderbox2/src/clientbin/generic.sample.buildcf,v $ # $Name: $ @@ -156,10 +156,16 @@ sub build_scripts { # ensure that the CVS server has time to settle down from any # large checkins which may be in progress. - my $checkout_time = time() - 5*60; + my $checkout_time = time(); my $filename_time_str = filename_time_str($checkout_time); my $cvs_time_str = cvs_time_str($checkout_time); + # we give the CVS server time to finish what ever it is doing at + # this time. + + my $sleep_minutes= 2; + my $sleep_time = $sleep_minutes*60; + my $dest_dir="$build_dir/dest"; chomp $time_stamp; my $tar_file = ( @@ -233,6 +239,7 @@ $BUILDS = { 'error_status' => "build_failed", 'dir' => "/", 'script' => [ + "sleep $sleep_time", "show_env", "rpm -qa", "rm -rf $build_dir", @@ -261,7 +268,7 @@ $BUILDS = { ], # end construct - 'test' => [ + 'smoketest' => [ { 'phase_name' => "print_environment", 'error_status' => "build_failed",