From ffbb0c722a0476f2f71e2e4ba8c4184a643facf5 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 14 Mar 2018 08:31:43 -0400 Subject: [PATCH] all builders in postbuildscript require a list now (defined with build-step) Signed-off-by: Alfredo Deza --- .../definitions/ceph-ansible-nightly.yml | 9 ++--- .../config/definitions/ceph-ansible-prs.yml | 35 ++++++++++--------- .../definitions/ceph-ansible-scenario.yml | 9 ++--- ceph-build/config/definitions/ceph-build.yml | 9 ++--- .../definitions/ceph-container-nightly.yml | 3 +- .../config/definitions/ceph-container-prs.yml | 3 +- .../config/definitions/ceph-dev-build.yml | 13 +++---- .../config/definitions/ceph-dev-new-build.yml | 13 +++---- .../config/definitions/ceph-dev-new-setup.yml | 9 ++--- .../config/definitions/ceph-pull-requests.yml | 3 +- ceph-setup/config/definitions/ceph-setup.yml | 9 ++--- .../config/definitions/ceph-volume-pr.yml | 9 ++--- .../definitions/ceph-volume-nightly.yml | 9 ++--- .../config/definitions/ceph-volume-pr.yml | 9 ++--- .../definitions/ceph-volume-scenario.yml | 9 ++--- .../config/definitions/jjb.yml | 3 +- .../config/definitions/nfs-ganesha-stable.yml | 15 ++++---- samba/config/definitions/samba.yml | 3 +- .../config/definitions/sepia-fog-images.yml | 7 ++-- 19 files changed, 100 insertions(+), 79 deletions(-) diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml index a12b54705..bfc8e111f 100644 --- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml +++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml @@ -147,10 +147,11 @@ script-only-if-succeeded: False script-only-if-failed: True builders: - - shell: - !include-raw-escape: - - ../../../scripts/build_utils.sh - - ../../build/teardown + - build-steps: + - shell: + !include-raw-escape: + - ../../../scripts/build_utils.sh + - ../../build/teardown - archive: artifacts: 'logs/**' diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml index 2cf8cfdaf..d9a99f7bd 100644 --- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml +++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml @@ -162,10 +162,11 @@ script-only-if-succeeded: False script-only-if-failed: True builders: - - shell: - !include-raw-escape: - - ../../../scripts/build_utils.sh - - ../../build/teardown + - build-steps: + - shell: + !include-raw-escape: + - ../../../scripts/build_utils.sh + - ../../build/teardown - archive: artifacts: 'logs/**' @@ -187,10 +188,10 @@ - github: url: https://github.com/ceph/ceph-ansible - build-discarder: - days-to-keep: 90 - num-to-keep: -1 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 + days-to-keep: 90 + num-to-keep: -1 + artifact-days-to-keep: -1 + artifact-num-to-keep: -1 parameters: - string: @@ -241,10 +242,11 @@ script-only-if-succeeded: False script-only-if-failed: True builders: - - shell: - !include-raw-escape: - - ../../../scripts/build_utils.sh - - ../../build/teardown + - build-steps: + - shell: + !include-raw-escape: + - ../../../scripts/build_utils.sh + - ../../build/teardown - archive: artifacts: 'logs/**' @@ -320,10 +322,11 @@ script-only-if-succeeded: False script-only-if-failed: True builders: - - shell: - !include-raw-escape: - - ../../../scripts/build_utils.sh - - ../../build/teardown + - build-steps: + - shell: + !include-raw-escape: + - ../../../scripts/build_utils.sh + - ../../build/teardown - archive: artifacts: 'logs/**' diff --git a/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml b/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml index 1bbc4b34f..973566459 100644 --- a/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml +++ b/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml @@ -57,10 +57,11 @@ script-only-if-succeeded: False script-only-if-failed: True builders: - - shell: - !include-raw: - - ../../../scripts/build_utils.sh - - ../../build/teardown + - build-steps: + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/teardown - archive: artifacts: 'logs/**' diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml index 48c0d06df..b51fbf0b5 100644 --- a/ceph-build/config/definitions/ceph-build.yml +++ b/ceph-build/config/definitions/ceph-build.yml @@ -83,10 +83,11 @@ script-only-if-failed: True script-only-if-succeeded: False builders: - - inject: - properties-file: ${WORKSPACE}/build_info - - shell: - !include-raw: + - build-steps: + - inject: + properties-file: ${WORKSPACE}/build_info + - shell: + !include-raw: - ../../../scripts/build_utils.sh - ../../build/failure diff --git a/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml b/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml index 75686e9a8..a88e9b3a2 100644 --- a/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml +++ b/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml @@ -66,4 +66,5 @@ script-only-if-succeeded: False script-only-if-failed: True builders: - - shell: !include-raw ../../build/teardown + - build-steps: + - shell: !include-raw ../../build/teardown diff --git a/ceph-container-prs/config/definitions/ceph-container-prs.yml b/ceph-container-prs/config/definitions/ceph-container-prs.yml index 9043e0363..ff95a5731 100644 --- a/ceph-container-prs/config/definitions/ceph-container-prs.yml +++ b/ceph-container-prs/config/definitions/ceph-container-prs.yml @@ -83,4 +83,5 @@ script-only-if-succeeded: False script-only-if-failed: True builders: - - shell: !include-raw ../../build/teardown + - build-steps: + - shell: !include-raw ../../build/teardown diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml index 00694c1a3..486a14332 100644 --- a/ceph-dev-build/config/definitions/ceph-dev-build.yml +++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml @@ -91,12 +91,13 @@ script-only-if-failed: True script-only-if-succeeded: False builders: - - inject: - properties-file: ${WORKSPACE}/build_info - - shell: - !include-raw: - - ../../../scripts/build_utils.sh - - ../../build/failure + - build-steps: + - inject: + properties-file: ${WORKSPACE}/build_info + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/failure wrappers: - inject-passwords: diff --git a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml index ce3890ae8..44ed9f5ce 100644 --- a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml +++ b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml @@ -91,12 +91,13 @@ script-only-if-failed: True script-only-if-succeeded: False builders: - - inject: - properties-file: ${WORKSPACE}/build_info - - shell: - !include-raw: - - ../../../scripts/build_utils.sh - - ../../build/failure + - build-steps: + - inject: + properties-file: ${WORKSPACE}/build_info + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/failure wrappers: - inject-passwords: diff --git a/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml b/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml index 18c7832e5..19945e99c 100644 --- a/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml +++ b/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml @@ -48,10 +48,11 @@ script-only-if-failed: True script-only-if-succeeded: False builders: - - shell: - !include-raw: - - ../../../scripts/build_utils.sh - - ../../build/failure + - build-steps: + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/failure wrappers: - inject-passwords: diff --git a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml index edc20ff1c..8135a7441 100644 --- a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml +++ b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml @@ -58,4 +58,5 @@ script-only-if-succeeded: False script-only-if-failed: True builders: - - shell: "sudo reboot" + - build-steps: + - shell: "sudo reboot" diff --git a/ceph-setup/config/definitions/ceph-setup.yml b/ceph-setup/config/definitions/ceph-setup.yml index 95935293d..48171cbbf 100644 --- a/ceph-setup/config/definitions/ceph-setup.yml +++ b/ceph-setup/config/definitions/ceph-setup.yml @@ -48,10 +48,11 @@ script-only-if-failed: True script-only-if-succeeded: False builders: - - shell: - !include-raw: - - ../../../scripts/build_utils.sh - - ../../build/failure + - build-steps: + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/failure wrappers: - inject-passwords: diff --git a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml index ca71a7669..95ba0b950 100644 --- a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml +++ b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml @@ -121,10 +121,11 @@ script-only-if-succeeded: False script-only-if-failed: True builders: - - shell: - !include-raw-escape: - - ../../../scripts/build_utils.sh - - ../../build/teardown + - build-steps: + - shell: + !include-raw-escape: + - ../../../scripts/build_utils.sh + - ../../build/teardown - archive: artifacts: 'logs/**' diff --git a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml index 861e1d3f0..4f0931ccc 100644 --- a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml +++ b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml @@ -93,10 +93,11 @@ script-only-if-succeeded: False script-only-if-failed: True builders: - - shell: - !include-raw-escape: - - ../../../scripts/build_utils.sh - - ../../build/teardown + - build-steps: + - shell: + !include-raw-escape: + - ../../../scripts/build_utils.sh + - ../../build/teardown - archive: artifacts: 'logs/**' diff --git a/ceph-volume-pr/config/definitions/ceph-volume-pr.yml b/ceph-volume-pr/config/definitions/ceph-volume-pr.yml index e3c5a9ce4..8cb37e8a3 100644 --- a/ceph-volume-pr/config/definitions/ceph-volume-pr.yml +++ b/ceph-volume-pr/config/definitions/ceph-volume-pr.yml @@ -76,7 +76,8 @@ script-only-if-succeeded: False script-only-if-failed: True builders: - - shell: - !include-raw-escape: - - ../../../scripts/build_utils.sh - - ../../build/teardown + - build-steps: + - shell: + !include-raw-escape: + - ../../../scripts/build_utils.sh + - ../../build/teardown diff --git a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml index aba0341ef..ffd5994ac 100644 --- a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml +++ b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml @@ -61,10 +61,11 @@ script-only-if-succeeded: False script-only-if-failed: True builders: - - shell: - !include-raw: - - ../../../scripts/build_utils.sh - - ../../build/teardown + - build-steps: + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/teardown - archive: artifacts: 'logs/**' diff --git a/jenkins-job-builder/config/definitions/jjb.yml b/jenkins-job-builder/config/definitions/jjb.yml index b269c2f96..ca0edd8d8 100644 --- a/jenkins-job-builder/config/definitions/jjb.yml +++ b/jenkins-job-builder/config/definitions/jjb.yml @@ -47,6 +47,7 @@ If this is checked, JJB will wipe out its cache and force each job to align with publishers: - postbuildscript: builders: - - shell: 'rm $HOME/.jenkins_jobs.*.ini' + - build-steps: + - shell: 'rm $HOME/.jenkins_jobs.*.ini' script-only-if-succeeded: false script-only-if-failed: false diff --git a/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml b/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml index 4acc442bb..7226d86f8 100644 --- a/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml +++ b/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml @@ -169,14 +169,15 @@ If this is checked, then the binaries will be built and pushed to chacra even if publishers: - postbuildscript: script-only-if-failed: True - script-only-if-succeeded: False + script-only-if-succeeded: False builders: - - inject: - properties-file: ${WORKSPACE}/build_info - - shell: - !include-raw: - - ../../../scripts/build_utils.sh - - ../../build/failure + - build-steps: + - inject: + properties-file: ${WORKSPACE}/build_info + - shell: + !include-raw: + - ../../../scripts/build_utils.sh + - ../../build/failure wrappers: - inject-passwords: diff --git a/samba/config/definitions/samba.yml b/samba/config/definitions/samba.yml index 29775b44f..8cb399fe2 100644 --- a/samba/config/definitions/samba.yml +++ b/samba/config/definitions/samba.yml @@ -116,4 +116,5 @@ If this is checked, then the binaries will be built and pushed to chacra even if script-only-if-succeeded: False script-only-if-failed: False builders: - - shell: "sudo rm -f /etc/apt/sources.list.d/shaman.list /etc/yum.repos.d/shaman.repo" + - build-steps: + - shell: "sudo rm -f /etc/apt/sources.list.d/shaman.list /etc/yum.repos.d/shaman.repo" diff --git a/sepia-fog-images/config/definitions/sepia-fog-images.yml b/sepia-fog-images/config/definitions/sepia-fog-images.yml index 115c96dd9..8ad277863 100644 --- a/sepia-fog-images/config/definitions/sepia-fog-images.yml +++ b/sepia-fog-images/config/definitions/sepia-fog-images.yml @@ -35,9 +35,10 @@ script-only-if-failed: True script-only-if-succeeded: False builders: - - shell: - !include-raw: - - ../../build/failure + - build-steps: + - shell: + !include-raw: + - ../../build/failure wrappers: - mask-passwords: -- 2.47.3