X-Git-Url: https://git.arvados.org/arvados-dev.git/blobdiff_plain/7c0605b156ca8fbdb857b206b342922e5e1ab055..32020479d14ba59c702088a2c9b1079ab4c522e0:/jenkins/install-arvados-jobs-image diff --git a/jenkins/install-arvados-jobs-image b/jenkins/install-arvados-jobs-image index 9d1ea46..fe2f634 100755 --- 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,