diff options
| author | Scott Wittenburg <scott.wittenburg@kitware.com> | 2019-09-03 11:45:49 -0600 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2019-09-13 22:57:15 -0700 |
| commit | 1050fa55462a5210efc9810ed1e01e1a35a48aea (patch) | |
| tree | 3bfe30bee3bbeeb5754199334c78f5d081092a6e /lib | |
| parent | 6d745a56fd1358667047d22ba183140a8ec0f5f5 (diff) | |
| download | spack-1050fa55462a5210efc9810ed1e01e1a35a48aea.tar.gz spack-1050fa55462a5210efc9810ed1e01e1a35a48aea.tar.bz2 spack-1050fa55462a5210efc9810ed1e01e1a35a48aea.tar.xz spack-1050fa55462a5210efc9810ed1e01e1a35a48aea.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/cmd/release_jobs.py | 3 | ||||
| -rw-r--r-- | lib/spack/spack/cmd/upload_s3.py | 2 |
2 files changed, 2 insertions, 3 deletions
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(): |