From 2a8df2ced9ddf0bdf4735572f9f13469b7b746e3 Mon Sep 17 00:00:00 2001 From: Vsevolod Fedorov Date: Tue, 14 Feb 2023 11:35:56 +0300 Subject: [PATCH] Tests: Add tests for job and template using elements from defaults Change-Id: I15ecc4a4b8328ff2cf5580e439e51b022a8f6089 --- .../job_honor_default_elements.xml | 21 +++++++++++++++++++ .../job_honor_default_elements.yaml | 12 +++++++++++ .../template_honor_default_elements.xml | 21 +++++++++++++++++++ .../template_honor_default_elements.yaml | 17 +++++++++++++++ 4 files changed, 71 insertions(+) create mode 100644 tests/yamlparser/job_fixtures/job_honor_default_elements.xml create mode 100644 tests/yamlparser/job_fixtures/job_honor_default_elements.yaml create mode 100644 tests/yamlparser/job_fixtures/template_honor_default_elements.xml create mode 100644 tests/yamlparser/job_fixtures/template_honor_default_elements.yaml diff --git a/tests/yamlparser/job_fixtures/job_honor_default_elements.xml b/tests/yamlparser/job_fixtures/job_honor_default_elements.xml new file mode 100644 index 000000000..16b50b73b --- /dev/null +++ b/tests/yamlparser/job_fixtures/job_honor_default_elements.xml @@ -0,0 +1,21 @@ + + + + <!-- Managed by Jenkins Job Builder --> + false + false + false + true + true + + + + + echo hi + + + + + + + diff --git a/tests/yamlparser/job_fixtures/job_honor_default_elements.yaml b/tests/yamlparser/job_fixtures/job_honor_default_elements.yaml new file mode 100644 index 000000000..b951d80d5 --- /dev/null +++ b/tests/yamlparser/job_fixtures/job_honor_default_elements.yaml @@ -0,0 +1,12 @@ +# Job should take elements defined by defaults. + +- defaults: + name: global + concurrent: true + wrappers: + - timestamps + +- job: + name: sample-job + builders: + - shell: echo hi diff --git a/tests/yamlparser/job_fixtures/template_honor_default_elements.xml b/tests/yamlparser/job_fixtures/template_honor_default_elements.xml new file mode 100644 index 000000000..16b50b73b --- /dev/null +++ b/tests/yamlparser/job_fixtures/template_honor_default_elements.xml @@ -0,0 +1,21 @@ + + + + <!-- Managed by Jenkins Job Builder --> + false + false + false + true + true + + + + + echo hi + + + + + + + diff --git a/tests/yamlparser/job_fixtures/template_honor_default_elements.yaml b/tests/yamlparser/job_fixtures/template_honor_default_elements.yaml new file mode 100644 index 000000000..fe6da0131 --- /dev/null +++ b/tests/yamlparser/job_fixtures/template_honor_default_elements.yaml @@ -0,0 +1,17 @@ +# Template should take from defaults no just parameters, but other elements also. + +- defaults: + name: global + concurrent: true + wrappers: + - timestamps + +- job-template: + name: sample-job + builders: + - shell: echo hi + +- project: + name: sample-project + jobs: + - sample-job