diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-29 09:55:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-29 09:55:34 +0000 |
| commit | 4f77324feae72a0663441a6b47591409b4fb0396 (patch) | |
| tree | 3c30bc59f81c39c898d04a3842d34fc9223efdae /tests/yamlparser/fixtures | |
| parent | d39a3568d3f5654ac5f700b370e2a8094dc6f441 (diff) | |
| parent | 12c2ca33964ade24dc01fd8d79fa769759ba7495 (diff) | |
| download | python-jenkins-job-builder-4f77324feae72a0663441a6b47591409b4fb0396.tar.gz python-jenkins-job-builder-4f77324feae72a0663441a6b47591409b4fb0396.tar.xz python-jenkins-job-builder-4f77324feae72a0663441a6b47591409b4fb0396.zip | |
Merge "Wrapper pre-scm-buildstep: added support for failOnError parameter"
Diffstat (limited to 'tests/yamlparser/fixtures')
| -rw-r--r-- | tests/yamlparser/fixtures/complete001.yaml | 26 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/include-raw001.yaml | 22 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/include-rawunicode001.yaml | 5 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/include001.yaml | 24 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/unicode001.yaml | 7 |
5 files changed, 43 insertions, 41 deletions
diff --git a/tests/yamlparser/fixtures/complete001.yaml b/tests/yamlparser/fixtures/complete001.yaml index 519095d6..2a9ce7ec 100644 --- a/tests/yamlparser/fixtures/complete001.yaml +++ b/tests/yamlparser/fixtures/complete001.yaml @@ -11,18 +11,19 @@ name: pre-scm-shell-ant wrappers: - pre-scm-buildstep: - - shell: | - #!/bin/bash - echo "Doing somethiung cool" - - shell: | - #!/bin/zsh - echo "Doing somethin cool with zsh" - - ant: - targets: "target1 target2" - ant-name: "Standard Ant" - - inject: - properties-file: example.prop - properties-content: EXAMPLE=foo-bar + buildsteps: + - shell: | + #!/bin/bash + echo "Doing somethiung cool" + - shell: | + #!/bin/zsh + echo "Doing somethin cool with zsh" + - ant: + targets: "target1 target2" + ant-name: "Standard Ant" + - inject: + properties-file: example.prop + properties-content: EXAMPLE=foo-bar - wrapper: name: copy-files @@ -104,4 +105,3 @@ #!/usr/bin/env python # print("Doing something cool with python") - diff --git a/tests/yamlparser/fixtures/include-raw001.yaml b/tests/yamlparser/fixtures/include-raw001.yaml index bff63ccd..de5e44bb 100644 --- a/tests/yamlparser/fixtures/include-raw001.yaml +++ b/tests/yamlparser/fixtures/include-raw001.yaml @@ -12,16 +12,17 @@ name: pre-scm-shell-ant wrappers: - pre-scm-buildstep: - - shell: - !include-raw: include-raw002-cool.sh - - shell: - !include-raw: include-raw002-cool.zsh - - ant: - targets: "target1 target2" - ant-name: "Standard Ant" - - inject: - properties-file: example.prop - properties-content: EXAMPLE=foo-bar + buildsteps: + - shell: + !include-raw: include-raw002-cool.sh + - shell: + !include-raw: include-raw002-cool.zsh + - ant: + targets: "target1 target2" + ant-name: "Standard Ant" + - inject: + properties-file: example.prop + properties-content: EXAMPLE=foo-bar - wrapper: name: copy-files @@ -42,4 +43,3 @@ - inject: keep-build-variables: true keep-system-variables: true - diff --git a/tests/yamlparser/fixtures/include-rawunicode001.yaml b/tests/yamlparser/fixtures/include-rawunicode001.yaml index e1379dc6..f7472402 100644 --- a/tests/yamlparser/fixtures/include-rawunicode001.yaml +++ b/tests/yamlparser/fixtures/include-rawunicode001.yaml @@ -2,8 +2,9 @@ name: unicode-raw-include-wrapper wrappers: - pre-scm-buildstep: - - shell: - !include-raw: include-rawunicode001-cool.sh + buildsteps: + - shell: + !include-raw: include-rawunicode001-cool.sh - job: name: test-unicode-raw-include-wrapper diff --git a/tests/yamlparser/fixtures/include001.yaml b/tests/yamlparser/fixtures/include001.yaml index 8c7c3cb0..515e11a8 100644 --- a/tests/yamlparser/fixtures/include001.yaml +++ b/tests/yamlparser/fixtures/include001.yaml @@ -12,17 +12,18 @@ name: pre-scm-shell-ant wrappers: - pre-scm-buildstep: - - shell: | - #!/bin/bash - echo "Doing somethiung cool" - - shell: | - #!/bin/zsh - echo "Doing somethin cool with zsh" - - ant: "target1 target2" - ant-name: "Standard Ant" - - inject: - properties-file: example.prop - properties-content: EXAMPLE=foo-bar + buildsteps: + - shell: | + #!/bin/bash + echo "Doing somethiung cool" + - shell: | + #!/bin/zsh + echo "Doing somethin cool with zsh" + - ant: "target1 target2" + ant-name: "Standard Ant" + - inject: + properties-file: example.prop + properties-content: EXAMPLE=foo-bar - wrapper: name: copy-files @@ -43,4 +44,3 @@ - inject: keep-build-variables: true keep-system-variables: true - diff --git a/tests/yamlparser/fixtures/unicode001.yaml b/tests/yamlparser/fixtures/unicode001.yaml index a2bee163..b1e45e35 100644 --- a/tests/yamlparser/fixtures/unicode001.yaml +++ b/tests/yamlparser/fixtures/unicode001.yaml @@ -2,9 +2,10 @@ name: unicode-wrapper wrappers: - pre-scm-buildstep: - - shell: | - #!/bin/bash - echo "Unicode! ☃" + buildsteps: + - shell: | + #!/bin/bash + echo "Unicode! ☃" - job: name: test-unicode-wrapper |