commit b31ce941fda716e8e8d890f19fc57cbff0ef9de2
author Haibo Huang <hhb@google.com> Thu Feb 04 01:10:39 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 04 01:10:39 2021 +0000
tree 7e16105cf7249c8c0a1726beea3d2ed18c4e9594
parent c17c26ef3beb0118dcaaebae4cb5e1561c063742
parent a911fa772f79558380a52872de53b38dc8cb1756

[kokoro python] Fix log package am: a911fa772f

Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/1573921

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9997c38694eb4f21bbccf3c5d5402a73c2255c6d

kokoro/build.py

diff --git a/kokoro/build.py b/kokoro/build.py
index d50c109..7c448a5 100755
--- a/kokoro/build.py
+++ b/kokoro/build.py
@@ -5,6 +5,7 @@
 import os
 import subprocess
 import sys
+import tarfile
 
 @enum.unique
 class Host(enum.Enum):
@@ -23,14 +24,13 @@
         raise RuntimeError('Unsupported host: {}'.format(sys.platform))
 
 
-def build_autoconf_target(host, python_src, out_dir):
+def build_autoconf_target(host, python_src, build_dir, install_dir):
     print('## Building Python ##')
-    print('## Out Dir     : {}'.format(out_dir))
+    print('## Build Dir   : {}'.format(build_dir))
+    print('## Install Dir : {}'.format(install_dir))
     print('## Python Src  : {}'.format(python_src))
     sys.stdout.flush()
 
-    build_dir = os.path.join(out_dir, 'build')
-    install_dir = os.path.join(out_dir, 'install')
     os.makedirs(build_dir, exist_ok=True)
     os.makedirs(install_dir, exist_ok=True)
 
@@ -134,7 +134,9 @@
 
 
 def package_logs(out_dir, dest_dir):
-    import tarfile
+    os.makedirs(dest_dir, exist_ok=True)
+    print('## Packaging Logs ##')
+    sys.stdout.flush()
     with tarfile.open(os.path.join(dest_dir, "logs.tar.bz2"), "w:bz2") as tar:
         tar.add(os.path.join(out_dir, 'config.log'), arcname='config.log')
 
@@ -146,8 +148,11 @@
     build_id = argv[4]
     host = get_default_host()
 
+    build_dir = os.path.join(out_dir, 'build')
+    install_dir = os.path.join(out_dir, 'install')
+
     try:
-        build_dir, install_dir = build_autoconf_target(host, python_src, out_dir)
+        build_autoconf_target(host, python_src, build_dir, install_dir)
         package_target(host, install_dir, dest_dir, build_id)
     except:
         # Keep logs before exit.