ceph-build: separate deb build scripts from rpm build scripts

We need these specific scripts grouped into their own shell directives
so that if setup_deb exits on a centos node then setup_rpm will still be
ran against that same node.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 4e93b41d020a56ddfec298bdc925b546161250bb..377fc8c8a7fa582c01a1ae2e16bf7f264cb41efa 100644 (file)
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -35,12 +35,21 @@
           project: ceph-setup
           filter: 'dist/**'
           which-build: last-successful
+      # general setup
       - shell:
           !include-raw:
             - ../../../scripts/build_utils.sh
             - ../../build/setup
+      # debian build scripts
+      - shell:
+          !include-raw:
+            - ../../../scripts/build_utils.sh
             - ../../build/setup_pbuilder
             - ../../build/build_deb
+      # rpm build scripts
+      - shell:
+          !include-raw:
+            - ../../../scripts/build_utils.sh
             - ../../build/build_rpm
 
     publishers: