From 1050fa55462a5210efc9810ed1e01e1a35a48aea Mon Sep 17 00:00:00 2001 From: Scott Wittenburg Date: Tue, 3 Sep 2019 11:45:49 -0600 Subject: Fixes identified in ecp facilities hackathon fixes: - improve mirror git repo management - minio s3 implementation needs endpoint_url - Remove image key from rebuild-index job - Remove image, rely on tags instead --- lib/spack/spack/cmd/release_jobs.py | 3 +-- lib/spack/spack/cmd/upload_s3.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/cmd/release_jobs.py b/lib/spack/spack/cmd/release_jobs.py index 837065824a..65ba42053d 100644 --- a/lib/spack/spack/cmd/release_jobs.py +++ b/lib/spack/spack/cmd/release_jobs.py @@ -646,9 +646,8 @@ def release_jobs(parser, args): 'variables': { 'MIRROR_URL': mirror_urls[0], }, - 'image': 'scottwittenburg/spack_ci_generator_alpine', 'script': './bin/rebuild-index.sh', - 'tags': ['spack-k8s'] # may want a runner to handle this + 'tags': ['spack-post-ci'] # may want a runner to handle this } output_object['rebuild-index'] = final_job stage_names.append(final_stage) diff --git a/lib/spack/spack/cmd/upload_s3.py b/lib/spack/spack/cmd/upload_s3.py index 9013d612f8..f3be69c10d 100644 --- a/lib/spack/spack/cmd/upload_s3.py +++ b/lib/spack/spack/cmd/upload_s3.py @@ -67,7 +67,7 @@ def get_s3_session(endpoint_url): raise SpackError('boto3 module not available') session = boto3.Session() - s3 = session.resource('s3') + s3 = session.resource('s3', endpoint_url=endpoint_url) bucket_names = [] for bucket in s3.buckets.all(): -- cgit v1.2.3-70-g09d2