ceph-dev-build: setup must be performed for both dev and rpm

If we do setup in it's own -shell then the virtualenv created there will
not be used in the other two -shell sections. This is because we
switched from using a standard venv to using one created in a temp
directory.

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

diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml
index 2a1265be1eb0a2799699f2c658e3946a39c7e3ee..387edce66260ea758bf5bc9f9e27ce71930fd394 100644 (file)
--- a/ceph-dev-build/config/definitions/ceph-dev-build.yml
+++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml
@@ -50,21 +50,18 @@
           which-build: last-successful
       - inject:
           properties-file: ${WORKSPACE}/dist/sha1
-      # general setup
-      - shell:
-          !include-raw:
-            - ../../../scripts/build_utils.sh
-            - ../../build/setup
       # debian build scripts
       - shell:
           !include-raw:
             - ../../../scripts/build_utils.sh
+            - ../../build/setup
             - ../../build/setup_pbuilder
             - ../../build/build_deb
       # rpm build scripts
       - shell:
           !include-raw:
             - ../../../scripts/build_utils.sh
+            - ../../build/setup
             - ../../build/build_rpm
 
     wrappers: