From 17d23e2cdf843a0e101aa436145bd7d242d9100c Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 9 Aug 2016 10:06:53 -0500 Subject: [PATCH] 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 --- ceph-dev-build/config/definitions/ceph-dev-build.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml index 2a1265be..387edce6 100644 --- 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: -- 2.39.5