diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-11-16 17:33:49 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-11-22 15:03:55 +0000 |
| commit | bf8fc373d7711861129ab841a74ecf32b3d8b2dd (patch) | |
| tree | dd1b8c94a73b61f34ffcfbb8942cbb763a7bf210 /buildstream/_context.py | |
| parent | 43d3871533a41524f3537793a2a1ea1a7a3e1aed (diff) | |
| download | buildstream-sam/canonical-push-urls.tar.gz | |
Replace 'push-url' and 'pull-url' options with just 'url'sam/canonical-push-urls
This is possible now that the SSH protocol can redirect to the
appropriate pull URL.
Note that this commit makes no attempt at backwards compatibility.
Everthing will break!
Diffstat (limited to 'buildstream/_context.py')
| -rw-r--r-- | buildstream/_context.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/buildstream/_context.py b/buildstream/_context.py index 4a597524d..5fd4a428e 100644 --- a/buildstream/_context.py +++ b/buildstream/_context.py @@ -59,11 +59,8 @@ class Context(): # The local binary artifact cache directory self.artifactdir = None - # The URL from which to download prebuilt artifacts - self.artifact_pull = None - - # The URL to upload built artifacts to - self.artifact_push = None + # The URL from which to push and pull prebuilt artifacts + self.artifact_url = None # The directory to store build logs self.logdir = None @@ -163,9 +160,8 @@ class Context(): # Load artifact share configuration artifacts = _yaml.node_get(defaults, Mapping, 'artifacts') - _yaml.node_validate(artifacts, ['pull-url', 'push-url']) - self.artifact_pull = _yaml.node_get(artifacts, str, 'pull-url', default_value='') or None - self.artifact_push = _yaml.node_get(artifacts, str, 'push-url', default_value='') or None + _yaml.node_validate(artifacts, ['url']) + self.artifact_url = _yaml.node_get(artifacts, str, 'url', default_value='') or None # Load logging config logging = _yaml.node_get(defaults, Mapping, 'logging') |