summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS5
-rwxr-xr-xworker_manager8
2 files changed, 12 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 16efc7f..252b256 100644
--- a/NEWS
+++ b/NEWS
@@ -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'),
]