diff options
author | Lars Wirzenius <liw@liw.fi> | 2018-01-27 16:55:23 +0200 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2018-01-27 17:11:18 +0200 |
commit | e5d6178773b68e421b3c91e1ccfd04fd965f0fc5 (patch) | |
tree | 3ad7fea865499b036fa805fb8247cbb6834ce142 | |
parent | cc4d4552fffb9b6facad43cfc5a852b243b29f8b (diff) | |
download | ick2-e5d6178773b68e421b3c91e1ccfd04fd965f0fc5.tar.gz |
Change: get debootstrap suite from debian_codename parameter
-rw-r--r-- | NEWS | 5 | ||||
-rwxr-xr-x | worker_manager | 8 |
2 files changed, 12 insertions, 1 deletions
@@ -27,6 +27,11 @@ Version 0.23+git, not yet released * The `debootstrap` action now defaults to using the `deb.debian.org` mirror, if the action doesn't specify one. +* The `debootstrap` action now accepts a suite value of `auto`, which + makes it get the suite name from the `debian_codename` pipeline + parameter. The old behaviour of having the suite name as an argument + to the `debootstrap` field in the action still works. + Version 0.23, released 2018-01-22 ---------------------------------- diff --git a/worker_manager b/worker_manager index 4e805e7..4534bb4 100755 --- a/worker_manager +++ b/worker_manager @@ -450,10 +450,16 @@ class DebootstrapWorker(WorkerBase): def get_argv(self, work, params_text): step = work['step'] + params = work.get('parameters', {}) + if step['debootstrap'] == 'auto': + suite = params['debian_codename'] + else: + suite = step['debootstrap'] + return [ 'sudo', 'debootstrap', - step['debootstrap'], + suite, '.', step.get('mirror', 'http://deb.debian.org/debian'), ] |