change mount argument from nfs to cifs
Signed-off-by: Wang Yong wangyong0117@qq.com --- tests/cci-depends | 2 +- tests/cci-makepkg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/cci-depends b/tests/cci-depends index a3c14290..36923ea4 100755 --- a/tests/cci-depends +++ b/tests/cci-depends @@ -28,7 +28,7 @@ pack_arch=$os_arch
. $LKP_SRC/distro/$DISTRO
-mount $LKP_SERVER:$DEPS_MNT $DEPS_MNT || die "Failed to run mount" +mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr //$LKP_SERVER$DEPS_MNT $DEPS_MNT || die "Failed to run mount"
umask 002
diff --git a/tests/cci-makepkg b/tests/cci-makepkg index 2ad53216..9d508262 100755 --- a/tests/cci-makepkg +++ b/tests/cci-makepkg @@ -34,7 +34,7 @@ pack_to=${os_mount}/${os}/${os_arch}/${os_version} cd $LKP_SRC/pkg/$benchmark || die "pkg is empty"
[ -n "$LKP_SERVER" ] && { - mount $LKP_SERVER:$PKG_MNT $PKG_MNT || die "Failed to run mount" + mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" }
get_pkg_info()
[ -n "$LKP_SERVER" ] && {
Here LKP_SERVER should be changed to INITRD_CIFS_HOST
Yuchuan, currently ~/compass-ci/container/os-cifs/smb.conf ties the major /srv/* dirs together.
We may try splitting out the services with different HOST/PORT, so that the dirs can be served either in same host or from different servers.
OS_CIFS_HOST OS_CIFS_PORT (default to 445)
INITRD_CIFS_HOST INITRD_CIFS_PORT (default to 139)
RESULT_CIFS_HOST RESULT_CIFS_PORT
The last one may not be necessary, since we'll only use HTTP result upload in future.
- mount $LKP_SERVER:$PKG_MNT $PKG_MNT || die "Failed to run mount"
- mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount"
On Thu, Oct 15, 2020 at 03:06:58PM +0800, Wu Fengguang wrote:
[ -n "$LKP_SERVER" ] && {
Here LKP_SERVER should be changed to INITRD_CIFS_HOST
OK.
Yuchuan, currently ~/compass-ci/container/os-cifs/smb.conf ties the major /srv/* dirs together.
We may try splitting out the services with different HOST/PORT, so that the dirs can be served either in same host or from different servers.
Yes, it will better.
Thanks, Wang Yong
On Thu, Oct 15, 2020 at 03:06:58PM +0800, Wu Fengguang wrote:
[ -n "$LKP_SERVER" ] && {
Here LKP_SERVER should be changed to INITRD_CIFS_HOST
Yuchuan, currently ~/compass-ci/container/os-cifs/smb.conf ties the major /srv/* dirs together.
We may try splitting out the services with different HOST/PORT, so that the dirs can be served either in same host or from different servers.
OS_CIFS_HOST OS_CIFS_PORT (default to 445)
INITRD_CIFS_HOST INITRD_CIFS_PORT (default to 139)
RESULT_CIFS_HOST RESULT_CIFS_PORT
The last one may not be necessary, since we'll only use HTTP result upload in future.
Ok, got it. Separating them also helps relieve disk pressure.
So, should we need to separate the container? - os-cifs # only support cifs of /srv/os - initrd-cifs # only support cifs of /srv/initrd
-------- Thanks Yu Chuan
- mount $LKP_SERVER:$PKG_MNT $PKG_MNT || die "Failed to run mount"
- mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount"
On Thu, Oct 15, 2020 at 05:04:52PM +0800, Yu Chuan wrote:
On Thu, Oct 15, 2020 at 03:06:58PM +0800, Wu Fengguang wrote:
[ -n "$LKP_SERVER" ] && {
Here LKP_SERVER should be changed to INITRD_CIFS_HOST
Yuchuan, currently ~/compass-ci/container/os-cifs/smb.conf ties the major /srv/* dirs together.
We may try splitting out the services with different HOST/PORT, so that the dirs can be served either in same host or from different servers.
OS_CIFS_HOST OS_CIFS_PORT (default to 445)
INITRD_CIFS_HOST INITRD_CIFS_PORT (default to 139)
RESULT_CIFS_HOST RESULT_CIFS_PORT
The last one may not be necessary, since we'll only use HTTP result upload in future.
Ok, got it. Separating them also helps relieve disk pressure.
So, should we need to separate the container?
- os-cifs # only support cifs of /srv/os
- initrd-cifs # only support cifs of /srv/initrd
OK.
Thanks, Fengguang
- mount $LKP_SERVER:$PKG_MNT $PKG_MNT || die "Failed to run mount"
- mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount"
-
Wang Yong -
Wu Fengguang -
Yu Chuan