From 788d34d0035093ef6dfe6a494d580d5fb2ec59d0 Mon Sep 17 00:00:00 2001
From: "Randall E. Barker" <simstorm@mac.com>
Date: Fri, 26 Jun 2020 11:56:49 -0700
Subject: [PATCH] Retry signing if it fails (#3558)

---
 tools/taskcluster/sign_apk.py | 36 ++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/tools/taskcluster/sign_apk.py b/tools/taskcluster/sign_apk.py
index d61652719..8182dd243 100644
--- a/tools/taskcluster/sign_apk.py
+++ b/tools/taskcluster/sign_apk.py
@@ -10,6 +10,7 @@
 import os
 import subprocess
 import sys
+import time
 
 v1_platforms = {
    'oculusvr3dofstore',
@@ -72,13 +73,30 @@ def main(name, argv):
       print "Target ", target
       cmd = ["curl", "-F", "input=@" + apk, "-o", target, "-H", "Authorization: " + cred, sign_url]
 
-      try:
-         print subprocess.check_output(cmd)
-      except subprocess.CalledProcessError as err:
-         cmd = ' '.join(err.cmd).replace(cred, "XXX")
-         print "Signing apk failed:", cmd
-         print "Output:", err.output
-         sys.exit(err.returncode)
+      signTryCount = 0
+      done = False
+      while not done and signTryCount < 5:
+         if signTryCount > 0:
+            print "Waiting 5 seconds before trying to sign apk again..."
+            time.sleep(5)
+         signTryCount = signTryCount + 1
+         try:
+            print subprocess.check_output(cmd)
+         except subprocess.CalledProcessError as err:
+            cleanCmd = ' '.join(err.cmd).replace(cred, "XXX")
+            print "Signing apk failed:", cleanCmd
+            print "Output:", err.output
+            continue
+         fileinfo = subprocess.check_output(['file', target])
+         if fileinfo.find("ASCII text") != -1:
+            print 'Error returned from autograph:'
+            print subprocess.check_output(['cat', target])
+         else:
+            done = True
+
+      if not done:
+         print "Failed to sign apk after multiple tries"
+         sys.exit(2)
 
       if align:
          split = os.path.splitext(target)
@@ -91,10 +109,6 @@ def main(name, argv):
          print subprocess.check_output(['apksigner', 'verify', '--verbose', target])
       except subprocess.CalledProcessError as err:
          print "Verifying apk failed"
-         fileinfo = subprocess.check_output(['file', target])
-         if fileinfo.find("ASCII text") != -1:
-            print 'Error returned from autograph:'
-            print subprocess.check_output(['cat', target])
          sys.exit(err.returncode)
       print "Archiving", target
       os.rename(target, artifacts_path + "/" + os.path.basename(target))