From 292d757d3d37ca0e7db4c03ee05fafa4b4f5c2b3 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 1 Sep 2016 09:56:13 +0200 Subject: [PATCH] buildpackages: force ceph-test build on SUSE The ceph-test package is required for teuthology. It is disabled to speed up the build in OBS, but here we need it enabled unconditionally. Signed-off-by: Nathan Cutler (cherry picked from commit 0b10284caaf9dd00ef7fe66e3966e8e476341a62) --- tasks/buildpackages/make-rpm.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tasks/buildpackages/make-rpm.sh b/tasks/buildpackages/make-rpm.sh index fd264b09631c5..cd24153599262 100755 --- a/tasks/buildpackages/make-rpm.sh +++ b/tasks/buildpackages/make-rpm.sh @@ -120,7 +120,10 @@ function build_package() { # Build RPMs if [ "$suse" = true ]; then sed -i -e '0,/%package/s//%debug_package\n&/' \ - -e 's/%{epoch}://g' -e '/^Epoch:/d' ceph.spec + -e 's/%{epoch}://g' \ + -e '/^Epoch:/d' \ + -e 's/%bcond_with ceph_test_package/%bcond_without ceph_test_package/' \ + ceph.spec fi buildarea=`readlink -fn ${releasedir}` ### rpm wants absolute path PATH=$ccache:$PATH rpmbuild -ba --define "_unpackaged_files_terminate_build 0" --define "_topdir ${buildarea}" ceph.spec -- 2.39.5