all remove deprecated "script-only-if" in favor of "build-on"

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
index bfc8e111f796a2cf78f8dfeb1d578eb8f4791c19..6ef44cc070d30ddb77f6e78f923ed76e0bf63c87 100644 (file)
--- 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 d9a99f7bd8f50fdce9ba0fb8a95af16ff12049b1..28547c75ef88ab74479c6e4a87e9d2b15416ea63 100644 (file)
--- 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 97356645932868d309a11733d2e9ad2b8c9fda93..d96bec46dd46861a6f2f52f402192855690c86bc 100644 (file)
--- 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 b51fbf0b5e8754b49dfe8723befb69bcb9034a6c..13c5555bf74b6f6c82e24cfad975a1ee8a636f37 100644 (file)
--- 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 a88e9b3a202849edcad553d0cb4562ae574b43f9..0c412e80af249ef624ae7ee184da1ab42dfbc719 100644 (file)
--- 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 ff95a5731febd96d7296b9a8492d5d731ff38bc6..039b4ec39bc0eb7e7e1c690306bce09b4351e995 100644 (file)
--- 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 486a14332799f4ae1aa105ff9c4dcab160327899..1092cc5be24da3cad80efa9681df87356686c543 100644 (file)
--- 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 44ed9f5cedb1025aef8400451702be1b2bab9c89..94ff938bc35fda58f9b307e8394334448eb32929 100644 (file)
--- 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 19945e99c9f70f6f1d891e9fef97062ee25818f1..4474a60b88f188569c0d595318e3b9006ec3b0ce 100644 (file)
--- 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 b7f58860ac270a945a5e0d2f8f653b151a7bf895..bfab90fe47892e068847b538f5b7791fe34d251a 100644 (file)
--- 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 8135a7441d1dfb92ee744f0cbf9bcfff638fe201..b480f60e0f3f372ce55da2b5aa0b6dbe8dab28a8 100644 (file)
--- 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 48171cbbf2d1d7d50c45f321832e9f9e5c74c94d..dc6da0cb5d02f2e1ddbe7b5dc398df6e960881df 100644 (file)
--- 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 95ba0b950e9fd2c7dd4a6949fbee9d3747548547..d476cb7480e6f0d3cc91acaf8f325211edc01c82 100644 (file)
--- 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 4f0931ccccd5a8f7153de8df2aac47ba47e71b7b..a3b31785746f749e2c1cd232b96ffcda9ef34d04 100644 (file)
--- 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 8cb37e8a308f99e5d6e27ea0f83597dc459c8251..4b769cafaf4b68e17ed866b7c3c1767b1cc68322 100644 (file)
--- 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 ffd5994ac04447bea402582c0f65e7dc392f67a4..32dfaef97026d6494257c58bf6bfbaaa59f4e94d 100644 (file)
--- 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 ca0edd8d851dbd5892b314b72d3ea1484a92a0d6..361f43d52f3d1d6ac9e9e9ad2c2e4ba33c970d54 100644 (file)
--- 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 4fe868ba20807a513a7c19d1cacfb0f2eaab145c..2d79daa71f99e86946ad5803d5d8bf0325088dad 100644 (file)
--- 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 5d934fa8ad45e5492004c5e37ca74d1b477cefd9..da15c0ca219ec2d7d0043daefe5031ea98dfbeb1 100644 (file)
--- 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 8cb399fe2cd47cb61394f3e726e1b37207847883..60798cceb8064923cea06ed0d3954bad984b4760 100644 (file)
--- 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 8ad27786385b934534b735b5ef1d4d6c3bd3ea99..b47bb9ea3ea8a61d814e1f763cff5b3d4f57bf55 100644 (file)
--- 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