From fb04055d1e2e4f228f1c9b107b76ea4dec194148 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Fri, 16 Mar 2018 15:17:31 -0400 Subject: [PATCH] all remove deprecated "script-only-if" in favor of "build-on" Signed-off-by: Alfredo Deza --- .../definitions/ceph-ansible-nightly.yml | 8 ++++--- .../config/definitions/ceph-ansible-prs.yml | 24 ++++++++++++------- .../definitions/ceph-ansible-scenario.yml | 8 ++++--- ceph-build/config/definitions/ceph-build.yml | 8 ++++--- .../definitions/ceph-container-nightly.yml | 8 ++++--- .../config/definitions/ceph-container-prs.yml | 8 ++++--- .../config/definitions/ceph-dev-build.yml | 8 ++++--- .../config/definitions/ceph-dev-new-build.yml | 8 ++++--- .../config/definitions/ceph-dev-new-setup.yml | 8 ++++--- .../config/definitions/ceph-dev-setup.yml | 8 ++++--- .../config/definitions/ceph-pull-requests.yml | 8 ++++--- ceph-setup/config/definitions/ceph-setup.yml | 8 ++++--- .../config/definitions/ceph-volume-pr.yml | 8 ++++--- .../definitions/ceph-volume-nightly.yml | 8 ++++--- .../config/definitions/ceph-volume-pr.yml | 8 ++++--- .../definitions/ceph-volume-scenario.yml | 8 ++++--- .../config/definitions/jjb.yml | 11 ++++++--- .../config/definitions/nfs-ganesha-stable.yml | 8 ++++--- .../config/definitions/nfs-ganesha.yml | 8 ++++--- samba/config/definitions/samba.yml | 11 ++++++--- .../config/definitions/sepia-fog-images.yml | 8 ++++--- 21 files changed, 121 insertions(+), 69 deletions(-) diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml index bfc8e111..6ef44cc0 100644 --- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml +++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml @@ -144,10 +144,12 @@ publishers: - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: !include-raw-escape: - ../../../scripts/build_utils.sh diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml index d9a99f7b..28547c75 100644 --- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml +++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml @@ -159,10 +159,12 @@ publishers: - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: !include-raw-escape: - ../../../scripts/build_utils.sh @@ -239,10 +241,12 @@ publishers: - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: !include-raw-escape: - ../../../scripts/build_utils.sh @@ -319,10 +323,12 @@ publishers: - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: !include-raw-escape: - ../../../scripts/build_utils.sh diff --git a/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml b/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml index 97356645..d96bec46 100644 --- a/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml +++ b/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml @@ -54,10 +54,12 @@ publishers: - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: !include-raw: - ../../../scripts/build_utils.sh diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml index b51fbf0b..13c5555b 100644 --- a/ceph-build/config/definitions/ceph-build.yml +++ b/ceph-build/config/definitions/ceph-build.yml @@ -80,10 +80,12 @@ publishers: - postbuildscript: - script-only-if-failed: True - script-only-if-succeeded: False builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - inject: properties-file: ${WORKSPACE}/build_info - shell: diff --git a/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml b/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml index a88e9b3a..0c412e80 100644 --- a/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml +++ b/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml @@ -63,8 +63,10 @@ publishers: - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + 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 ff95a573..039b4ec3 100644 --- a/ceph-container-prs/config/definitions/ceph-container-prs.yml +++ b/ceph-container-prs/config/definitions/ceph-container-prs.yml @@ -80,8 +80,10 @@ publishers: - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + 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 486a1433..1092cc5b 100644 --- a/ceph-dev-build/config/definitions/ceph-dev-build.yml +++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml @@ -88,10 +88,12 @@ publishers: - postbuildscript: - script-only-if-failed: True - script-only-if-succeeded: False builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - inject: properties-file: ${WORKSPACE}/build_info - shell: 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 44ed9f5c..94ff938b 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 @@ -88,10 +88,12 @@ publishers: - postbuildscript: - script-only-if-failed: True - script-only-if-succeeded: False builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - inject: properties-file: ${WORKSPACE}/build_info - shell: 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 19945e99..4474a60b 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 @@ -45,10 +45,12 @@ latest-only: false - postbuildscript: - script-only-if-failed: True - script-only-if-succeeded: False builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: !include-raw: - ../../../scripts/build_utils.sh diff --git a/ceph-dev-setup/config/definitions/ceph-dev-setup.yml b/ceph-dev-setup/config/definitions/ceph-dev-setup.yml index b7f58860..bfab90fe 100644 --- a/ceph-dev-setup/config/definitions/ceph-dev-setup.yml +++ b/ceph-dev-setup/config/definitions/ceph-dev-setup.yml @@ -45,10 +45,12 @@ latest-only: false - postbuildscript: - script-only-if-failed: True - script-only-if-succeeded: False builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: !include-raw: - ../../../scripts/build_utils.sh diff --git a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml index 8135a744..b480f60e 100644 --- a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml +++ b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml @@ -55,8 +55,10 @@ publishers: - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: "sudo reboot" diff --git a/ceph-setup/config/definitions/ceph-setup.yml b/ceph-setup/config/definitions/ceph-setup.yml index 48171cbb..dc6da0cb 100644 --- a/ceph-setup/config/definitions/ceph-setup.yml +++ b/ceph-setup/config/definitions/ceph-setup.yml @@ -45,10 +45,12 @@ latest-only: false - postbuildscript: - script-only-if-failed: True - script-only-if-succeeded: False builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: !include-raw: - ../../../scripts/build_utils.sh 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 95ba0b95..d476cb74 100644 --- a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml +++ b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml @@ -118,10 +118,12 @@ publishers: - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: !include-raw-escape: - ../../../scripts/build_utils.sh diff --git a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml index 4f0931cc..a3b31785 100644 --- a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml +++ b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml @@ -90,10 +90,12 @@ publishers: - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: !include-raw-escape: - ../../../scripts/build_utils.sh diff --git a/ceph-volume-pr/config/definitions/ceph-volume-pr.yml b/ceph-volume-pr/config/definitions/ceph-volume-pr.yml index 8cb37e8a..4b769caf 100644 --- a/ceph-volume-pr/config/definitions/ceph-volume-pr.yml +++ b/ceph-volume-pr/config/definitions/ceph-volume-pr.yml @@ -73,10 +73,12 @@ publishers: - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: !include-raw-escape: - ../../../scripts/build_utils.sh diff --git a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml index ffd5994a..32dfaef9 100644 --- a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml +++ b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml @@ -58,10 +58,12 @@ publishers: - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: True builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: !include-raw: - ../../../scripts/build_utils.sh diff --git a/jenkins-job-builder/config/definitions/jjb.yml b/jenkins-job-builder/config/definitions/jjb.yml index ca0edd8d..361f43d5 100644 --- a/jenkins-job-builder/config/definitions/jjb.yml +++ b/jenkins-job-builder/config/definitions/jjb.yml @@ -47,7 +47,12 @@ If this is checked, JJB will wipe out its cache and force each job to align with publishers: - postbuildscript: builders: - - build-steps: + - role: SLAVE + build-on: + - SUCCESS + - NOT_BUILT + - UNSTABLE + - FAILURE + - ABORTED + 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 4fe868ba..2d79daa7 100644 --- a/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml +++ b/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml @@ -168,10 +168,12 @@ 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 builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - inject: properties-file: ${WORKSPACE}/build_info - shell: diff --git a/nfs-ganesha/config/definitions/nfs-ganesha.yml b/nfs-ganesha/config/definitions/nfs-ganesha.yml index 5d934fa8..da15c0ca 100644 --- a/nfs-ganesha/config/definitions/nfs-ganesha.yml +++ b/nfs-ganesha/config/definitions/nfs-ganesha.yml @@ -144,10 +144,12 @@ 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 builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - inject: properties-file: ${WORKSPACE}/build_info diff --git a/samba/config/definitions/samba.yml b/samba/config/definitions/samba.yml index 8cb399fe..60798cce 100644 --- a/samba/config/definitions/samba.yml +++ b/samba/config/definitions/samba.yml @@ -113,8 +113,13 @@ If this is checked, then the binaries will be built and pushed to chacra even if publishers: - postbuildscript: - script-only-if-succeeded: False - script-only-if-failed: False builders: - - build-steps: + - role: SLAVE + build-on: + - SUCCESS + - UNSTABLE + - FAILURE + - ABORTED + - NOT_BUILT + 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 8ad27786..b47bb9ea 100644 --- a/sepia-fog-images/config/definitions/sepia-fog-images.yml +++ b/sepia-fog-images/config/definitions/sepia-fog-images.yml @@ -32,10 +32,12 @@ publishers: - postbuildscript: - script-only-if-failed: True - script-only-if-succeeded: False builders: - - build-steps: + - role: SLAVE + build-on: + - FAILURE + - ABORTED + build-steps: - shell: !include-raw: - ../../build/failure -- 2.39.5