Re-do googleapis#5482 w/ fixes for 'master' and out-of-repo PR builds. (googleapis#5485)

tseaver · web-flow · commit 8b71b6d7f99c · 2018-06-13T20:10:52.000-04:00
diff --git a/test_utils/scripts/get_target_packages.py b/test_utils/scripts/get_target_packages.py
@@ -23,7 +23,13 @@
 CURRENT_DIR = os.path.realpath(os.path.dirname(__file__))
 BASE_DIR = os.path.realpath(os.path.join(CURRENT_DIR, '..', '..'))
 GITHUB_REPO = os.environ.get('GITHUB_REPO', 'google-cloud-python')
+CI = os.environ.get('CI', '')
+CI_BRANCH = os.environ.get('CIRCLE_BRANCH')
+CI_PR = os.environ.get('CIRCLE_PR_NUMBER')
 CIRCLE_TAG = os.environ.get('CIRCLE_TAG')
+MAJOR_DIV = '#' * 78
+MINOR_DIV = '#' + '-' * 77
+
 # NOTE: This reg-ex is copied from ``get_tagged_packages``.
 TAG_RE = re.compile(r"""
     ^
@@ -45,24 +51,26 @@
 def get_baseline():
     """Return the baseline commit.
 
-    On a pull request, or on a branch, return the master tip.
+    On a pull request, or on a branch, return the common parent revision
+    with the master branch.
 
     Locally, return a value pulled from environment variables, or None if
     the environment variables are not set.
 
     On a push to master, return None. This will effectively cause everything
     to be considered to be affected.
     """
-    ci_branch = os.environ.get('CIRCLE_BRANCH')
-    ci_pr = os.environ.get('CIRCLE_PR_NUMBER')
 
     # If this is a pull request or branch, return the tip for master.
     # We will test only packages which have changed since that point.
-    ci_non_master = os.environ.get('CI', '') == 'true' and any([
-        ci_branch != 'master',
-        ci_pr,
-    ])
+    ci_non_master = (CI == 'true') and any([CI_BRANCH != 'master', CI_PR])
+
     if ci_non_master:
+        if CI_PR is None and CI_BRANCH is not None:
+            output = subprocess.check_output(
+                ['git', 'merge-base', 'master', CI_BRANCH])
+            return output.strip().decode('ascii')
+
         repo_url = 'git@github.com:GoogleCloudPlatform/{}'.format(GITHUB_REPO)
         subprocess.run(['git', 'remote', 'add', 'baseline', repo_url],
                         stderr=subprocess.DEVNULL)
@@ -78,7 +86,7 @@ def get_baseline():
         return '%s/%s' % (remote, branch)
 
     # If we are not in CI and we got this far, issue a warning.
-    if not os.environ.get('CI', ''):
+    if not CI:
         warnings.warn('No baseline could be determined; this means tests '
                       'will run for every package. If this is local '
                       'development, set the $GOOGLE_CLOUD_TESTING_REMOTE '
@@ -95,6 +103,7 @@ def get_changed_files():
     """
     # Get the baseline, and fail quickly if there is no baseline.
     baseline = get_baseline()
+    print('# Baseline commit: {}'.format(baseline))
     if not baseline:
         return None
 
@@ -215,12 +224,36 @@ def get_target_packages():
     tagged_package = get_tagged_package()
     if tagged_package is None:
         file_list = get_changed_files()
+        print(MAJOR_DIV)
+        print('# Changed files:')
+        print(MINOR_DIV)
+        for file_ in file_list or ():
+            print('#  {}'.format(file_))
         for package in sorted(get_changed_packages(file_list)):
             yield package
     else:
         yield tagged_package
 
 
-if __name__ == '__main__':
-    for package in get_target_packages():
+def main():
+    print(MAJOR_DIV)
+    print('# Environment')
+    print(MINOR_DIV)
+    print('# CircleCI:        {}'.format(CI))
+    print('# CircleCI branch: {}'.format(CI_BRANCH))
+    print('# CircleCI pr:     {}'.format(CI_PR))
+    print('# CircleCI tag:    {}'.format(CIRCLE_TAG))
+    print(MAJOR_DIV)
+
+    packages = list(get_target_packages())
+
+    print(MAJOR_DIV)
+    print('# Target packages:')
+    print(MINOR_DIV)
+    for package in packages:
        print(package)
+    print(MAJOR_DIV)
+
+
+if __name__ == '__main__':
+    main()
