- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci 1/3] sparrow: systemctl restart docker
by Hu Xuejiao 14 Oct '20

14 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/3-code/os/debian | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sparrow/3-code/os/debian b/sparrow/3-code/os/debian index 171b979..efb4fcb 100644 --- a/sparrow/3-code/os/debian +++ b/sparrow/3-code/os/debian @@ -2,3 +2,5 @@ cat >> /etc/default/docker <<EOF DOCKER_OPTS="--dns 114.114.114.114" EOF + +systemctl restart docker -- 2.23.0

1 0

[PATCH compass-ci] fix: Error: unexpected token: or in job.cr
by Cao Xueliang 14 Oct '20

14 Oct '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/lib/job.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 6abab9a..32aa662 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -324,7 +324,7 @@ class Job if "#{os_mount}" == "initramfs" temp_initrds.concat(initramfs_initrds()) - elsif "#{os_mount}" == "nfs" or "#{os_mount}" == "cifs" + elsif "#{os_mount}" == "nfs" || "#{os_mount}" == "cifs" temp_initrds.concat(nfs_cifs_initrds()) end -- 2.23.0

1 0

[PATCH compass-ci] remove from hi1620 from vm-hi1620 and vm-pxe-hi1620
by Bai Jing 14 Oct '20

14 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- doc/tutorial.md | 2 +- providers/multi-qemu | 2 +- providers/my-qemu.sh | 2 +- providers/qemu.sh | 2 +- sbin/auto_submit.yaml | 8 ++++---- sparrow/6-test/qemu | 4 ++-- src/spec/scheduler/tools_spec.cr | 6 +++--- user-client/helper/iperf.yaml | 2 +- user-client/helper/redis_op/redis_op_zrange | 4 ++-- user-client/helper/redis_op/redis_op_zremrangebyrank | 2 +- user-client/helper/redis_op_gc/consistency.rb | 2 +- user-client/helper/redis_op_gc/taskqueue_snap.rb | 8 ++++---- user-client/jobs/iperf-pxe.yaml | 4 ++-- user-client/jobs/iperf-vm.yaml | 2 +- user-client/maintain/walk-os-test/iperf-walk-os.yaml | 2 +- user-client/maintain/walk-os-test/my-qemu.sh | 2 +- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/doc/tutorial.md b/doc/tutorial.md index 85c9834..03f1342 100644 --- a/doc/tutorial.md +++ b/doc/tutorial.md @@ -101,7 +101,7 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM SUT/schduler/部署等资源相关变量。 ```yaml - testbox: vm-hi1620-2p8g + testbox: vm-2p8g os: openeuler os_version: 20.03 os_arch: aarch64 diff --git a/providers/multi-qemu b/providers/multi-qemu index 72453fb..23e0451 100755 --- a/providers/multi-qemu +++ b/providers/multi-qemu @@ -8,7 +8,7 @@ require 'fileutils' PWD = Dir.pwd # Run multiple QEMU in parallel -HOSTNAME = ARGV[0] || "vm-hi1620-2p8g--#{ENV['USER']}" +HOSTNAME = ARGV[0] || "vm-2p8g--#{ENV['USER']}" NR_VM = ARGV[1] || 1 def run(seqno) diff --git a/providers/my-qemu.sh b/providers/my-qemu.sh index 2f20f67..954d3a0 100755 --- a/providers/my-qemu.sh +++ b/providers/my-qemu.sh @@ -3,7 +3,7 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. [[ $tbox_group ]] || -tbox_group=vm-hi1620-2p8g +tbox_group=vm-2p8g export hostname=$tbox_group--$USER-$$ $CCI_SRC/providers/qemu.sh diff --git a/providers/qemu.sh b/providers/qemu.sh index 786a7aa..d97fd85 100755 --- a/providers/qemu.sh +++ b/providers/qemu.sh @@ -8,7 +8,7 @@ load_cci_defaults -: ${hostname:="vm-hi1620-1p1g-1"} +: ${hostname:="vm-1p1g-1"} # unicast prefix: x2, x6, xA, xE export mac=$(echo $hostname | md5sum | sed 's/^$..$$..$$..$$..$$..$.*$/0a-\1-\2-\3-\4-\5/') echo hostname: $hostname diff --git a/sbin/auto_submit.yaml b/sbin/auto_submit.yaml index 7076cca..1096014 100644 --- a/sbin/auto_submit.yaml +++ b/sbin/auto_submit.yaml @@ -1,7 +1,7 @@ AvxToNeon/AvxToNeon: -- testbox=vm-hi1620-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 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml compass-ci/compass-ci: -- testbox=vm-hi1620-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml -- testbox=vm-hi1620-2p8g os=centos os_version=7.6 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 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml archlinux: -- testbox=vm-hi1620-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml +- testbox=vm-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml diff --git a/sparrow/6-test/qemu b/sparrow/6-test/qemu index 1e92a47..107204f 100755 --- a/sparrow/6-test/qemu +++ b/sparrow/6-test/qemu @@ -12,5 +12,5 @@ run_job() } dmidecode -s system-product-name | grep -iq "virtual" && exit -run_job vm-hi1620-2p8g -run_job vm-pxe-hi1620-2p8g +run_job vm-2p8g +run_job vm-pxe-2p8g diff --git a/src/spec/scheduler/tools_spec.cr b/src/spec/scheduler/tools_spec.cr index 0a71af0..780fce3 100644 --- a/src/spec/scheduler/tools_spec.cr +++ b/src/spec/scheduler/tools_spec.cr @@ -58,9 +58,9 @@ describe Public do result.should eq testgroup_name end - it "instance: vm-pxe-hi1620-1p1g-chief-1338976" do - testbox = "vm-pxe-hi1620-1p1g-chief-1338976" - tbox_group = "vm-pxe-hi1620-1p1g-chief" + it "instance: vm-pxe-1p1g--chief-1338976" do + testbox = "vm-pxe-1p1g--chief-1338976" + tbox_group = "vm-pxe-1p1g--chief" result = Public.get_tbox_group_name(testbox) result.should eq tbox_group diff --git a/user-client/helper/iperf.yaml b/user-client/helper/iperf.yaml index 06980c3..1509470 100644 --- a/user-client/helper/iperf.yaml +++ b/user-client/helper/iperf.yaml @@ -12,7 +12,7 @@ if role client: iperf: protocol: tcp job_origin: jobs/iperf.yaml -testbox: vm-pxe-hi1620-1p1g-1 +testbox: vm-pxe-1p1g-1 arch: x86_64 node_roles: server client diff --git a/user-client/helper/redis_op/redis_op_zrange b/user-client/helper/redis_op/redis_op_zrange index ce4d6e7..3b1c074 100755 --- a/user-client/helper/redis_op/redis_op_zrange +++ b/user-client/helper/redis_op/redis_op_zrange @@ -4,14 +4,14 @@ if [ $# -gt 1 ]; then echo "USAGE: $0 # find all your job" - echo "e.g.: $0 queues/sched/vm-hi1620-2p8g/in_process # find jobs in queue" + echo "e.g.: $0 queues/sched/vm-2p8g/in_process # find jobs in queue" exit 1 fi if [[ $1 ]]; then key_name=$1 else - [[ $tbox_group ]] || tbox_group=vm-hi1620-2p8g + [[ $tbox_group ]] || tbox_group=vm-2p8g key_name=queues/sched/$tbox_group-$USER/ready fi diff --git a/user-client/helper/redis_op/redis_op_zremrangebyrank b/user-client/helper/redis_op/redis_op_zremrangebyrank index 6b6365b..5a2d03f 100755 --- a/user-client/helper/redis_op/redis_op_zremrangebyrank +++ b/user-client/helper/redis_op/redis_op_zremrangebyrank @@ -4,7 +4,7 @@ if [ $# != 3 ]; then echo "USAGE: $0 key min max" - echo "e.g.: $0 queues/sched/vm-hi1620-2p8g/in_process 10 20" + echo "e.g.: $0 queues/sched/vm-2p8g/in_process 10 20" exit 1 fi diff --git a/user-client/helper/redis_op_gc/consistency.rb b/user-client/helper/redis_op_gc/consistency.rb index f81c68f..29dd401 100755 --- a/user-client/helper/redis_op_gc/consistency.rb +++ b/user-client/helper/redis_op_gc/consistency.rb @@ -35,7 +35,7 @@ puts "options: #{options.inspect}" # it records all "task id" and task's current redis key value # like: # 25536 -# {"add_time":1596876735.944146, "queue":"sched/vm-hi1620-2p8g--$USER/ready"} +# {"add_time":1596876735.944146, "queue":"sched/vm-2p8g--$USER/ready"} cmd = "#{CMD_BASE} queues/id2content , hgetall" result = `#{cmd}`.chomp results = result.split("\n") diff --git a/user-client/helper/redis_op_gc/taskqueue_snap.rb b/user-client/helper/redis_op_gc/taskqueue_snap.rb index f0a7034..b32af8d 100755 --- a/user-client/helper/redis_op_gc/taskqueue_snap.rb +++ b/user-client/helper/redis_op_gc/taskqueue_snap.rb @@ -12,10 +12,10 @@ if !ARGV.empty? puts "input: #{__FILE__}" puts 'output: taskqueue_snap_yyyymmdd.md' puts ' # id, first add time, current queue' - puts ' # 14703, 2020-07-22 14:33, sched/vm-hi1620-2p8g-xxx/in_process' - puts ' # 14831, 2020-07-22 17:51, sched/vm-hi1620-2p8g-xxx/in_process' - puts ' # crystal.89630, 2020-09-23 11:19, sched/vm-hi1620-2p8g/in_process' - puts ' # crystal.89667, 2020-09-23 11:20, sched/vm-hi1620-2p8g/in_process' + puts ' # 14703, 2020-07-22 14:33, sched/vm-2p8g--xxx/in_process' + puts ' # 14831, 2020-07-22 17:51, sched/vm-2p8g--xxx/in_process' + puts ' # crystal.89630, 2020-09-23 11:19, sched/vm-2p8g/in_process' + puts ' # crystal.89667, 2020-09-23 11:20, sched/vm-2p8g/in_process' exit end diff --git a/user-client/jobs/iperf-pxe.yaml b/user-client/jobs/iperf-pxe.yaml index ccf5c9d..209c5d6 100644 --- a/user-client/jobs/iperf-pxe.yaml +++ b/user-client/jobs/iperf-pxe.yaml @@ -16,7 +16,7 @@ if role client: iperf: protocol: tcp job_origin: jobs/iperf.yaml -testbox: vm-pxe-hi1620-2p8g-1 +testbox: vm-pxe-2p8g-1 arch: x86_64 node_roles: server client @@ -35,7 +35,7 @@ if role client: iperf: protocol: tcp job_origin: jobs/iperf.yaml -testbox: vm-pxe-hi1620-2p8g-1 +testbox: vm-pxe-2p8g-1 arch: x86_64 node_roles: server client diff --git a/user-client/jobs/iperf-vm.yaml b/user-client/jobs/iperf-vm.yaml index 31c5a3a..434b964 100644 --- a/user-client/jobs/iperf-vm.yaml +++ b/user-client/jobs/iperf-vm.yaml @@ -16,7 +16,7 @@ if role client: iperf: protocol: tcp job_origin: jobs/iperf.yaml -testbox: vm-hi1620-2p8g-1 +testbox: vm-2p8g-1 arch: x86_64 node_roles: server client diff --git a/user-client/maintain/walk-os-test/iperf-walk-os.yaml b/user-client/maintain/walk-os-test/iperf-walk-os.yaml index 2991743..647220c 100644 --- a/user-client/maintain/walk-os-test/iperf-walk-os.yaml +++ b/user-client/maintain/walk-os-test/iperf-walk-os.yaml @@ -7,7 +7,7 @@ if role server: if role client: iperf: protocol: tcp -testbox: vm-hi1620-2p8g--USER +testbox: vm-2p8g--USER os: OS os_arch: OS_ARCH os_version: OS_VER diff --git a/user-client/maintain/walk-os-test/my-qemu.sh b/user-client/maintain/walk-os-test/my-qemu.sh index 2f20f67..954d3a0 100755 --- a/user-client/maintain/walk-os-test/my-qemu.sh +++ b/user-client/maintain/walk-os-test/my-qemu.sh @@ -3,7 +3,7 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. [[ $tbox_group ]] || -tbox_group=vm-hi1620-2p8g +tbox_group=vm-2p8g export hostname=$tbox_group--$USER-$$ $CCI_SRC/providers/qemu.sh -- 2.23.0

1 0

[PATCH compass-ci] sparrow: systemctl restart docker
by Hu Xuejiao 14 Oct '20

14 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/3-code/os/debian | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sparrow/3-code/os/debian b/sparrow/3-code/os/debian index 171b979..efb4fcb 100644 --- a/sparrow/3-code/os/debian +++ b/sparrow/3-code/os/debian @@ -2,3 +2,5 @@ cat >> /etc/default/docker <<EOF DOCKER_OPTS="--dns 114.114.114.114" EOF + +systemctl restart docker -- 2.23.0

1 0

[PATCH lkp-tests] depends: add git in deploy-cci(dependency)
by Hu Xuejiao 14 Oct '20

14 Oct '20

Testcase(deploy-cci): git clone https://gitee.com/**/compass-ci.git, but when os_mount=initramfs, the git package is missing. Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- distro/depends/deploy-cci | 1 + 1 file changed, 1 insertion(+) create mode 100644 distro/depends/deploy-cci diff --git a/distro/depends/deploy-cci b/distro/depends/deploy-cci new file mode 100644 index 00000000..5664e303 --- /dev/null +++ b/distro/depends/deploy-cci @@ -0,0 +1 @@ +git -- 2.23.0

1 0

Re: [PATCH compass-ci 1/2] add job result url with mail-job
by Lu Weitao 14 Oct '20

14 Oct '20

On Tue, Oct 13, 2020 at 06:12:50PM +0800, Lu Kaiyi wrote: >On Tue, Oct 13, 2020 at 05:36:00PM +0800, Lu Weitao wrote: >>sample: mail-job crystal.92144 >>Date: Mon, Oct 12 2020 17:30:56PM +0800 >>From: team(a)crystal.ci >>To: lwt(a)crystal.ci >>Subject: [Compass-ci] job: crystal.92144 result >> >>Hi, >> Thanks for your participation in Kunpeng and software ecosystem! >> Your Job: crystal.92144 had finished. > ^ > maybe remove ":" will better for a complete sentence. 去掉也可以的，但是加上更好。这个场景就像：联系人： xxx 联系电话：xxx-xxxxxxxx 显然，加上：效果好一些(冒号在中英文的作用基本是一样的) Thanks, Weitao > Thanks, > Kaiyi >> Please check job result: http://172.17.0.1:11300/result/iperf/vm-hi1620-2p8g--lwt/2020-10-12/crystal… >> >>Regards

1 0

[PATCH compass-ci 1/2] add job result url with mail-job
by Lu Weitao 14 Oct '20

14 Oct '20

sample: mail-job crystal.92144 Date: Mon, Oct 12 2020 17:30:56PM +0800 From: team(a)crystal.ci To: lwt(a)crystal.ci Subject: [Compass-ci] job: crystal.92144 result Hi, Thanks for your participation in Kunpeng and software ecosystem! Your Job: crystal.92144 had finished. Please check job result: http://172.17.0.1:11300/result/iperf/vm-hi1620-2p8g--lwt/2020-10-12/crystal… Regards Compass-ci https://gitee.com/openeuler/compass-ci Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/constants.rb | 3 +++ lib/mail_job_result.rb | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/constants.rb b/lib/constants.rb index 3a4f083..5c42466 100644 --- a/lib/constants.rb +++ b/lib/constants.rb @@ -10,3 +10,6 @@ ES_PORT = config['ES_PORT'] || 9200 MAIL_HOST = config['MAIL_HOST'] || '172.17.0.1' MAIL_PORT = config['MAIL_PORT'] || 11_311 + +SRV_HTTP_HOST = config['SRV_HTTP_HOST'] || ENV['SRV_HTTP_HOST'] || '172.17.0.1' +SRV_HTTP_PORT = config['SRV_HTTP_PORT'] || ENV['SRV_HTTP_PORT'] || 11_300 diff --git a/lib/mail_job_result.rb b/lib/mail_job_result.rb index 9202b81..29a9c1a 100644 --- a/lib/mail_job_result.rb +++ b/lib/mail_job_result.rb @@ -9,8 +9,10 @@ require 'json' # compose and send email for job result class MailJobResult - def initialize(job_id) + def initialize(job_id, result_host = SRV_HTTP_HOST, result_port = SRV_HTTP_PORT) @job_id = job_id + @result_host = result_host + @result_port = result_port end def send_mail @@ -25,7 +27,7 @@ class MailJobResult body = "Hi, Thanks for your participation in Kunpeng and software ecosystem! Your Job: #{@job_id} had finished. - Please check job result: \n\n#{signature}" + Please check job result: http://#{@result_host}:#{@result_port}#{@result_root}\n\n#{signature}" { 'to' => @submitter_email, 'body' => body, 'subject' => subject } end @@ -34,6 +36,7 @@ class MailJobResult exit unless job['email'] @submitter_email = job['email'] + @result_root = job['result_root'] end def query_job -- 2.23.0

3 4

[PATCH lkp-tests] lib/job.rb: check pp key
by Wei Jihui 13 Oct '20

13 Oct '20

next when check key is nil, donot add it to pp Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/job.rb b/lib/job.rb index 3c555e13..c3966546 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -568,7 +568,9 @@ class Job init_program_options() for_each_in(@job, @referenced_programs.keys) do |_pk, h, p_n, p_args| k = hash_key_re_string(@job, p_n, @job['pp'].keys) - if k && !(a)job[k].is_a?(Hash) + next if k.nil? + + unless @job[k].is_a?(Hash) @job['pp'][k] = @job[k] next end -- 2.23.0

1 0

[PATCH lkp-tests] /lkp-tests/test: add test-tools
by Li Ping 13 Oct '20

13 Oct '20

Signed-off-by: Li Ping <15396232681(a)163.com> --- tests/test-tools | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 tests/test-tools diff --git a/tests/test-tools b/tests/test-tools new file mode 100755 index 00000000..9ca5d228 --- /dev/null +++ b/tests/test-tools @@ -0,0 +1,37 @@ +#!/bin/bash +# - testsuite +# - testcase +# - all + +cd $BENCHMARK_ROOT/test-tools/mugen || exit + +set_for_env() +{ + bash runoet.sh -c + source ~/.bash_profile +} + +test_one_case() +{ + + bash runoet.sh -f $testsuite -r $testcase -x +} + +test_all_cases() +{ + bash runoet.sh -a +} + +run_test() +{ + set_for_env + [ -n "$all" ] && { + test_all_cases + return + } + [ -n "$testsuite" ] || testsuite=smoke-testing + [ -n "$testcase" ] || testcase=oe_test_dd_001 + test_one_case +} + +run_test -- 2.23.0

4 4

[PATCH lkp-tests] add PKGBUILD for test-tools
by Li Ping 13 Oct '20

13 Oct '20

Signed-off-by: Li Ping <15396232681(a)163.com> --- pkg/test-tools/PKGBUILD | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkg/test-tools/PKGBUILD diff --git a/pkg/test-tools/PKGBUILD b/pkg/test-tools/PKGBUILD new file mode 100644 index 00000000..6908c193 --- /dev/null +++ b/pkg/test-tools/PKGBUILD @@ -0,0 +1,19 @@ +pkgname=test-tools +pkgver=git +pkgrel=1 +pkgdesc="smoke test" +url="https://gitee.com/openeuler/test-tools.git" +arch=aarch64 +license=('GPL') +source=("https://gitee.com/openeuler/test-tools.git" + "https://gitee.com/openeuler/integration-test.git" +) +md5sums=('SKIP' 'SKIP') + +package() { + test_tools_path="${pkgdir}/lkp/benchmarks/${pkgname}" + mkdir -p "${test_tools_path}" + cp -af "${srcdir}/test-tools/"* "${test_tools_path}" + cp -af "${srcdir}/integration-test/testcases"* "${test_tools_path}/mugen" + cp -af "${srcdir}/integration-test/suite2cases"* "${test_tools_path}/mugen" +} -- 2.23.0

2 1