[ARVADOS-DEV] updated: a6cdd9e8acfebd95518bb3e170a83664affd81f8

[Git user]

Summary of changes:
 jenkins/run_upload_packages.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

       via  a6cdd9e8acfebd95518bb3e170a83664affd81f8 (commit)
      from  2577bb495c060b7dd2031589c13e6b125b9eac75 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a6cdd9e8acfebd95518bb3e170a83664affd81f8
Author: Ward Vandewege <ward at curii.com>
Date:   Fri Jan 29 10:41:55 2021 -0500

    run_upload_packages.py: ignore errors writing timestamp files, but print
    out a warning. We run this script from emphemeral machines now, so the
    timestamp mechanism is not used.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py
index a161c2c..bc4f4ff 100755
--- a/jenkins/run_upload_packages.py
+++ b/jenkins/run_upload_packages.py
@@ -69,9 +69,18 @@ class TimestampFile:
             return -1
 
     def update(self):
-        os.close(os.open(self.path, os.O_CREAT | os.O_APPEND))
-        os.utime(self.path, (time.time(), self.start_time))
-
+        try:
+            os.close(os.open(self.path, os.O_CREAT | os.O_APPEND))
+            os.utime(self.path, (time.time(), self.start_time))
+        except:
+            # when the packages directory is created/populated by a build in a
+            # docker container, as root, the script that runs the upload
+            # doesn't always have permission to touch a timestamp file there.
+            # In production, we build/upload from ephemeral machines, which
+            # means that the timestamp mechanism is not used. We print a
+            # warning and move on without erroring out.
+            print("Warning: unable to update timestamp file",self.path,"permission problem?")
+            pass
 
 class PackageSuite:
     NEED_SSH = False

-----------------------------------------------------------------------


hooks/post-receive
--