From 704f6305571376a0151a0b8414a3265bdb38766d Mon Sep 17 00:00:00 2001 From: Vsevolod Fedorov Date: Thu, 25 Jan 2024 12:12:29 +0300 Subject: [PATCH] Improve test job-and-macro-expansions Change-Id: Ib4266fcbf3bc0e05aa1fe1407a34eaedfe8195bc --- .../job_fixtures/job-and-macro-expansions.xml | 24 +++++++++---------- .../job-and-macro-expansions.yaml | 16 ++++++------- .../job-and-macro-expansions.yaml.expand.inc | 2 +- ...ob-and-macro-expansions.yaml.no-expand.inc | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/yamlparser/job_fixtures/job-and-macro-expansions.xml b/tests/yamlparser/job_fixtures/job-and-macro-expansions.xml index 612523a4d..a8413a2f3 100644 --- a/tests/yamlparser/job_fixtures/job-and-macro-expansions.xml +++ b/tests/yamlparser/job_fixtures/job-and-macro-expansions.xml @@ -12,11 +12,11 @@ - echo Should not be expanded: {param} + echo sample-job: should not be expanded: {param} - echo Should not be expanded: {param} + echo include-raw-verbatim: should not be expanded: {param} @@ -37,43 +37,43 @@ - echo Should not be expanded: {param} + echo builder-without-params: should not be expanded: {param} - echo Should not be expanded: {param} + echo include-raw-verbatim: should not be expanded: {param} - echo Should not be expanded: {param} + echo builder-with-params: should not be expanded: {param} - echo Should be expanded: sample param value + echo builder-with-params: should be expanded: sample macro param value - echo Should not be expanded: {param} + echo include-raw-verbatim: should not be expanded: {param} - echo Should be expanded: sample param value + echo include-raw-expand: should be expanded: sample macro param value - echo Should not be expanded: {param} + echo sample-job-template: should not be expanded: {param} - echo Should be expanded: sample param value + echo sample-job-template: should be expanded: sample project param value - echo Should not be expanded: {param} + echo include-raw-verbatim: should not be expanded: {param} - echo Should be expanded: sample param value + echo include-raw-expand: should be expanded: sample project param value diff --git a/tests/yamlparser/job_fixtures/job-and-macro-expansions.yaml b/tests/yamlparser/job_fixtures/job-and-macro-expansions.yaml index eea1cec4a..21f4262b7 100644 --- a/tests/yamlparser/job_fixtures/job-and-macro-expansions.yaml +++ b/tests/yamlparser/job_fixtures/job-and-macro-expansions.yaml @@ -9,16 +9,16 @@ name: builder-without-params builders: - shell: | - echo Should not be expanded: {{param}} + echo builder-without-params: should not be expanded: {{param}} - shell: !include-raw-verbatim: job-and-macro-expansions.yaml.no-expand.inc - builder: name: builder-with-params builders: - shell: | - echo Should not be expanded: {{param}} + echo builder-with-params: should not be expanded: {{param}} - shell: | - echo Should be expanded: {param} + echo builder-with-params: should be expanded: {param} - shell: !include-raw-verbatim: job-and-macro-expansions.yaml.no-expand.inc - shell: !include-raw-expand: job-and-macro-expansions.yaml.expand.inc @@ -27,7 +27,7 @@ display-name: sample-job builders: - shell: | - echo Should not be expanded: {{param}} + echo sample-job: should not be expanded: {{param}} - shell: !include-raw-verbatim: job-and-macro-expansions.yaml.no-expand.inc - job-template: @@ -36,16 +36,16 @@ builders: - builder-without-params - builder-with-params: - param: sample param value + param: sample macro param value - shell: | - echo Should not be expanded: {{param}} + echo sample-job-template: should not be expanded: {{param}} - shell: | - echo Should be expanded: {param} + echo sample-job-template: should be expanded: {param} - shell: !include-raw-verbatim: job-and-macro-expansions.yaml.no-expand.inc - shell: !include-raw-expand: job-and-macro-expansions.yaml.expand.inc - project: name: sample-project - param: sample param value + param: sample project param value jobs: - sample-job-template diff --git a/tests/yamlparser/job_fixtures/job-and-macro-expansions.yaml.expand.inc b/tests/yamlparser/job_fixtures/job-and-macro-expansions.yaml.expand.inc index 24a08d1c7..4f618042a 100644 --- a/tests/yamlparser/job_fixtures/job-and-macro-expansions.yaml.expand.inc +++ b/tests/yamlparser/job_fixtures/job-and-macro-expansions.yaml.expand.inc @@ -1 +1 @@ -echo Should be expanded: {param} +echo include-raw-expand: should be expanded: {param} diff --git a/tests/yamlparser/job_fixtures/job-and-macro-expansions.yaml.no-expand.inc b/tests/yamlparser/job_fixtures/job-and-macro-expansions.yaml.no-expand.inc index 077ccc23d..9f9c4802f 100644 --- a/tests/yamlparser/job_fixtures/job-and-macro-expansions.yaml.no-expand.inc +++ b/tests/yamlparser/job_fixtures/job-and-macro-expansions.yaml.no-expand.inc @@ -1 +1 @@ -echo Should not be expanded: {param} +echo include-raw-verbatim: should not be expanded: {param}