diff --git a/test/cloud_testing/platforms/centos7_x86_64-EXCLCACHE_setup.sh b/test/cloud_testing/platforms/centos7_x86_64-EXCLCACHE_setup.sh index cfd09261e61d6439b06184243b0d0d5d947f59b2..30ff51fbf4c8af71f8abeeac41fd5f9dd0e0a782 100755 --- a/test/cloud_testing/platforms/centos7_x86_64-EXCLCACHE_setup.sh +++ b/test/cloud_testing/platforms/centos7_x86_64-EXCLCACHE_setup.sh @@ -10,6 +10,7 @@ install_from_repo epel-release # install CernVM-FS RPM packages echo "installing RPM packages... " install_rpm "$CONFIG_PACKAGES" +install_rpm $LIBS_PACKAGE install_rpm $CLIENT_PACKAGE install_rpm $UNITTEST_PACKAGE diff --git a/test/cloud_testing/platforms/centos7_x86_64-FUSE3_setup.sh b/test/cloud_testing/platforms/centos7_x86_64-FUSE3_setup.sh index 58a34e88caec28e1badbcbdbc406889cbab3dc0e..51800ef0f5b50694eb67963a2a1bf988ba365bd4 100755 --- a/test/cloud_testing/platforms/centos7_x86_64-FUSE3_setup.sh +++ b/test/cloud_testing/platforms/centos7_x86_64-FUSE3_setup.sh @@ -10,6 +10,7 @@ install_from_repo epel-release # install CernVM-FS RPM packages echo "installing RPM packages... " install_rpm "$CONFIG_PACKAGES" +install_rpm $LIBS_PACKAGE install_rpm $CLIENT_PACKAGE install_rpm $UNITTEST_PACKAGE install_rpm $FUSE3_PACKAGE diff --git a/test/cloud_testing/platforms/centos7_x86_64-NFS_setup.sh b/test/cloud_testing/platforms/centos7_x86_64-NFS_setup.sh index 2b217cb51e19af9fb481a1262d21527e27a49b67..f08e39f3c5fafe53994ce7ba885236e19559d2a4 100755 --- a/test/cloud_testing/platforms/centos7_x86_64-NFS_setup.sh +++ b/test/cloud_testing/platforms/centos7_x86_64-NFS_setup.sh @@ -10,6 +10,7 @@ install_from_repo epel-release # install CernVM-FS RPM packages echo "installing RPM packages... " install_rpm "$CONFIG_PACKAGES" +install_rpm $LIBS_PACKAGE install_rpm $CLIENT_PACKAGE install_rpm $UNITTEST_PACKAGE diff --git a/test/cloud_testing/platforms/centos7_x86_64-RAMCACHE_setup.sh b/test/cloud_testing/platforms/centos7_x86_64-RAMCACHE_setup.sh index 1c28c1d1bcb3c0840790e88a4e5f791b58472645..31c5b907ec8a356f32e25f65692f0160fdd2005a 100755 --- a/test/cloud_testing/platforms/centos7_x86_64-RAMCACHE_setup.sh +++ b/test/cloud_testing/platforms/centos7_x86_64-RAMCACHE_setup.sh @@ -10,6 +10,7 @@ install_from_repo epel-release # install CernVM-FS RPM packages echo "installing RPM packages... " install_rpm "$CONFIG_PACKAGES" +install_rpm $LIBS_PACKAGE install_rpm $CLIENT_PACKAGE install_rpm $UNITTEST_PACKAGE diff --git a/test/cloud_testing/platforms/centos7_x86_64_setup.sh b/test/cloud_testing/platforms/centos7_x86_64_setup.sh index b99dcf2028d90f30ec16622d60522baaa4c46fcc..0643af0da9ecd616a2ca5ae61ce5ea95682f824f 100755 --- a/test/cloud_testing/platforms/centos7_x86_64_setup.sh +++ b/test/cloud_testing/platforms/centos7_x86_64_setup.sh @@ -23,6 +23,7 @@ install_from_repo epel-release # install CernVM-FS RPM packages echo "installing RPM packages... " install_rpm "$CONFIG_PACKAGES" +install_rpm $LIBS_PACKAGE install_rpm $CLIENT_PACKAGE install_rpm $SERVER_PACKAGE install_rpm $DEVEL_PACKAGE diff --git a/test/cloud_testing/platforms/centos8_x86_64-CONTAINER_setup.sh b/test/cloud_testing/platforms/centos8_x86_64-CONTAINER_setup.sh index 2ab5c9bff8390e10cbbd69e9945ad2be00af5c44..042a65b6003123f8214542aedb8fb75c43158ef7 100644 --- a/test/cloud_testing/platforms/centos8_x86_64-CONTAINER_setup.sh +++ b/test/cloud_testing/platforms/centos8_x86_64-CONTAINER_setup.sh @@ -7,6 +7,7 @@ script_location=$(dirname $(readlink --canonicalize $0)) # install CernVM-FS RPM packages echo "installing RPM packages... " install_rpm "$CONFIG_PACKAGES" +install_rpm $LIBS_PACKAGE install_rpm $CLIENT_PACKAGE [ "x$SERVICE_CONTAINER" != "x" ] || die "fail (service container missing)" diff --git a/test/cloud_testing/platforms/centos8_x86_64-FUSE3_setup.sh b/test/cloud_testing/platforms/centos8_x86_64-FUSE3_setup.sh index 9dd2737d2c2207cd9ac48baf815ab8e6624c9c66..a01f58a8985db568d8cc5f7ad73be4ce30f6251c 100755 --- a/test/cloud_testing/platforms/centos8_x86_64-FUSE3_setup.sh +++ b/test/cloud_testing/platforms/centos8_x86_64-FUSE3_setup.sh @@ -10,6 +10,7 @@ install_from_repo epel-release # install CernVM-FS RPM packages echo "installing RPM packages... " install_rpm "$CONFIG_PACKAGES" +install_rpm $LIBS_PACKAGE install_rpm $CLIENT_PACKAGE install_rpm $UNITTEST_PACKAGE install_rpm $FUSE3_PACKAGE diff --git a/test/cloud_testing/platforms/centos8_x86_64_setup.sh b/test/cloud_testing/platforms/centos8_x86_64_setup.sh index 9645bd0ca37dda29e921191e79cd390d85ce0af1..eaa45f5770ef506a83ff40b293abad55c0698e99 100755 --- a/test/cloud_testing/platforms/centos8_x86_64_setup.sh +++ b/test/cloud_testing/platforms/centos8_x86_64_setup.sh @@ -23,6 +23,7 @@ install_from_repo epel-release # install CernVM-FS RPM packages echo "installing RPM packages... " install_rpm "$CONFIG_PACKAGES" +install_rpm $LIBS_PACKAGE install_rpm $CLIENT_PACKAGE install_rpm $SERVER_PACKAGE install_rpm $DEVEL_PACKAGE diff --git a/test/cloud_testing/platforms/centos9_x86_64_setup.sh b/test/cloud_testing/platforms/centos9_x86_64_setup.sh index 72d0aa9c0de72321386db059d1fcc1edb06d2ec0..98179d3edc167d5ec35eb428e00f4195aa48ff64 100755 --- a/test/cloud_testing/platforms/centos9_x86_64_setup.sh +++ b/test/cloud_testing/platforms/centos9_x86_64_setup.sh @@ -11,6 +11,7 @@ install_from_repo epel-release # install CernVM-FS RPM packages echo "installing RPM packages... " install_rpm "$CONFIG_PACKAGES" +install_rpm $LIBS_PACKAGE install_rpm $CLIENT_PACKAGE install_rpm $SERVER_PACKAGE install_rpm $DEVEL_PACKAGE diff --git a/test/cloud_testing/platforms/common_setup.sh b/test/cloud_testing/platforms/common_setup.sh index e43fd6e384fab90a06bc853dadef448c502683c2..a3204e11eec5f5044afc784768fe4ec9d0e6540a 100644 --- a/test/cloud_testing/platforms/common_setup.sh +++ b/test/cloud_testing/platforms/common_setup.sh @@ -16,6 +16,7 @@ script_location=$(portable_dirname $0) # After sourcing this file the following variables are set: # # SERVER_PACKAGE location of the CernVM-FS server package to install +# LIBS_PACKAGE location of the CernVM-FS library package to install # CLIENT_PACKAGE location of the CernVM-FS client package to install # FUSE3_PACKAGE location of the libcvmfs_fuse3 package # DEVEL_PACKAGE location of the CernVM-FS devel package to install @@ -28,6 +29,7 @@ script_location=$(portable_dirname $0) # DUCC_PACKAGE location of the DUCC package # +LIBS_PACKAGE="" SERVER_PACKAGE="" CLIENT_PACKAGE="" FUSE3_PACKAGE="" @@ -62,8 +64,11 @@ usage() { } # parse script parameters (same for all platforms) -while getopts "s:c:d:k:t:g:l:w:n:p:f:D:C:" option; do +while getopts "s:c:d:k:t:g:l:w:n:p:f:D:C:L:" option; do case $option in + L) + LIBS_PACKAGE=$OPTARG + ;; s) SERVER_PACKAGE=$OPTARG ;; diff --git a/test/cloud_testing/platforms/debian_setup.sh b/test/cloud_testing/platforms/debian_setup.sh index 6d6cab21ba22b99752e7ee2a1b914d9af010c788..4f23e36f3e004574363cb3c01b540c4a72322275 100644 --- a/test/cloud_testing/platforms/debian_setup.sh +++ b/test/cloud_testing/platforms/debian_setup.sh @@ -62,6 +62,7 @@ echo "done" # install deb packages echo "installing DEB packages... " install_deb "$CONFIG_PACKAGES" +install_deb $LIBS_PACKAGE install_deb $CLIENT_PACKAGE install_deb $FUSE3_PACKAGE install_deb $SERVER_PACKAGE diff --git a/test/cloud_testing/platforms/fedora_setup.sh b/test/cloud_testing/platforms/fedora_setup.sh index 61fcfcd572f20af9db72a0f0168887c1cf893257..e47bbf76ccc724446c2f04237eff8c09f201a333 100755 --- a/test/cloud_testing/platforms/fedora_setup.sh +++ b/test/cloud_testing/platforms/fedora_setup.sh @@ -17,6 +17,7 @@ echo "done" # install CernVM-FS RPM packages echo "installing RPM packages... " install_rpm "$CONFIG_PACKAGES" +install_rpm $LIBS_PACKAGE install_rpm $CLIENT_PACKAGE install_rpm $SERVER_PACKAGE install_rpm $DEVEL_PACKAGE diff --git a/test/cloud_testing/platforms/ubuntu_setup.sh b/test/cloud_testing/platforms/ubuntu_setup.sh index 975da043949b66c0f8e37a73058a4c6bb6896d95..de5bb441dff720c5b5a68ce86348f97552e4a645 100755 --- a/test/cloud_testing/platforms/ubuntu_setup.sh +++ b/test/cloud_testing/platforms/ubuntu_setup.sh @@ -62,6 +62,7 @@ echo "done" # install deb packages echo "installing DEB packages... " install_deb "$CONFIG_PACKAGES" +install_deb $LIBS_PACKAGE install_deb $CLIENT_PACKAGE install_deb $SERVER_PACKAGE install_deb $DEVEL_PACKAGE diff --git a/test/cloud_testing/platforms/yubikey_setup.sh b/test/cloud_testing/platforms/yubikey_setup.sh index c7716c1325b97f3d927527cefb1b9dde3fee2ad5..b3ade087c94f6316a4812b11f99750812322fe3c 100644 --- a/test/cloud_testing/platforms/yubikey_setup.sh +++ b/test/cloud_testing/platforms/yubikey_setup.sh @@ -11,6 +11,7 @@ install_from_repo epel-release # install CernVM-FS RPM packages echo "installing RPM packages... " install_rpm "$CONFIG_PACKAGES" +install_rpm $LIBS_PACKAGE install_rpm $CLIENT_PACKAGE install_rpm $SERVER_PACKAGE install_rpm $DEVEL_PACKAGE