Merge branch '19092-upload-crunchstat_summary-to-pypi'

[arvados-dev.git] / jenkins / install-arvados-jobs-image

diff --git a/jenkins/install-arvados-jobs-image b/jenkins/install-arvados-jobs-image
index 9d1ea46818d84baaadf3414128a03b42dc8d8063..fe2f63482b79e52c84271177615430e57ea51110 100755 (executable)
--- a/jenkins/install-arvados-jobs-image
+++ b/jenkins/install-arvados-jobs-image
@@ -1,5 +1,9 @@
 #!/usr/bin/env python
 
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 from __future__ import print_function
 
 import argparse
@@ -66,15 +70,6 @@ def findormake_project_perm(arv, prefix, project_uuid):
 
 
 def findorpull_image(want_repo, want_tag, project_uuid):
-    for line in subprocess.check_output(['arv-keepdocker']).splitlines():
-        try:
-            repo, tag, image_id, collection, created = line.split(None, 4)
-        except ValueError:
-            continue
-        if repo == want_repo and tag == want_tag:
-            logger.debug('found image tag %s collection %s created %s',
-                        tag, collection, created)
-            return collection
     logger.info('pulling repo %s tag %s', want_repo, want_tag)
     subprocess.check_call([
         'arv-keepdocker',
@@ -90,7 +85,7 @@ def tag_latest(repo, tag, project_uuid):
     tag_cmd += [repo+':'+tag, repo+':latest']
     subprocess.check_call(tag_cmd)
 
-    logger.debug('arv-keepdocker %s:latest', repo, tag, repo)
+    logger.debug('arv-keepdocker %s:latest', repo)
     subprocess.check_call([
         'arv-keepdocker',
         '--project-uuid='+project_uuid,