From cd057a858a619474c086a46c86234ad75e2d52ff Mon Sep 17 00:00:00 2001 From: Vsevolod Fedorov Date: Fri, 13 Jan 2023 13:33:19 +0300 Subject: [PATCH] Tests: Add test for nested dimention parameter usage Change-Id: I3c407b9ddfa5d2ad0c5041e2fb7953cea8935bbd --- .../nested_dimension_parameter_usage.xml | 38 +++++++++++++++++++ .../nested_dimension_parameter_usage.yaml | 24 ++++++++++++ ...nested_group_dimension_parameter_usage.xml | 38 +++++++++++++++++++ ...ested_group_dimension_parameter_usage.yaml | 30 +++++++++++++++ 4 files changed, 130 insertions(+) create mode 100644 tests/yamlparser/job_fixtures/nested_dimension_parameter_usage.xml create mode 100644 tests/yamlparser/job_fixtures/nested_dimension_parameter_usage.yaml create mode 100644 tests/yamlparser/job_fixtures/nested_group_dimension_parameter_usage.xml create mode 100644 tests/yamlparser/job_fixtures/nested_group_dimension_parameter_usage.yaml diff --git a/tests/yamlparser/job_fixtures/nested_dimension_parameter_usage.xml b/tests/yamlparser/job_fixtures/nested_dimension_parameter_usage.xml new file mode 100644 index 000000000..924006e47 --- /dev/null +++ b/tests/yamlparser/job_fixtures/nested_dimension_parameter_usage.xml @@ -0,0 +1,38 @@ + + + + <!-- Managed by Jenkins Job Builder --> + false + false + false + false + true + + + + + echo [param_1_value_1] [] + + + + + + + + + <!-- Managed by Jenkins Job Builder --> + false + false + false + false + true + + + + + echo [param_1_group_default] [param_2_value_2] + + + + + diff --git a/tests/yamlparser/job_fixtures/nested_dimension_parameter_usage.yaml b/tests/yamlparser/job_fixtures/nested_dimension_parameter_usage.yaml new file mode 100644 index 000000000..eea560c8d --- /dev/null +++ b/tests/yamlparser/job_fixtures/nested_dimension_parameter_usage.yaml @@ -0,0 +1,24 @@ +# Parameter defined at template level (param_3) should see parameters defined under project axes level. + +- builder: + name: sample_builder + builders: + - shell: 'echo {param_3}' + +- job-template: + name: job-{axis_1} + param_3: !j2: '[{{ param_1 | default("") }}] [{{ param_2 | default("") }}]' + builders: + - sample_builder: + param_3: '{param_3}' + +- project: + name: sample-project + param_1: param_1_group_default + axis_1: + - key_1: + param_1: param_1_value_1 + - key_2: + param_2: param_2_value_2 + jobs: + - job-{axis_1} diff --git a/tests/yamlparser/job_fixtures/nested_group_dimension_parameter_usage.xml b/tests/yamlparser/job_fixtures/nested_group_dimension_parameter_usage.xml new file mode 100644 index 000000000..924006e47 --- /dev/null +++ b/tests/yamlparser/job_fixtures/nested_group_dimension_parameter_usage.xml @@ -0,0 +1,38 @@ + + + + <!-- Managed by Jenkins Job Builder --> + false + false + false + false + true + + + + + echo [param_1_value_1] [] + + + + + + + + + <!-- Managed by Jenkins Job Builder --> + false + false + false + false + true + + + + + echo [param_1_group_default] [param_2_value_2] + + + + + diff --git a/tests/yamlparser/job_fixtures/nested_group_dimension_parameter_usage.yaml b/tests/yamlparser/job_fixtures/nested_group_dimension_parameter_usage.yaml new file mode 100644 index 000000000..d6ae0b427 --- /dev/null +++ b/tests/yamlparser/job_fixtures/nested_group_dimension_parameter_usage.yaml @@ -0,0 +1,30 @@ +# Parameter defined at template level (param_3) should see parameters defined under job group axes level. + +- builder: + name: sample_builder + builders: + - shell: 'echo {param_3}' + +- job-template: + name: job-{axis_1} + param_3: !j2: '[{{ param_1 | default("") }}] [{{ param_2 | default("") }}]' + builders: + - sample_builder: + param_3: '{param_3}' + +- job-group: + name: sample_group + param_1: param_1_group_default + axis_1: + - key_1: + param_1: param_1_value_1 + - key_2: + param_2: param_2_value_2 + jobs: + - job-{axis_1} + + +- project: + name: sample-project + jobs: + - sample_group