November 2020 - Compass-ci - mailweb.openeuler.org

[PATCH lkp-tests] tests/build-pkg: reduce parameters
by Wu Fengguang 27 Nov '20

27 Nov '20

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- tests/build-pkg | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/build-pkg b/tests/build-pkg index 29d35997..bdaef035 100755 --- a/tests/build-pkg +++ b/tests/build-pkg @@ -1,13 +1,16 @@ #!/bin/bash -# - os -# - os_arch -# - os_version -# - os_mount # - pkgbuild_repo # - upstream_repo -# - upstream_url # - upstream_commit # - PKGBUILD_TAG +# upstream_url + +# We'll use the below global env vars, but not treat them as parameter to avoid +# duplicates in result path like /openeuler-20.03-aarch64/openeuler-aarch64-cifs-2003/ +# - os +# - os_arch +# - os_version +# - os_mount ## makepkg is a script that automates the building of packages; it can download and validate source files, ## check dependencies, configure build-time settings, compile the sources, install into a temporary root, -- 2.23.0

1 0

[PATCH v3 lkp-tests] lkp-tests/*: fix cci jobs upload in container
by Wang Yong 27 Nov '20

27 Nov '20

docker can not use mount operation, so now use curl to upload cci-depends/cci-makepkg cgz file Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- distro/common | 10 ++++++++++ tests/cci-depends | 9 +++++++-- tests/cci-makepkg | 18 ++++++++++++++---- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/distro/common b/distro/common index b48dfe5f1..cdb531403 100755 --- a/distro/common +++ b/distro/common @@ -81,3 +81,13 @@ share_debian_package() exit 0 } + +upload_to_target_dir() +{ + . $LKP_SRC/lib/upload.sh + + local dir="$1" + local file="$(ls -F ${dir} | grep -v "@")" + + upload_one_curl "${dir}/${file}" "${dir}" >/dev/null +} diff --git a/tests/cci-depends b/tests/cci-depends index d5c21541d..ffa585b8c 100755 --- a/tests/cci-depends +++ b/tests/cci-depends @@ -29,8 +29,10 @@ pack_arch=$os_arch . $LKP_SRC/distro/$DISTRO -is_mount_point ${DEPS_MNT} && umount ${DEPS_MNT} -mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$DEPS_MNT $DEPS_MNT || die "Failed to run mount" +is_docker || { + is_mount_point ${DEPS_MNT} && umount ${DEPS_MNT} + mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$DEPS_MNT $DEPS_MNT || die "Failed to run mount" +} umask 002 @@ -59,3 +61,6 @@ fixup_preinstall fixup_arch_install $pack_arch pack_benchmark_deps + +is_docker || exit 0 +upload_to_target_dir ${pack_to} diff --git a/tests/cci-makepkg b/tests/cci-makepkg index d08f23718..a7a990a59 100755 --- a/tests/cci-makepkg +++ b/tests/cci-makepkg @@ -34,11 +34,17 @@ pack_to=${os_mount}/${os}/${os_arch}/${os_version}/${benchmark} cd $LKP_SRC/pkg/$benchmark || die "pkg is empty" -[ -n "$LKP_SERVER" ] && { - is_mount_point ${PKG_MNT} && umount ${PKG_MNT} - mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" +mount_pkg_mnt() +{ + is_mount_point ${PKG_MNT} && umount ${PKG_MNT} + mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" +} + +is_docker || { + [ -n "$LKP_SERVER" ] && mount_pkg_mnt } + curl_pkgfile() { curl -sS -H 'Content-Type: Application/json' -XPOST "$LKP_SERVER"':8100/git_command' \ @@ -140,7 +146,11 @@ build_source_pkg() PACMAN=true BUILDDIR=$TMP CARCH=$arch PKGEXT=.cgz CGZDEST="$sync_dest/$cgz_name" $makepkg - [ "$?" == 0 ] && update_softlink + [ "$?" == 0 ] || exit 1 + update_softlink + + is_docker || exit 0 + upload_to_target_dir ${sync_dest} } build_source_pkg -- 2.23.0

4 5

[PATCH v2 compass-ci 2/2] doc/job/: add os_dir.md
by Xu Xijian 27 Nov '20

27 Nov '20

Add a document for introducing the os_dir field. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- doc/job/os_dir.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/job/os_dir.md diff --git a/doc/job/os_dir.md b/doc/job/os_dir.md new file mode 100644 index 0000000..cecac49 --- /dev/null +++ b/doc/job/os_dir.md @@ -0,0 +1,10 @@ +# os_dir + +Meaning: +- An os_dir is a field that consists of three fields: os, os_arch, os_version, an example can be openeuler/aarch64/20.03. +- An os_dir is used to consist some paths with concrete os information, here are some paths in scheduler: + $SRV_OS/$os_dir/boot + $SRV_INITRD/osimage/$os_dir + $SRV_INITRD/deps/$mount_type/$os_dir/$program/$program.cgz + $SRV_INITRD/pkg/$mount_type/$os_dir/$program/$program_version.cgz + -- 2.23.0

2 1

[PATCH v1 compass-ci] lib/mail_bisect_result.rb: no need to add from field when send a email
by Cao Xueliang 27 Nov '20

27 Nov '20

The email service will add the from field by itself. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/mail_bisect_result.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mail_bisect_result.rb b/lib/mail_bisect_result.rb index 1e85824..2799ce2 100644 --- a/lib/mail_bisect_result.rb +++ b/lib/mail_bisect_result.rb @@ -37,7 +37,7 @@ class MailBisectResult https://gitee.com/openeuler/compass-ci BODY to = 'caoxl(a)crystal.ci' - @hash = { 'to' => to, 'body' => body, 'subject' => subject, 'from' => 'compass-ci(a)outlook.com' } + @hash = { 'to' => to, 'body' => body, 'subject' => subject } # @hash = { 'to' => @git_commit.author_email, 'body' => body, 'subject' => subject } end -- 2.23.0

1 0

[PATCH compass-ci] lib/mai_bisect_result.rb: no need to add from field when send a email
by Cao Xueliang 27 Nov '20

27 Nov '20

The email service will add the from field by itself. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/mail_bisect_result.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mail_bisect_result.rb b/lib/mail_bisect_result.rb index 1e85824..2799ce2 100644 --- a/lib/mail_bisect_result.rb +++ b/lib/mail_bisect_result.rb @@ -37,7 +37,7 @@ class MailBisectResult https://gitee.com/openeuler/compass-ci BODY to = 'caoxl(a)crystal.ci' - @hash = { 'to' => to, 'body' => body, 'subject' => subject, 'from' => 'compass-ci(a)outlook.com' } + @hash = { 'to' => to, 'body' => body, 'subject' => subject } # @hash = { 'to' => @git_commit.author_email, 'body' => body, 'subject' => subject } end -- 2.23.0

1 1

[PATCH compass-ci] kernel_params.cr: refactor if block to one line
by Xu Xijian 27 Nov '20

27 Nov '20

In crystal language, if the last line of a function has no value, this function will return nil, so the function kernel_console can be refactored into one line. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- src/scheduler/kernel_params.cr | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/scheduler/kernel_params.cr b/src/scheduler/kernel_params.cr index a558735..2cc8172 100644 --- a/src/scheduler/kernel_params.cr +++ b/src/scheduler/kernel_params.cr @@ -26,11 +26,7 @@ class Job end private def kernel_console - if os_arch == "x86_64" - return "console=ttyS0,115200 console=tty0" - else - return "" - end + return "console=ttyS0,115200 console=tty0" if os_arch == "x86_64" end private def set_kernel_params -- 2.23.0

1 0

[PATCH compass-ci] sparrow/3-code: fix start container error message
by Liu Yinsi 27 Nov '20

27 Nov '20

[why] when start containers send-internet-mail and send-mail, error message: docker: invalid publish opts format (should be name=value but got ':'). [how] add ENV vars defaults values, avoid confusion error message. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/3-code/dev-env | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 218b6c1..444281e 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -15,6 +15,9 @@ server_ip=$(ip route get 1.2.3.4 | awk '{print $7; exit}') : ${DOCKER_REGISTRY_PORT:=5001} : ${LOGGING_ES_HOST:=$server_ip} : ${LOGGING_ES_PORT:=9202} +: ${SEND_MAIL_PORT:=49000} +: ${LOCAL_SEND_MAIL_PORT:=11311} +: ${LOCAL_ROBOT_EMAIL_ADDRESS:=Crystal TEAM} mkdir -p /etc/compass-ci/defaults cat > /etc/compass-ci/defaults/$server_name.yaml <<EOF @@ -32,6 +35,9 @@ DOCKER_REGISTRY_HOST: $DOCKER_REGISTRY_HOST DOCKER_REGISTRY_PORT: $DOCKER_REGISTRY_PORT LOGGING_ES_HOST: $LOGGING_ES_HOST LOGGING_ES_PORT: $LOGGING_ES_PORT +SEND_MAIL_PORT: $SEND_MAIL_PORT +LOCAL_SEND_MAIL_PORT: $LOCAL_SEND_MAIL_PORT +LOCAL_ROBOT_EMAIL_ADDRESS: $LOCAL_ROBOT_EMAIL_ADDRESS EOF cat > /etc/profile.d/compass.sh <<EOF -- 2.23.0

1 0

[PATCH compass-ci] doc/manual: change the hyperlink of submit***.md
by Li Yuanchao 27 Nov '20

27 Nov '20

As the name and path of submit***.md changed, so change the hyperlink of it. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- ...\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" "b/doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" index ad4f9b0..b4d3078 100644 --- "a/doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" +++ "b/doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" @@ -48,6 +48,6 @@ b/backlight/backlight: 并通过Pull Request的方式提交。相关参数含义见参考文档参考文档： -- [compass-ci测试平台使用教程--submit命令详解](https://gitee.com/wu_fengguang/compass-ci/t… +- [submit命令详解](https://gitee.com/wu_fengguang/compass-ci/tree/master/doc/manua… - [如何适配测试用例](https://gitee.com/wu_fengguang/lkp-tests/blob/master/doc/add-test… -- 2.23.0

1 0

[PATCH v3 compass-ci 2/2] sparrow/0-package: fix failed to restart docker.service
by Liu Yinsi 27 Nov '20

27 Nov '20

[why] when execute systemctl restart docker, error message: localhost.localdomain systemd[1]:docker.service: Failed with result 'timeout'. localhost.localdomain systemd[1]:Failed to start Docker Application Container Engine. because docker restart default timeout is 90s, when run too much containers, restart docker may need several minutes, then restart failed. [how] set TimeoutSec=0 to avoid timeout. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/common | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 5eb9f76..2753b9d 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -40,4 +40,7 @@ cat > /etc/docker/daemon.json <<EOF } EOF +sed '/^Environment=/a\TimeoutSec=0' /usr/lib/systemd/system/docker.service + +systemctl daemon-reload systemctl restart docker -- 2.23.0

1 0

[PATCH v3 compass-ci 1/2] sparrow/0-package: fix failed to start ssh-r
by Liu Yinsi 27 Nov '20

27 Nov '20

[why] when execute ssh-r/start, error message: docker: Error response from daemon: driver failed programming external connectivity on endpoint ssh_r (55638ba16aa1264dff0fdc1badc93176eec07d2b848d4a8d418d07011d84313d): Error starting userland proxy: listen tcp 0.0.0.0:51998: bind: address already in use. [how] because ssh-r will bind ports 50000-51999, set ip_local_port_range to prevent occupation. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/common | 1 + 1 file changed, 1 insertion(+) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 523438c..5eb9f76 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -12,6 +12,7 @@ cat >> /etc/sysctl.conf <<EOF net.ipv4.ip_forward=1 net.ipv6.bindv6only=1 vm.max_map_count=262144 +net.ipv4.ip_local_port_range = 1024 48999 EOF sysctl -p -- 2.23.0

1 0