Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 291167, tindebox back-end for pushing hourly builds to a dated directory, r=bhearsum

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@251554 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nrthomas%gmail.com 2008-05-12 18:05:15 +00:00
parent 95324f384a
commit 48af65d914
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/tools/tinderbox/build-seamonkey-util.pl
View File

@ -24,7 +24,7 @@ use Config; # for $Config{sig_name} and $Config{sig_num}
use File::Find ();
use File::Copy;
$::UtilsVersion = '$Revision: 1.388 $ ';
$::UtilsVersion = '$Revision: 1.389 $ ';
package TinderUtils;
@ -1281,7 +1281,8 @@ sub BuildIt {
#
if (((-e $external_build) and ($build_status eq 'success')) ||
($Settings::SkipMozilla)) {
($build_status, $binary_url) = PostMozilla::main($build_dir);
($build_status, $binary_url) =
PostMozilla::main($build_dir, $start_time);
}
# run_shell_command "rsync -av --delete $Settings::TopsrcdirFull/ $Settings::TopsrcdirLast";

18
mozilla/tools/tinderbox/post-mozilla-rel.pl
View File

@ -1035,6 +1035,7 @@ sub pushit {
my $store_path = $args{'store_path'};
my $store_path_packages = $args{'store_path_packages'};
my $cachebuild = $args{'cachebuild'};
my $start_time = $args{'start_time'};
my $upload_directory = $store_path . "/" . $store_path_packages;
@ -1081,18 +1082,25 @@ sub pushit {
# updated post-mozilla-rel.pl from CVS.
#
# Note that we traverse this code for "hourlies" as well as nightlies/clobbers
# $package_name, and hence $short_ud, will be (eg) "fx-linux-tbox-trunk" and
# "2007-09-27-04-trunk" respectively.
# $package_name, and hence $short_ud, would be (eg)
# "fx-linux-tbox-trunk/1202546936" if DependToDated is set,
# "fx-linux-tbox-trunk/" otherwise, and "2008-02-09-00-trunk" for clobbers.
$Settings::ReleaseToDated = 1 if !defined($Settings::ReleaseToDated);
$Settings::ReleaseToLatest = 1 if !defined($Settings::ReleaseToLatest);
my $complete_remote_path;
if ( $Settings::ReleaseToDated ) {
my $datedir = '';
if( $cachebuild && ($short_ud =~ /^(\d{4})-(\d{2}).*/) ) {
$datedir = "$1/$2/";
$complete_remote_path = $remote_path . "/" . $datedir . $short_ud;
} elsif (! $cachebuild && $Settings::DependToDated) {
$datedir = $start_time;
$complete_remote_path = $remote_path . "/" . $short_ud . "/" . $datedir;
} else {
$complete_remote_path = $remote_path . "/" . $short_ud;
}
my $complete_remote_path = "$remote_path/" . $datedir . "$short_ud";
my $makedirs = $complete_remote_path;
if ($cachebuild && $Settings::ReleaseToLatest) {
$makedirs .= " $remote_path/latest-$Settings::milestone";
@ -1318,7 +1326,7 @@ sub unix2dos {
sub main {
# Get build directory from caller.
my ($mozilla_build_dir) = @_;
my ($mozilla_build_dir, $server_start_time) = @_;
TinderUtils::print_log("Post-Build packaging/uploading commencing.\n");
chdir $mozilla_build_dir;
@ -1486,7 +1494,7 @@ sub main {
}
unless (pushit(server => $Settings::ssh_server, remote_path => $ftp_path, package_name => $package_dir,
store_path => $store_home, store_path_packages => "packages", cachebuild => $cachebuild)) {
store_path => $store_home, store_path_packages => "packages", cachebuild => $cachebuild, start_time => $server_start_time)) {
cleanup();
return returnStatus("Pushing package $local_build_dir failed", ("testfailed"));
}

1
mozilla/tools/tinderbox/tinder-defaults.pl
View File

@ -233,6 +233,7 @@ $LocaleProduct = "browser";
$shiptalkback = 1;
$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
$DependToDated = 0; # Push the hourly to <host>-<milestone>/<build_start_time>?
$OfficialBuildMachinery = 1; # Allow official clobber nightlies. When false, $cachebuild in post-mozilla-rel.pl can never be true.
$ReleaseGroup = ''; # group to set uploaded files to (if non-empty)
$build_hour = "8";