- Compass-ci - mailweb.openeuler.org

[PATCH v6 compass-ci 1/3] addsoftware/run: change the example os version
by Xu Xijian 31 Oct '20

31 Oct '20

[why] As the old os version centos/aarch64/76 is not exist, change the version number 76 in given example. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- container/add-software/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container/add-software/run b/container/add-software/run index 99490ee..f4c6833 100755 --- a/container/add-software/run +++ b/container/add-software/run @@ -5,8 +5,8 @@ [ -L "$1/vmlinuz" -a -n "$2" ] || { cat << 'EOF' Example usage: - 1> ./run /os/centos/aarch64/76 pack1 pack2 ... - 2> ./run /os/centos/aarch64/76 $(show-depends-packages centos) + 1> ./run /os/centos/aarch64/7.6.1810 pack1 pack2 ... + 2> ./run /os/centos/aarch64/7.6.1810 $(show-depends-packages centos) centos is an adaption file contain packages mapping from debian to centos, the whole path is '$LKP_SRC/distro/adaptation/centos'. EOF -- 2.23.0

1 0

[PATCH v5 compass-ci 2/2] job.cr: add a key "kernel_version" for initramfs
by Xu Xijian 31 Oct '20

31 Oct '20

When run job with initramfs, there is a default combination of kernel, modules and headers, and I add a key "kernel_version" to make it optional. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- src/lib/job.cr | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 0fd57e0..8bf7a65 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -87,6 +87,10 @@ class Job kernel_append_root kernel_params docker_image + kernel_version + vmlinuz_path + modules_path + headers_path ) macro method_missing(call) @@ -135,6 +139,7 @@ class Job set_result_service() set_os_mount() set_depends_initrd() + set_kernel_version() set_initrds_uri() set_kernel_uri() set_kernel_append_root() @@ -293,9 +298,22 @@ class Job return true end + private def set_kernel_version + boot_dir = "#{SRV_OS}/#{os_dir}/boot" + if self["kernel_version"]? + self["vmlinuz_path"] = "#{boot_dir}/vmlinuz-#{kernel_version}" + self["modules_path"] = "#{boot_dir}/modules-#{kernel_version}.cgz" + self["headers_path"] = "#{boot_dir}/headers-#{kernel_version}.cgz" + else + self["vmlinuz_path"] = "#{boot_dir}/vmlinuz" + self["modules_path"] = "#{boot_dir}/modules.cgz" + self["headers_path"] = "#{boot_dir}/headers.cgz" + end + end + private def set_kernel_uri self["kernel_uri"] = "kernel #{OS_HTTP_PREFIX}" + - "#{JobHelper.service_path("#{SRV_OS}/#{os_dir}/vmlinuz")}" + "#{JobHelper.service_path("#{vmlinuz_path}")}" end private def common_initrds @@ -316,6 +334,10 @@ class Job "#{JobHelper.service_path("#{osimage_dir}/current")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{osimage_dir}/run-ipconfig.cgz")}" + temp_initrds << "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{modules_path}")}" + temp_initrds << "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{headers_path}")}" temp_initrds.concat(initrd_deps.split(/ /)) unless initrd_deps.empty? temp_initrds.concat(initrd_pkg.split(/ /)) unless initrd_pkg.empty? -- 2.23.0

1 0

[PATCH v5 compass-ci 1/2] addsoftware/run: change the example os version
by Xu Xijian 31 Oct '20

31 Oct '20

[why] As the old os version centos/aarch64/76 is not exist, change the version number 76 in given example. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- container/add-software/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container/add-software/run b/container/add-software/run index 99490ee..f4c6833 100755 --- a/container/add-software/run +++ b/container/add-software/run @@ -5,8 +5,8 @@ [ -L "$1/vmlinuz" -a -n "$2" ] || { cat << 'EOF' Example usage: - 1> ./run /os/centos/aarch64/76 pack1 pack2 ... - 2> ./run /os/centos/aarch64/76 $(show-depends-packages centos) + 1> ./run /os/centos/aarch64/7.6.1810 pack1 pack2 ... + 2> ./run /os/centos/aarch64/7.6.1810 $(show-depends-packages centos) centos is an adaption file contain packages mapping from debian to centos, the whole path is '$LKP_SRC/distro/adaptation/centos'. EOF -- 2.23.0

1 0

[PATCH v4 compass-ci 2/2] job.cr: add a key "kernel_version" for initramfs
by Xu Xijian 31 Oct '20

31 Oct '20

When run job with initramfs, there is a default combination of kernel, modules and headers, and I add a key "kernel_version" to make it optional. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- src/lib/job.cr | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 0fd57e0..2656635 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -87,6 +87,10 @@ class Job kernel_append_root kernel_params docker_image + kernel_version + vmlinuz_path + modules_path + headers_path ) macro method_missing(call) @@ -135,6 +139,7 @@ class Job set_result_service() set_os_mount() set_depends_initrd() + set_kernel_version() set_initrds_uri() set_kernel_uri() set_kernel_append_root() @@ -293,9 +298,22 @@ class Job return true end + private def set_kernel_version + boot_dir = "#{SRV_OS}/#{os_dir}/boot" + if self["kernel_version"]? + self["vmlinuz_path"] = "#{boot_dir}/vmlinuz-#{kernel_version}" + self["modules_path"] = "#{boot_dir}/modules-#{kernel_version}.cgz" + self["headers_path"] = "#{boot_dir}/headers-#{kernel_version}.cgz" + else + self["vmlinuz_path"] = "#{boot_dir}/vmlinuz" + self["modules_path"] = "#{boot_dir}/modules.cgz" + self["headers_path"] = "#{boot_dir}/headers.cgz" + end + end + private def set_kernel_uri self["kernel_uri"] = "kernel #{OS_HTTP_PREFIX}" + - "#{JobHelper.service_path("#{SRV_OS}/#{os_dir}/vmlinuz")}" + "#{JobHelper.service_path("#{vmlinuz_path}")}" end private def common_initrds @@ -312,10 +330,15 @@ class Job temp_initrds = [] of String osimage_dir = "#{SRV_INITRD}/osimage/#{os_dir}" + boot_dir = "#{SRV_OS}/#{os_dir}/boot" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{osimage_dir}/current")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{osimage_dir}/run-ipconfig.cgz")}" + temp_initrds << "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{modules_path}")}" + temp_initrds << "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{headers_path}")}" temp_initrds.concat(initrd_deps.split(/ /)) unless initrd_deps.empty? temp_initrds.concat(initrd_pkg.split(/ /)) unless initrd_pkg.empty? -- 2.23.0

1 0

[PATCH v4 compass-ci 1/2] addsoftware/run: change the example os version
by Xu Xijian 31 Oct '20

31 Oct '20

[why] As the old os version centos/aarch64/76 is not exist, change the version number 76 in given example. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- container/add-software/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container/add-software/run b/container/add-software/run index 99490ee..f4c6833 100755 --- a/container/add-software/run +++ b/container/add-software/run @@ -5,8 +5,8 @@ [ -L "$1/vmlinuz" -a -n "$2" ] || { cat << 'EOF' Example usage: - 1> ./run /os/centos/aarch64/76 pack1 pack2 ... - 2> ./run /os/centos/aarch64/76 $(show-depends-packages centos) + 1> ./run /os/centos/aarch64/7.6.1810 pack1 pack2 ... + 2> ./run /os/centos/aarch64/7.6.1810 $(show-depends-packages centos) centos is an adaption file contain packages mapping from debian to centos, the whole path is '$LKP_SRC/distro/adaptation/centos'. EOF -- 2.23.0

1 0

[PATCH lkp-tests] jobs: rename hackbench-20.yaml and fix datasize to loops.
by Zhang Yale 31 Oct '20

31 Oct '20

[Why] hackbench-git is an old version required by the customer. The hackbench-git usage: hackbench [-pipe] <num groups> [process|thread] [loops] It's different from hackbench-1.8 version. The hackbench-1.8 usage: hackbench [-p|--pipe] [-s|--datasize <bytes>] [-l|--loops <num loops>] [-g|groups <num groups] [-f|--fds ,num fds>] [-T|--threads] [-P|--process] [--help] So add hackbench-git.yaml for users. Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- jobs/{hackbench-20.yaml => hackbench-git.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jobs/{hackbench-20.yaml => hackbench-git.yaml} (100%) diff --git a/jobs/hackbench-20.yaml b/jobs/hackbench-git.yaml similarity index 100% rename from jobs/hackbench-20.yaml rename to jobs/hackbench-git.yaml -- 2.23.0

1 0

[PATCH v5 lkp-tests] hackbench/PKGBUILD: fix source
by Zhang Yale 31 Oct '20

31 Oct '20

[Why] Old source "https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-1.8.tar.gz" is not available, So change the source. Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- pkg/hackbench/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/hackbench/PKGBUILD b/pkg/hackbench/PKGBUILD index 797a00e6..842b2596 100644 --- a/pkg/hackbench/PKGBUILD +++ b/pkg/hackbench/PKGBUILD @@ -2,9 +2,9 @@ pkgname=hackbench pkgver=1.8 pkgrel=1 arch=('i386' 'x86_64') -url="https://www.kernel.org/pub/linux/utils/rt-tests" +url="https://git.kernel.org/pub/scm/utils/rt-tests" license=('GPL') -source=("https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-${pkgver}.tar.gz") +source=("https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/rt-test…") sha256sums=('SKIP') package() { -- 2.23.0

1 0

[PATCH v4 lkp-tests] hackbench/PKGBUILD: fix source
by Zhang Yale 31 Oct '20

31 Oct '20

[Why] Old source "https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-1.8.tar.gz" is not available, So change the source. Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- pkg/hackbench/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/hackbench/PKGBUILD b/pkg/hackbench/PKGBUILD index 797a00e6..f8880b64 100644 --- a/pkg/hackbench/PKGBUILD +++ b/pkg/hackbench/PKGBUILD @@ -4,7 +4,7 @@ pkgrel=1 arch=('i386' 'x86_64') url="https://www.kernel.org/pub/linux/utils/rt-tests" license=('GPL') -source=("https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-${pkgver}.tar.gz") +source=("https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/rt-test…") sha256sums=('SKIP') package() { -- 2.23.0

1 1

[PATCH lkp-tests] sshd: modify MAIL_PORT to 49000
by Zhang Yale 31 Oct '20

31 Oct '20

[Why] When we used 11312 as MAIL_PORT, It may be occupied by taskqueue-3060. So we changed MAIL_PORT to 49000. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- daemon/sshd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/sshd b/daemon/sshd index 82db61a6..1a1d59b4 100755 --- a/daemon/sshd +++ b/daemon/sshd @@ -90,7 +90,7 @@ run_email() [ -n "$my_email" ] || return 0 my_username=$(echo "$my_email" | awk -F '@' '{print $1}') compose_email - curl -XPOST "${MAIL_HOST:-$LKP_SERVER}:${MAIL_PORT:-11312}/send_mail_text" -d "$data" + curl -XPOST "${MAIL_HOST:-$LKP_SERVER}:${MAIL_PORT:-49000}/send_mail_text" -d "$data" } run_ssh -- 2.23.0

2 1

review star
by Wu Fengguang 30 Oct '20

30 Oct '20

Yuchuan is our review star, thanks Yuchuan! wfg@crystal /c/todo/bin% ./review-star Review email records in the last 7 days total review paragraph point people 89 43 110 18 Wu Fengguang 62 36 41 12 Cao Xueliang 87 35 37 12 Wei Jihui 13 11 33 13 Yu Chuan 53 16 30 0 Xiao Shenwei 21 10 28 6 Zhang Yuhang 40 9 28 10 Luan Shengde 34 7 25 6 Tong Qunfeng 44 24 25 3 Xu Xijian 41 16 24 1 Liu Yinsi 33 14 24 0 Wang Yong 40 18 22 6 Wu Zhende 32 18 21 3 Zhang Yu 15 12 21 3 Lin Jiaxin 29 23 18 7 Liu Shaofei 17 9 16 0 Li Yuanchao 20 7 14 3 Hu Xuejiao 85 9 13 0 Wang Chenglong 11 11 12 2 Sun Yukui 18 5 11 1 Lu Weitao 44 11 9 1 Zhang Yale 16 2 5 0 Zhang Dewan 15 6 5 2 Cui Yili 22 5 5 1 Li Ping 17 4 4 1 Bai Jing 20 3 4 0 Ren Wen 39 2 3 1 Lu Kaiyi 1 1 2 0 Zhou Shengrui 1 0 0 0 Shi Zhichao

1 0

git count
by Wu Fengguang 30 Oct '20

30 Oct '20

Shengde is our code star, thanks Shengde! wfg@crystal /c/todo% bin/git-count 11 Luan Shengde 9 Wu Zhende 4 Bai Jing 4 Tong Qunfeng 4 Liu Yinsi 3 Cao Xueliang 3 Wei Jihui 3 Zhang Yale 3 Wang Yong 2 Hu Xuejiao 2 Wu Fengguang 2 Cui Yili 2 Ren Wen 2 Li Ping 1 Xu Xijian 1 Liu Shaofei 1 Xiao Shenwei 1 Zhang Yu 1 Wang Chenglong 1 Li Yuanchao 1 Zhang Yuhang 1 Lin Jiaxin 1 Zhou Shengrui 0 Du Kaitian 0 Lu Weitao 0 Sun Yukui 0 Shi Zhichao 0 Yu Chuan 0 Zhang Dewan 0 Lu Kaiyi

1 0

[PATCH v2 lkp-tests 2/4] change the path for upload files
by Li Ping 30 Oct '20

30 Oct '20

[why] upload_files -t result the interface /result does not exist cause curl error --- tests/analyze-suspend | 10 +++++----- tests/suspend-stress | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/analyze-suspend b/tests/analyze-suspend index 59bb75c8..d9a95241 100755 --- a/tests/analyze-suspend +++ b/tests/analyze-suspend @@ -113,8 +113,8 @@ do #upload log files in case system crashes dmesg > $f_dmesg - upload_files -t result $f_log - upload_files -t result $f_dmesg + upload_files -t results $f_log + upload_files -t results $f_dmesg #make sure the test either PASS or FAIL, no INCOMPLETE echo "test started" > $f_lkp_output @@ -125,7 +125,7 @@ do if [ ! -z $f_result ] then echo $(date +%T): uploading test result $f_result ... >> $f_log - upload_files -t result $f_result + upload_files -t results $f_result rm -rf $f_result echo $(date +%T): done ... >> $f_log fi @@ -144,5 +144,5 @@ done echo analyze_suspend test done rm $f_lkp_output -upload_files -t result $f_log -upload_files -t result ./suspend-* +upload_files -t results $f_log +upload_files -t results ./suspend-* diff --git a/tests/suspend-stress b/tests/suspend-stress index 020858bd..bffa6db0 100755 --- a/tests/suspend-stress +++ b/tests/suspend-stress @@ -118,8 +118,8 @@ do fi dmesg > $dmesg_file - upload_files -t result $log_file - upload_files -t result $dmesg_file + upload_files -t results $log_file + upload_files -t results $dmesg_file #make sure test either PASS or FAIL, no INCOMPLETE echo "test started" > $f_lkp_output upload_files $f_lkp_output -- 2.23.0

1 1

[PATCH v2 lkp-tests 1/4] sshd: echo error message
by Li Ping 30 Oct '20

30 Oct '20

--- daemon/sshd | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/daemon/sshd b/daemon/sshd index 1a1d59b4..6e5ef439 100755 --- a/daemon/sshd +++ b/daemon/sshd @@ -14,11 +14,15 @@ sshr_ip=$LKP_SERVER run_ssh() { - [ -n "$pub_key" ] || return - umask 0077 - mkdir -p /root/.ssh - echo "$pub_key" > /root/.ssh/authorized_keys - systemctl start sshd + if [ -n "$pub_key" ] + then + vumask 0077 + mkdir -p /root/.ssh + echo "$pub_key" > /root/.ssh/authorized_keys + systemctl start sshd + else + echo "please check whether your pub_key exists" + fi } data_success() -- 2.23.0

1 1

[PATCH v5 lkp-tests 1/2] jobs/iozone-bs.yaml: add iozone-bs.yaml
by Lu Kaiyi 30 Oct '20

30 Oct '20

[why] need test different block_size value Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- jobs/iozone-bs.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 jobs/iozone-bs.yaml diff --git a/jobs/iozone-bs.yaml b/jobs/iozone-bs.yaml new file mode 100644 index 00000000..868979fc --- /dev/null +++ b/jobs/iozone-bs.yaml @@ -0,0 +1,19 @@ +suite: iozone +category: benchmark + +file_size: 4g +write_rewrite: true +read_reread: true +random_read_write: true + +block_size: +- 64k +- 256k +- 1m +- 4m +- 16m + +disk: 1HDD +fs: xfs +iosched: kyber +iozone: -- 2.23.0

1 0

[PATCH v3 compass-ci] auto_submit.yaml: os_version needs specific version number now
by Li Yuanchao 30 Oct '20

30 Oct '20

[why] when submit job with cent_os 7.6, can not get os correctly [err msg] submit api-avx2neon.yaml failed, got job_id=0, error: Error resolving real path of '/srv/initrd/osimage/cent_os/aarch64/7.6/current': No such file or directory Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- sbin/auto_submit.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/auto_submit.yaml b/sbin/auto_submit.yaml index 6d7dc2a..f741b79 100644 --- a/sbin/auto_submit.yaml +++ b/sbin/auto_submit.yaml @@ -1,8 +1,8 @@ AvxToNeon/AvxToNeon: -- testbox=vm-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml +- testbox=vm-2p8g os=centos os_version=7.6.1810 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml compass-ci/compass-ci: -- testbox=vm-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml -- testbox=vm-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml -- testbox=vm-2p8g os=debian os_version=sid os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-2p8g os=centos os_version=7.6.1810 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-2p8g os=debian os_version=sid os_mount=initramfs os_arch=aarch64 deploy-cci.yaml archlinux: -- testbox=vm-2p16g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml +- testbox=vm-2p16g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml -- 2.23.0

1 0

[PATCH v7 compass-ci 2/5] container/ntp-server: start-server.sh
by Wang Chenglong 30 Oct '20

30 Oct '20

[What] start ntp-server and specify the log file. Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/start-server.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 container/ntp-server/start-server.sh diff --git a/container/ntp-server/start-server.sh b/container/ntp-server/start-server.sh new file mode 100755 index 0000000..bf87bd5 --- /dev/null +++ b/container/ntp-server/start-server.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +/usr/sbin/ntpd -g -l /var/log/ntpstats/ntpd.log + +exec "$@" -- 2.23.0

3 6

[PATCH compass-ci] lib/job.cr: fix pp dir layout
by Wang Yong 30 Oct '20

30 Oct '20

[Why] due to cci-makepkg and cci-depends dir layout change, pp need update together Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- src/lib/job.cr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 7fbc414..955bc4b 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -434,8 +434,8 @@ class Job program = $1 end - deps_dest_file = "#{SRV_INITRD}/deps/#{mount_type}/#{os_dir}/#{program}.cgz" - pkg_dest_file = "#{SRV_INITRD}/pkg/#{mount_type}/#{os_dir}/#{program}.cgz" + deps_dest_file = "#{SRV_INITRD}/deps/#{mount_type}/#{os_dir}/#{program}/latest.cgz" + pkg_dest_file = "#{SRV_INITRD}/pkg/#{mount_type}/#{os_dir}/#{program}/latest.cgz" if File.exists?(deps_dest_file) initrd_deps_arr << "#{initrd_http_prefix}" + JobHelper.service_path(deps_dest_file) -- 2.23.0

4 5

[PATCH v6 lkp-tests 2/2] tests/iozone: add specified parameter for iozone test
by Lu Kaiyi 30 Oct '20

30 Oct '20

[why] need to test write, rewrite, read, reread, random write, random read for different block_size. [how] add judement for variable $block_size to execute iozone command with specificed parameter. Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- tests/iozone | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/tests/iozone b/tests/iozone index 3095ce80..db6a588f 100755 --- a/tests/iozone +++ b/tests/iozone @@ -1,13 +1,48 @@ #!/bin/sh - +# - block_size +# - file_size +# - write_rewrite +# - read_reread +# - random_read_write +# - read_backwards +# - rewrite_record +# - stride_read +# - fwrite_refwrite +# - fread_refread +# - random_mix +# - pwrite_repwrite +# - pread_repread +# - pwritev_repwritev +# - preadv_repreadv ## IOzone is a filesystem benchmark tool. The benchmark generates ## and measures a variety of file operations. . $LKP_SRC/lib/reproduce-log.sh +cmd="iozone" +if [ -n "$block_size" ]; then + cmd+=" -r $block_size" + [ -n "$file_size" ] && cmd+=" -s $file_size" + [ -n "$write_rewrite" ] && cmd+=" -i 0" + [ -n "$read_reread" ] && cmd+=" -i 1" + [ -n "$random_read_write" ] && cmd+=" -i 2" + [ -n "$read_backwards" ] && cmd+=" -i 3" + [ -n "$rewrite_record" ] && cmd+=" -i 4" + [ -n "$stride_read" ] && cmd+=" -i 5" + [ -n "$fwrite_refwrite" ] && cmd+=" -i 6" + [ -n "$fread_refread" ] && cmd+=" -i 7" + [ -n "$random_mix" ] && cmd+=" -i 8" + [ -n "$pwrite_repwrite" ] && cmd+=" -i 9" + [ -n "$pread_repread" ] && cmd+=" -i 10" + [ -n "$pwritev_repwritev" ] && cmd+=" -i 11" + [ -n "$preadv_repreadv" ] && cmd+=" -i 12" +else + cmd+=" -a" +fi +cmd+=" -f $mnt/iozonetest" + for mnt in $mount_points do - cmd="iozone -a -f $mnt/iozonetest" log_echo "$cmd &" $cmd > $TMP/iozone-$i & i=$((i+1)) -- 2.23.0

1 0

[PATCH v6 lkp-tests 1/2] jobs/iozone_with_block_size.yaml: add iozone_with_block_size.yaml
by Lu Kaiyi 30 Oct '20

30 Oct '20

[why] need test different block_size value Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- jobs/iozone-bs.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 jobs/iozone-bs.yaml diff --git a/jobs/iozone-bs.yaml b/jobs/iozone-bs.yaml new file mode 100644 index 00000000..868979fc --- /dev/null +++ b/jobs/iozone-bs.yaml @@ -0,0 +1,19 @@ +suite: iozone +category: benchmark + +file_size: 4g +write_rewrite: true +read_reread: true +random_read_write: true + +block_size: +- 64k +- 256k +- 1m +- 4m +- 16m + +disk: 1HDD +fs: xfs +iosched: kyber +iozone: -- 2.23.0

1 0

[PATCH v7 compass-ci 5/5] container/ntp-server: start
by Wang Chenglong 30 Oct '20

30 Oct '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/start | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 container/ntp-server/start diff --git a/container/ntp-server/start b/container/ntp-server/start new file mode 100755 index 0000000..d5e3394 --- /dev/null +++ b/container/ntp-server/start @@ -0,0 +1,16 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +. $CCI_SRC/container/defconfig.sh + +docker_rm ntp-server +cmd=( + docker run + -id + --name=ntp-server + -p 123:123/udp + ntp-server +) + +"${cmd[@]}" -- 2.23.0

1 0

[PATCH v7 compass-ci 4/5] container/ntp-server: ntp.conf
by Wang Chenglong 30 Oct '20

30 Oct '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/ntp.conf | 60 +++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 container/ntp-server/ntp.conf diff --git a/container/ntp-server/ntp.conf b/container/ntp-server/ntp.conf new file mode 100644 index 0000000..67dd1b0 --- /dev/null +++ b/container/ntp-server/ntp.conf @@ -0,0 +1,60 @@ +# For more information about this file, see the ntp.conf(5) man page. + +# Record the frequency of the system clock. +driftfile /var/lib/ntp/drift + +# Permit time synchronization with our time source, but do not +# permit the source to query or modify the service on this system. +restrict default nomodify notrap nopeer noepeer noquery + +# Permit association with pool servers. +restrict source nomodify notrap noepeer noquery + +# Permit all access over the loopback interface. This could +# be tightened as well, but to do so would effect some of +# the administrative functions. +restrict 127.0.0.1 +restrict ::1 + +# Hosts on local network are less restricted. +restrict 172.0.0.0 mask 255.0.0.0 nomodify notrap + +# Use public servers from the pool.ntp.org project. +# Please consider joining the pool (http://www.pool.ntp.org/join.html) +# pool 2.openEuler.pool.ntp.org iburst +server 0.centos.pool.ntp.org +server 0.asia.pool.ntp.org +server ntp.sjtu.edu.cn +server ntp1.aliyun.com + +# When all ntp servers on Internet are inaccessible, it will use +# it's local time to give service to the ntp clients. +# If not set, the ntp server will go to stratum 16 and cannot serve +# any ntp clients when it loses connection with upstream ntp servers. +# This is common in a LAN environment isolated with Internet. +server 127.127.1.0 +fudge 127.127.1.0 stratum 8 + +# Reduce the maximum number of servers used from the pool. +tos maxclock 5 + +# Enable public key cryptography. +# crypto + +includefile /etc/ntp/crypto/pw + +# Key file containing the keys and key identifiers used when operating +# with symmetric key cryptography. +keys /etc/ntp/keys + +# Specify the key identifiers which are trusted. +# trustedkey 4 8 42 + +# Specify the key identifier to use with the ntpdc utility. +# requestkey 8 + +# Specify the key identifier to use with the ntpq utility. +# controlkey 8 + +# Enable writing of statistics records. +# statistics clockstats cryptostats loopstats peerstats -- 2.23.0

1 0

[PATCH v7 compass-ci 3/5] container/ntp-server: build
by Wang Chenglong 30 Oct '20

30 Oct '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/build | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 container/ntp-server/build diff --git a/container/ntp-server/build b/container/ntp-server/build new file mode 100755 index 0000000..7826fb2 --- /dev/null +++ b/container/ntp-server/build @@ -0,0 +1,5 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +docker build -t ntp-server . -- 2.23.0

1 0

[PATCH v3 compass-ci] sparrow/4-docker/buildall: don't skip sub-fluentd
by Wu Zhende 30 Oct '20

30 Oct '20

[Why] Now, primary server also need to startup sub-fluentd. It collects Docker logs and VM serial port logs on the server. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- sparrow/4-docker/buildall | 1 - 1 file changed, 1 deletion(-) diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index 6e0a2f8..eb24500 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -30,7 +30,6 @@ do_one() mkdir $tmpdir/$container_name 2>/dev/null && ( cd $container - [ "$container_name" == 'sub-fluentd' ] && exit if [ "$action" != "reboot" ]; then [ -x build ] && ./build [ -x install ] && ./install -- 2.23.0

1 0

Re: [PATCH v2 compass-ci] sparrow/4-docker/buildall: container sub-fluentd don't exit
by Li Ping 30 Oct '20

30 Oct '20

dont't ==> doesn't Reply-To: In-Reply-To: <20201030042516.1237314-1-wuzhende666(a)163.com> On Fri, Oct 30, 2020 at 12:25:16PM +0800, Wu Zhende wrote: >[Why] > Now, primary server also need to startup sub-fluentd. > It collects Docker logs and VM serial port logs on the server. > >Signed-off-by: Wu Zhende <wuzhende666(a)163.com> >--- > sparrow/4-docker/buildall | 1 - > 1 file changed, 1 deletion(-) > >diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall >index 6e0a2f8..eb24500 100755 >--- a/sparrow/4-docker/buildall >+++ b/sparrow/4-docker/buildall >@@ -30,7 +30,6 @@ do_one() > mkdir $tmpdir/$container_name 2>/dev/null && > ( > cd $container >- [ "$container_name" == 'sub-fluentd' ] && exit > if [ "$action" != "reboot" ]; then > [ -x build ] && ./build > [ -x install ] && ./install >-- >2.23.0 >

1 0

[PATCH v2 compass-ci] sparrow/4-docker/buildall: container sub-fluentd don't exit
by Wu Zhende 30 Oct '20

30 Oct '20

[Why] Now, primary server also need to startup sub-fluentd. It collects Docker logs and VM serial port logs on the server. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- sparrow/4-docker/buildall | 1 - 1 file changed, 1 deletion(-) diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index 6e0a2f8..eb24500 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -30,7 +30,6 @@ do_one() mkdir $tmpdir/$container_name 2>/dev/null && ( cd $container - [ "$container_name" == 'sub-fluentd' ] && exit if [ "$action" != "reboot" ]; then [ -x build ] && ./build [ -x install ] && ./install -- 2.23.0

1 0