wait for signing log to proceed b=392969 r=cf

tools/release/Bootstrap/Step/Sign.pm

@@ -1,5 +1,5 @@
 #
-# Sign step. Applies digital signatures to builds.
+# Sign step. Wait for signed builds to appear.
 # 
 package Bootstrap::Step::Sign;
 use Bootstrap::Step;
@@ -10,25 +10,27 @@ sub Execute {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
-    my $logDir = $config->Get(sysvar => 'logDir');
+    my $rc = $config->Get(var => 'rc');
 
-    $this->Shell(
-      cmd => 'echo',
-      cmdArgs => ['sign'],
-      logFile => catfile($logDir, 'sign.log'),
-    );
+    my $signedDir = $config->GetFtpCandidateDir(bitsUnsigned => 0);
+
+    while (! -f catfile($signedDir . 'win32_signing_rc' . $rc . '.log')) {
+        sleep(10);
+    }
 }
 
-sub Verify {
+sub Verify {}
+
+sub Announce {
     my $this = shift;
 
     my $config = new Bootstrap::Config();
-    my $logDir = $config->Get(sysvar => 'logDir');
+    my $product = $config->Get(var => 'product');
+    my $version = $config->Get(var => 'version');
 
-    $this->Shell(
-      cmd => 'echo',
-      cmdArgs => ['Verify sign'],
-      logFile => catfile($logDir, 'sign_verify.log'),
+    $this->SendAnnouncement(
+      subject => "$product $version sign step finished",
+      message => "$product $version win32 builds have been signed and copied to the candidates dir.",
     );
 }
 

tools/release/README

@@ -43,9 +43,9 @@ Steps
 2) Build 
 3) Source
 4) Repack
-5) Updates
-6) Stage
-7) Sign
+5) Sign
+6) Updates
+7) Stage
    
 Details
 -----------------
@@ -62,6 +62,8 @@ Repack
   repack l10n, uses en-US build (based on tag)
   push to stage
   announce
+Sign
+  manual
 Updates
   uses patcher
   generate partials and AUS config ("snippets")
@@ -72,5 +74,3 @@ Stage
   create release directory/filename structure
   merge updates
   announce
-Sign
-  manual

tools/release/release

@@ -21,10 +21,10 @@ my @allSteps = (
     'Build',
     'Source',
     'Repack',
+    'Sign',
     'PatcherConfig',
     'Updates',
     'Stage',
-    'Sign',
 );
 
 my %config;