From 1b7555309fc06b710477311806aab1481c364f70 Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Tue, 22 May 2018 16:06:58 +0000 Subject: Fix default value regex pattern Negative values can't be set as default values currently, for example: num-to-keep: '{num_to_keep|-1}' It will return an exception saying: 'parameter missing to format'. This should also allow other patterns as long they do not contain the closing curly bracket. Change-Id: I26dafb80b120f2c071dda6d9a27319d533b0f874 --- .../fixtures/variable_default_values.yaml | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 tests/yamlparser/fixtures/variable_default_values.yaml (limited to 'tests/yamlparser/fixtures/variable_default_values.yaml') diff --git a/tests/yamlparser/fixtures/variable_default_values.yaml b/tests/yamlparser/fixtures/variable_default_values.yaml new file mode 100644 index 00000000..94efb4ae --- /dev/null +++ b/tests/yamlparser/fixtures/variable_default_values.yaml @@ -0,0 +1,23 @@ +- project: + name: test_variable_default_values + jobs: + - 'variable_default_values': + defined_var: '7' + +- job-template: + name: 'variable_default_values' + properties: + - build-discarder: + days-to-keep: '{undefined_var|+1}' + num-to-keep: '{defined_var|+1}' + artifact-days-to-keep: '{undefined_var|-1}' + artifact-num-to-keep: '{defined_var|-1}' + builders: + - shell: | + echo "{{defined_var|+1}}" + echo "{{defined_var|-1}}" + echo "{{undefined_var|+1}}" + echo "{{undefined_var|-1}}" + + + -- cgit