Travis diffing on docker branch (#3389)

* travis diffing

* fix detection of core toolset changes

* properly detect TESTLANG and TEST changes

* [ci fw Crystal/amber]

* [ci fw Crystal/amber]

* use travis provided env var for commit msg [ci fw Crystal/amber]

* revert travis env var [ci fw Crystal/amber]

* avoid travis's merge commit message [ci fw Crystal/amber]

* show file changes [ci fw Crystal/amber]

* fix bug in TESTLANG [ci fw Crystal/amber]

* [ci fw Crystal/amber JavaScript/express]

* [ci fw-only Java/gemini]

* [ci fw-only Java/gemini] make sure we're always getting last commit msg

toolset/setup/docker/languages/d-lang.dockerfile

@@ -21,7 +21,6 @@ RUN mkdir -p $DLANG && \
 # We are trying to maintain as little global presence as possible, so
 # we need to change the DFLAGS in the dmd.conf to be correctly sandboxed
 # to the $DLANG folder.
-
 RUN cp $DLANG/etc/dmd.conf $DLANG/usr/bin && \
     sed -i "s|-I/usr/|-I${DLANG}/usr/|g" $DLANG/usr/bin/dmd.conf && \
     sed -i "s|-L/usr/|-L${DLANG}/usr/|g" $DLANG/usr/bin/dmd.conf

toolset/travis/travis_diff.py

@@ -8,24 +8,39 @@
 # Notes: This script will run in python 2 and 3. print is being used instead of the logging import because
 #   travis does not echo python logging during the before_script lifecycle.
 
+# TODO: Needs to be updated to look at the new Travis test possibilities
+#       of TEST, TESTDIR, and TESTLANG. IE. Only run a single framework test
+#       in TESTLANG if it's the only one that's changed
+
 import subprocess
 import os
 import re
 from sets import Set
 
 
-# Returns a unique list of fw_depends changes
-def get_fw_depends_changes(changes_output):
+# Returns a unique list of dockerfile changes
+def get_docker_changes(changes_output):
     return list(
         Set(
-            re.findall(r"toolset/setup/linux/.+/(.+)\.sh", changes_output,
+            re.findall(r"toolset/setup/docker/.+/(.+)\.dockerfile", changes_output,
                        re.M)))
 
 
-# Returns a unique list of frameworks that have been changed
 def fw_found_in_changes(changes_output):
-    return re.search(r"" + re.escape(os.environ['TESTDIR']), changes_output,
-                     re.M)
+    if os.getenv("TESTLANG"):
+        return re.search(
+            r"frameworks/" + re.escape(os.getenv("TESTLANG")) + "/",
+            changes_output, re.M)
+    elif os.getenv("TESTDIR"):
+        return re.search(
+            r"frameworks/" + re.escape(os.getenv("TESTDIR")) + "/",
+            changes_output, re.M)
+    elif os.getenv("TEST"):
+        for test in os.getenv("TEST").split(" "):
+            if re.search(
+                  r"frameworks/.+/" + re.escape(os.getenv("TEST")) + "/",
+                  changes_output, re.M):
+                return True
 
 
 # Cleans up diffing and grep output and into an array of strings
@@ -39,43 +54,17 @@ def quit_diffing(should_test_run):
     exit(0)
 
 
-# TODO: Remove this
-quit_diffing(True)
-
-# COMMIT MESSAGES:
-# Before any complicated diffing, check for forced runs from the commit message
-last_commit_msg = subprocess.check_output(
-    ['bash', '-c', 'git log -1 --pretty=%B'])
+print("TRAVIS_COMMIT_RANGE: {!s}".format(os.getenv("TRAVIS_COMMIT_RANGE")))
+print("TRAVIS_COMMIT      : {!s}".format(os.getenv("TRAVIS_COMMIT")))
 
-# Forced *fw-only* specific tests
-if re.search(r'\[ci fw-only.+\]', last_commit_msg, re.M):
-    if re.search(r'\[ci fw-only(.?)+ ' + re.escape(os.environ['TESTDIR']) +
-                 '( .+\]|])', last_commit_msg, re.M):
-        print("This test has been forced to run from the commit message.")
-        quit_diffing(True)
-    else:
-        print("Skipping this test from the commit message.")
-        quit_diffing(False)
-# Forced full run
-if re.search(r'\[ci run-all\]', last_commit_msg, re.M):
-    print("All tests have been forced to run from the commit message.")
-    quit_diffing(True)
-# Forced framework run
-if re.search(
-        r'\[ci fw(.?)+ ' + re.escape(os.environ['TESTDIR']) + '( .+\]|\])',
-        last_commit_msg, re.M):
-    print('This test has been forced to run from the commit message.')
-    quit_diffing(True)
-
-print("TRAVIS_COMMIT_RANGE: {!s}".format(os.environ['TRAVIS_COMMIT_RANGE']))
-print("TRAVIS_COMMIT      : {!s}".format(os.environ['TRAVIS_COMMIT']))
-
-is_PR = (os.environ['TRAVIS_PULL_REQUEST'] != "false")
+is_PR = (os.getenv("TRAVIS_PULL_REQUEST") != "false")
 commit_range = ""
+first_commit = ""
+last_commit  = ""
 
 if is_PR:
     print('I am testing a pull request')
-    first_commit = os.environ['TRAVIS_COMMIT_RANGE'].split('...')[0]
+    first_commit = os.getenv("TRAVIS_COMMIT_RANGE").split('...')[0]
     last_commit = subprocess.check_output(
         "git rev-list -n 1 FETCH_HEAD^2", shell=True).rstrip('\n')
     print("Guessing that first commit in PR is : {!s}".format(first_commit))
@@ -94,12 +83,12 @@ if is_PR:
 if not is_PR:
     print('I am not testing a pull request')
     commit_range = "--first-parent -m {!s}".format(
-        os.environ['TRAVIS_COMMIT_RANGE'])
+        os.getenv("TRAVIS_COMMIT_RANGE"))
 
     # Handle 1
     if commit_range == "":
         commit_range = "--first-parent -m -1 {!s}".format(
-            os.environ['TRAVIS_COMMIT'])
+            os.getenv("TRAVIS_COMMIT"))
 
 print("Using commit range `{!s}`".format(commit_range))
 print("Running `git log --name-only --pretty=\"format:\" {!s}`".format(
@@ -109,12 +98,63 @@ changes = clean_output(
         'bash', '-c',
         'git log --name-only --pretty="format:" {!s}'.format(commit_range)
     ]))
+print("Determining what to run based on the following file changes: \n{!s}"
+      .format(changes))
+
+# COMMIT MESSAGES:
+# Before any complicated diffing, check for forced runs from the commit message
+# Use -2 because travis now inserts a merge commit as the last commit
+last_commit_msg = subprocess.check_output(
+    ["bash", "-c", "git log --format=%B -n 1 {!s}".format(last_commit)])
+print("Parsing commit message for travis commands: {!s}"
+      .format(last_commit_msg))
 
-# Satisfies this requirement:
-#   Anything in the toolset/ that isn't in the setup/linux/*/ subdirectory
-#   Any commit message that contains [ci run]
+# Forced full run
+if re.search(r'\[ci run-all\]', last_commit_msg, re.M):
+    print("All tests have been forced to run from the commit message.")
+    quit_diffing(True)
 
-if re.search(r'^toolset/(?!setup/linux/.+/)', changes, re.M) is not None:
+# TODO: Fix to work with new TEST env var
+# Forced *fw-only* specific tests
+if re.search(r'\[ci fw-only.+\]', last_commit_msg, re.M):
+    if os.getenv("TESTDIR") and re.search(
+            r'\[ci fw-only(.?)+ ' + re.escape(os.getenv("TESTDIR")) +
+            '( .+\]|])', last_commit_msg, re.M):
+        print("This test has been forced to run from the commit message.")
+        quit_diffing(True)
+    elif os.getenv("TESTLANG") and re.search(
+            r'\[ci fw-only(.?)+ ' + re.escape(os.getenv("TESTLANG")) +
+            '/', last_commit_msg, re.M):
+        print("This test has been forced to run from the commit message.")
+        quit_diffing(True)
+    else:
+        print("Skipping this test from the commit message.")
+        quit_diffing(False)
+
+# TODO: Fix to work with TESTLANG and TEST
+# Forced framework run
+if re.search(r'\[ci fw .+\]', last_commit_msg, re.M):
+    if os.getenv("TESTDIR") and re.search(
+            r'\[ci fw(.?)+ ' + re.escape(os.getenv("TESTDIR")) + '( .+\]|\])',
+            last_commit_msg, re.M):
+        print('This test has been forced to run from the commit message.')
+        quit_diffing(True)
+    elif os.getenv("TESTLANG") and re.search(
+            r'\[ci fw(.?)+ ' + re.escape(os.getenv("TESTLANG")) +
+            '/', last_commit_msg, re.M):
+        print("This test has been forced to run from the commit message.")
+        quit_diffing(True)
+
+
+# TODO: any changes in the toolset folder will generate a full run.
+#       Instead limit this to core toolset files and work on diffing
+#       docker dependencies
+# Ignore travis and docker directory changes
+# Also for now, ignore the old linux setup folders, as we don't want to
+# trigger a full run as we remove old fw_depends scripts. [ci run-all] will
+# still work if it's needed.
+
+if re.search(r'^toolset/(?!(travis/|setup/|continuous/))', changes, re.M) is not None:
     print("Found changes to core toolset. Running all tests.")
     quit_diffing(True)
 
@@ -122,21 +162,20 @@ if fw_found_in_changes(changes):
     print("Found changes that affect this framework. Running test.")
     quit_diffing(True)
 
-# Satisfies this requirement:
-#   ^toolset/setup/linux/.+/(.+)\.sh
-
 # Determine what has been changed based on initial diffing output
-fw_depends_changes = get_fw_depends_changes(changes)
+docker_changes = get_docker_changes(changes)
 
-# For each of these, find the files that depend on them, if we find more fw_depends stuff,
-# add it to the bottom of the list, if it isn't already there.
+# For each of these, find the files that depend on them, if we find more
+# docker FROM dependencies add it to the bottom of the list, if it isn't
+# already there.
 i = 0
-while i <= len(fw_depends_changes) - 1:
+while i <= len(docker_changes) - 1:
 
-    # Generates output of files that contain the fw_depends for this dependency
+    # Generates output of files that contain a FROM import for this dependency
     more_changes = subprocess.check_output([
-        'bash', '-c', 'grep -RP "fw_depends(.?)+ ' +
-        re.escape(fw_depends_changes[i]) + '( |$)" . || echo ""'
+        'bash', '-c', 'grep -RP "FROM tfb/' +
+                      re.escape(docker_changes[i].replace('.dockerfile', ''))
+                      + '(:|$)" . || echo ""'
     ])
     print("more_changes: {!s}".format(more_changes))
     if fw_found_in_changes(more_changes):
@@ -144,8 +183,8 @@ while i <= len(fw_depends_changes) - 1:
         quit_diffing(True)
 
     # Preserves the order of the list, so we can continue with this loop
-    fw_depends_changes.extend(
-        Set(get_fw_depends_changes(more_changes)) - Set(fw_depends_changes))
+    docker_changes.extend(
+        Set(get_docker_changes(more_changes)) - Set(docker_changes))
     i += 1
 
 # If we get here, there was nothing found