]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
buildpackages: force ceph-test build on SUSE
authorNathan Cutler <ncutler@suse.com>
Thu, 1 Sep 2016 07:56:13 +0000 (09:56 +0200)
committerNathan Cutler <ncutler@suse.com>
Thu, 1 Sep 2016 08:33:17 +0000 (10:33 +0200)
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 <ncutler@suse.com>
tasks/buildpackages/make-rpm.sh

index 2ff0c9442d1c4bdd696843a2ce4c75d422cfc4d2..fb3f821d14ada21a6ae520fd05abd7e92f79a4be 100755 (executable)
@@ -135,7 +135,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