Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

bug 717106: Release automation for ESR. r=rail

  • Loading branch information...
commit 9e42395a5bd8fbf6b1ef2985b816b41c789e2c53 1 parent 28fa347
authored February 07, 2012
2  release/patcher-config-bump.pl
@@ -267,6 +267,7 @@ sub BumpPatcherConfig {
267 267
      'http://' . $stagingServer. '/pub/mozilla.org/' . $product . 
268 268
      '/nightly/' .  $version . '-candidates/' . $buildStr . '/' .
269 269
      $pBetatestPath;
  270
+    $partialUpdate->{'esrtest-url'} = $partialUpdate->{'betatest-url'};
270 271
 
271 272
     if ($useBetaChannel) {
272 273
       my $pBetaPath;
@@ -326,6 +327,7 @@ sub BumpPatcherConfig {
326 327
      'http://' . $stagingServer . '/pub/mozilla.org/' . $product . 
327 328
      '/nightly/' .  $version . '-candidates/' . $buildStr . '/' .
328 329
      $cBetatestPath;
  330
+    $completeUpdate->{'esrtest-url'} = $completeUpdate->{'betatest-url'};
329 331
 
330 332
     if ($useBetaChannel) {
331 333
        my $cBetaPath;
7  release/update-verify-bump.pl
@@ -289,13 +289,18 @@ sub BumpVerifyConfig {
289 289
     close(FILE) or die ("Could not close file $configFile: $!");
290 290
 
291 291
     my @strippedFile = ();
  292
+    # If the file is already bumped for this version, undo it, so we can do it
  293
+    # again.
292 294
     if ($origFile[0] =~ $oldVersion) {
293 295
             print "verifyConfig $configFile already bumped\n";
294 296
             print "removing previous config..\n";
295 297
             # remove top two lines; the comment and the version config
296 298
             splice(@origFile, 0, 2);
297 299
             @strippedFile = @origFile;
298  
-    } else {
  300
+    # If the file isn't bumped for this version, we split out the current
  301
+    # "full" check into a small "full" and other "quick" checks. We check
  302
+    # for emptiness because this will be empty for new update verify configs.
  303
+    } elsif ($origFile[1] !~ /^\s*$/) {
299 304
         # convert existing full check to a full check for top N locales,
300 305
         # and quick check for everything else
301 306
         my $versionComment = $origFile[0];
0  release/updates/mozEsr10-firefox-linux.cfg
No changes.
0  release/updates/mozEsr10-firefox-linux64.cfg
No changes.
0  release/updates/mozEsr10-firefox-mac64.cfg
No changes.
0  release/updates/mozEsr10-firefox-win32.cfg
No changes.

0 notes on commit 9e42395

Please sign in to comment.
Something went wrong with that request. Please try again.