travis - check started time as well

Author: Elad Aharon

.travis.yml

@@ -2,6 +2,7 @@ if: commit_message =~ test_this_on_travis
 
 env:
   global:
+    - BUILD_ID=$TRAVIS_BUILD_ID
     - SHA=$TRAVIS_PULL_REQUEST_SHA
     - PR_NUM=$TRAVIS_PULL_REQUEST
     - IS_LAST=False

travis_files/google_drive_integration.py

@@ -59,7 +59,7 @@ def download_result(self, file_id, file_name):
         else:
             sys.exit('ERROR download file: %s with id: %s' % (file_id, file_name))
 
-    def find_file_id(self, sha):
+    def find_file_id(self, sha, started_time):
         """
         Looking for the commit id in google drive
         :param sha: the commit id to look for.
@@ -71,6 +71,6 @@ def find_file_id(self, sha):
         # looking for the file with that sha(file format: pr,sha,date,passed.html)
 
         for file in files:
-            if sha in file['name']:
+            if sha in file['name'] and started_time in file['name']:
                 return file
         return False

travis_files/wait_for_results.py

@@ -1,13 +1,25 @@
 import os
 import sys
 import time
+import json
 
 from google_drive_integration import GoogleDriveService
 
+slug = "cisco-system-traffic-generator/trex-core"
+
+def get_started_time():
+    build_id = os.environ['BUILD_ID']
+    command = "curl https://api.travis-ci.org/repos/%s/builds/%s" % (slug, build_id)
+    output = os.popen(command).read()
+    build_json = json.loads(output)
+    return build_json['started_at']
+
+
 if __name__ == '__main__':
 
     last_check = os.environ['IS_LAST'] == "True"
     pr_num, sha = int(os.environ['PR_NUM']), os.environ['SHA']
+    started_time = get_started_time()
 
     gd_service = GoogleDriveService()
     total_sleep, sleeping_between_download = 45, 1  # in min
@@ -16,7 +28,7 @@
         # check if there are new results in google drive
         print('-' * 42)
         print('looking for test results for pull request number %d, sha: %s' % (pr_num, sha))
-        file_data = gd_service.find_file_id(sha)
+        file_data = gd_service.find_file_id(sha, started_time)
 
         if file_data:
             passed = file_data['name'].split(',')[3].strip('.html') == "True"  # extract the boolean from file name