- Compass-ci - mailweb.openeuler.org

[PATCH v3 lkp-tests] fix(distro/depends): add depends file
by Wang Yong 29 Oct '20

29 Oct '20

Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- distro/depends/cci-depends | 2 ++ distro/depends/cci-makepkg | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 distro/depends/cci-depends create mode 100644 distro/depends/cci-makepkg diff --git a/distro/depends/cci-depends b/distro/depends/cci-depends new file mode 100644 index 000000000..1f7f73ac3 --- /dev/null +++ b/distro/depends/cci-depends @@ -0,0 +1,2 @@ +cifs-utils +cpio diff --git a/distro/depends/cci-makepkg b/distro/depends/cci-makepkg new file mode 100644 index 000000000..a7ee67537 --- /dev/null +++ b/distro/depends/cci-makepkg @@ -0,0 +1,10 @@ +curl +libarchive-tools +bzip2 +fakeroot +gnupg +gettext +openssl +ncurses-bin +binutils +cifs-utils -- 2.23.0

1 0

[PATCH lkp-tests] fio: update fio test arg
by Wei Jihui 29 Oct '20

29 Oct '20

set required parameters: fs=xfs,iosched=mq-deadline,raw_disk=rd Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- jobs/fio-basic-openeuler.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jobs/fio-basic-openeuler.yaml b/jobs/fio-basic-openeuler.yaml index d2cc277b..7610f999 100644 --- a/jobs/fio-basic-openeuler.yaml +++ b/jobs/fio-basic-openeuler.yaml @@ -6,7 +6,10 @@ runtime: 60 disk: - 1HDD fs: -- ext4 +- xfs +iosched: +- mq-deadline +raw_disk: rd nr_task: 24 fio-setup-basic: @@ -26,7 +29,6 @@ fio-setup-basic: bs: - 4k - 16k - - 32k - 64k - 128k - 256k -- 2.23.0

3 3

[PATCH v4 compass-ci 3/5] container/ntp-server: ntp.conf
by Wang Chenglong 29 Oct '20

29 Oct '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/ntp.conf | 57 +++++++++++++++++++++++++++++++++++ 1 file changed, 57 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..3152fd3 --- /dev/null +++ b/container/ntp-server/ntp.conf @@ -0,0 +1,57 @@ +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 1.centos.pool.ntp.org +server 2.centos.pool.ntp.org +server 3.centos.pool.ntp.org + +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

2 2

[PATCH v2 compass-ci 2/2] create matrices-groups according to group jobs
by Lu Weitao 29 Oct '20

29 Oct '20

create matrices-groups according to group jobs for support user-defined template compare mode background: before compare, create job-groups for all jobs that query from ES with user's filter then, create matrices-groups according job-groups finally, compare each group matrices Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/matrix2.rb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/matrix2.rb b/lib/matrix2.rb index 05f96dc..8d4c989 100644 --- a/lib/matrix2.rb +++ b/lib/matrix2.rb @@ -120,3 +120,27 @@ def combine_group_query_data(query_data, dims) end groups end + +# input: +# 1. query results from es_query +# 2. params from template include: +# groups_params(x_params): +# eg: ['block_size', 'package_size'] +# dimensions: +# eg: [ +# {'os' => 'openeuler', 'os_version' => '20.03'}, +# {'os' => 'centos', 'os_version' => '7.6'} +# ] +# metrics: +# eg: ['fio.read_iops', 'fio_write_iops'] +# return: group_matrix of Hash(String, Hash(String, matrix)) +def combine_group_query_data(query_data, groups_params, dimensions, metrics) + job_list = query_data['hits']['hits'] + groups = auto_group_by_template(job_list, groups_params, dimensions, metrics) + groups.each do |group_key, dimensions| + dimensions.each do |dimension_key, jobs| + groups[group_key][dimension_key] = create_matrix(jobs) + end + end + groups +end -- 2.23.0

1 0

[PATCH compass-ci] save mac2queues relation in redis
by Xiao Shenwei 29 Oct '20

29 Oct '20

[why] the test machine has the ability to know which queues should be requested. [how] create API for register or del mac and queues relation Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- src/lib/sched.cr | 8 ++++++++ src/scheduler/scheduler.cr | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index c32091f..8aca46b 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -34,10 +34,18 @@ class Sched @redis.hash_set("sched/mac2host", normalize_mac(mac), hostname) end + def set_mac2queues(mac : String, queues : String) + @redis.hash_set("sched/mac2queues", normalize_mac(mac), queues) + end + def del_host_mac(mac : String) @redis.hash_del("sched/mac2host", normalize_mac(mac)) end + def del_mac2queues(mac : String) + @redis.hash_del("sched/mac2queues", normalize_mac(mac)) + end + # return: # Hash(String, Hash(String, String)) def get_cluster_state(cluster_id) diff --git a/src/scheduler/scheduler.cr b/src/scheduler/scheduler.cr index 371e4ed..21a2a51 100644 --- a/src/scheduler/scheduler.cr +++ b/src/scheduler/scheduler.cr @@ -113,6 +113,18 @@ module Scheduler end end + # curl -X PUT "http://localhost:3000/set_mac2queues?queues=vm-2p8g.aarch64&mac=00-01-02-03…" + put "/set_mac2queues" do |env| + env.response.headers["Connection"] = "close" + if (client_queues = env.params.query["queues"]?) && (client_mac = env.params.query["mac"]?) + sched.set_mac2queues(client_mac, client_queues) + + "Done" + else + "No yet" + end + end + # curl -X PUT "http://localhost:3000/del_host_mac?mac=00-01-02-03-04-05" put "/del_host_mac" do |env| env.response.headers["Connection"] = "close" @@ -125,6 +137,18 @@ module Scheduler end end + # curl -X PUT "http://localhost:3000/del_mac2queues?mac=00-01-02-03-04-05" + put "/del_mac2queues" do |env| + env.response.headers["Connection"] = "close" + if client_mac = env.params.query["mac"]? + sched.del_mac2queues(client_mac) + + "Done" + else + "No yet!" + end + end + # client(runner) report job's status # /~lkp/cgi-bin/lkp-jobfile-append-var # ?job_file=/lkp/scheduled/job.yaml&job_state=running&job_id=10 -- 2.23.0

3 5

[PATCH lkp-tests] change the path for upload files
by Li Ping 29 Oct '20

29 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

3 2

[PATCH compass-ci] sbin: automatic submission job.yaml to add os=debian
by Hu Xuejiao 29 Oct '20

29 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sbin/auto_submit.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/auto_submit.yaml b/sbin/auto_submit.yaml index edfbfb1..6d7dc2a 100644 --- a/sbin/auto_submit.yaml +++ b/sbin/auto_submit.yaml @@ -3,5 +3,6 @@ AvxToNeon/AvxToNeon: 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 archlinux: - testbox=vm-2p16g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml -- 2.23.0

3 3

[PATCH v2 compass-ci] auto_submit.yaml: add os=debian
by Hu Xuejiao 29 Oct '20

29 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sbin/auto_submit.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/auto_submit.yaml b/sbin/auto_submit.yaml index edfbfb1..6d7dc2a 100644 --- a/sbin/auto_submit.yaml +++ b/sbin/auto_submit.yaml @@ -3,5 +3,6 @@ AvxToNeon/AvxToNeon: 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 archlinux: - testbox=vm-2p16g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml -- 2.23.0

1 0

[PATCH lkp-tests] fix(lkp-bootstrap.servce):lkp-bootstrap cannot run in CentOS7 initramfs
by Zhou Shengrui 29 Oct '20

29 Oct '20

To deal with "$GOCAHE is not defined with jobs that use go-lang", lkp-bootstrap runs with "su -c". But it is not suitable for CentOS7 initramfs and will get errors like below: lkp-bootstrap.service:8] Executable path is not absolute, ignoring: su -c /etc/init.d/lkp-bootstrap Cannot add dependency job for unit lkp-bootstrap.service, ignoring: Unit is not loaded properly: Invalid argument. Use "Enviroment" instead of "su -c" Signed-off-by: Zhou Shengrui <zhoushengrui(a)qq.com> --- rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service b/rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service index 92e7e5ee..842c4aef 100644 --- a/rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service +++ b/rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service @@ -5,7 +5,8 @@ After=network.target [Service] Type=forking -ExecStart=su -c /etc/init.d/lkp-bootstrap +Environment=HOME=/root +ExecStart=/etc/init.d/lkp-bootstrap IgnoreSIGPIPE=no KillMode=none TasksMax=infinity -- 2.23.0

3 2

[PATCH compass-ci] doc/code-spec: specify PATCH title format
by Wu Fengguang 29 Oct '20

29 Oct '20

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- doc/code-spec.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/doc/code-spec.md b/doc/code-spec.md index 6f2dddd..d44c6fe 100644 --- a/doc/code-spec.md +++ b/doc/code-spec.md @@ -68,6 +68,36 @@ PATCH注意事项 - 论述问题的时候，引用必要的代码或output，帮助明确逻辑流/数据流。引文加TAB缩进显示。 +PATCH格式 +========= + +## patch title/subject + +一般形式为 + + area: ... +其中area为模块名、目录、文件名。 + +如果是bug fix，就写成 + + area: fix ... + +如果是文档，可以写成 + + doc: ... + doc/file.md: ... + +如果是重构，就写成 + + area: refactor xxx + area: simplify xxx + +首字母不必大写 +勿以'.'结尾 + +一般别写 "improve ..." +特别别写 "modify ..." 因为这个词没啥信息量。 + PATCH参考材料 ============= -- 2.23.0

1 0