all builders in postbuildscript require a list now (defined with build-step)

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 a12b5470519c6eb46fa203a1c154e9962bc7ed42..bfc8e111f796a2cf78f8dfeb1d578eb8f4791c19 100644 (file)
--- 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 2cf8cfdaf9f1f1674328f53de1891b0fc719973b..d9a99f7bd8f50fdce9ba0fb8a95af16ff12049b1 100644 (file)
--- 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 1bbc4b34fa0b6b5556ee3805f0f56091fc9719ae..97356645932868d309a11733d2e9ad2b8c9fda93 100644 (file)
--- 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 48c0d06df348606e9672ec0306da7efbaf8c86b7..b51fbf0b5e8754b49dfe8723befb69bcb9034a6c 100644 (file)
--- 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 75686e9a852150d7d12bd4cd15465726a383b9a2..a88e9b3a202849edcad553d0cb4562ae574b43f9 100644 (file)
--- 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 9043e0363a3cc7ee97ba00d1395f417db865d8dd..ff95a5731febd96d7296b9a8492d5d731ff38bc6 100644 (file)
--- 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 00694c1a373a31f10479f1b04cd3fe56d04ca151..486a14332799f4ae1aa105ff9c4dcab160327899 100644 (file)
--- 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 ce3890ae863528ac88316a8f5211949c38197616..44ed9f5cedb1025aef8400451702be1b2bab9c89 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
@@ -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 18c7832e52b6352d24b1600681df2cf73f2deee4..19945e99c9f70f6f1d891e9fef97062ee25818f1 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
@@ -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 edc20ff1cc79c2dfce4eece2377c10c37bc1d1d3..8135a7441d1dfb92ee744f0cbf9bcfff638fe201 100644 (file)
--- 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 95935293d42381f9be5e59d1d40f32175242a0a8..48171cbbf2d1d7d50c45f321832e9f9e5c74c94d 100644 (file)
--- 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 ca71a766909f3cf461b5df6d162781f72dd701cc..95ba0b950e9fd2c7dd4a6949fbee9d3747548547 100644 (file)
--- 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 861e1d3f05ad031258925d316f119b76feda629e..4f0931ccccd5a8f7153de8df2aac47ba47e71b7b 100644 (file)
--- 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 e3c5a9ce4f0adc4e658be22e561ad397c03defa6..8cb37e8a308f99e5d6e27ea0f83597dc459c8251 100644 (file)
--- 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 aba0341ef5171a41fd2e724c820d44a48acfcb37..ffd5994ac04447bea402582c0f65e7dc392f67a4 100644 (file)
--- 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 b269c2f969963fd0abcc95a17dcf580014e41ba5..ca0edd8d851dbd5892b314b72d3ea1484a92a0d6 100644 (file)
--- 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 4acc442bb84ef9fab5d64f06871c52746b3b7e35..7226d86f800581269d745bdc0b9e0f5f4ff14bfc 100644 (file)
--- 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 29775b44fd53420e3bbdf6bba8b52129c4298ca7..8cb399fe2cd47cb61394f3e726e1b37207847883 100644 (file)
--- 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 115c96dd948037237f4b3604f1e598ac1156f915..8ad27786385b934534b735b5ef1d4d6c3bd3ea99 100644 (file)
--- 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: