]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
script/kubejacker: include cls libs
authorJohn Spray <john.spray@redhat.com>
Tue, 14 Aug 2018 13:17:21 +0000 (14:17 +0100)
committerJohn Spray <john.spray@redhat.com>
Tue, 14 Aug 2018 13:18:14 +0000 (14:18 +0100)
...so that rbd, rgw etc will work.

Signed-off-by: John Spray <john.spray@redhat.com>
src/script/kubejacker/Dockerfile
src/script/kubejacker/kubejacker.sh

index 9a3971c1ef8ea1f0a226c9f3bac7a43ab0043b49..e0b337d20622e361e87be1fb1caca446aeb02041 100644 (file)
@@ -22,5 +22,6 @@ ADD lib.tar.gz /usr/lib64/
 # Assume developer is using default paths (i.e. /usr/local), so
 # build binaries will be looking for libs there.
 ADD eclib.tar.gz /usr/local/lib64/ceph/erasure-code/
+ADD clslib.tar.gz /usr/local/lib64/rados-classes/
 ADD mgr_plugins.tar.gz /usr/local/lib64/ceph/mgr
 
index 13b1ffa5cf44f5c6fc78f646d154bf0620c5c856..cf30a80dae9b22682f031f39b20030c789c655f2 100644 (file)
@@ -59,12 +59,17 @@ find ./ -name "*.pyc" -exec rm -f {} \;
 tar --exclude=node_modules --exclude=tests --exclude-backups -czf $BUILDPATH/kubejacker/mgr_plugins.tar.gz *
 popd
 
-ECLIBS="libec_*.so"
+ECLIBS="libec_*.so*"
 pushd lib
 strip $ECLIBS  #TODO: make stripping optional
 tar czf $BUILDPATH/kubejacker/eclib.tar.gz $ECLIBS
 popd
 
+CLSLIBS="libcls_*.so*"
+pushd lib
+strip $CLSLIBS  #TODO: make stripping optional
+tar czf $BUILDPATH/kubejacker/clslib.tar.gz $CLSLIBS
+popd
 
 pushd kubejacker
 docker build -t $REPO/$IMAGE:$TAG .