- Compass-ci - mailweb.openeuler.org

[PATCH 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..61517d9 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_user_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, value| + value.each do |dimension_key, jobs| + groups[group_key][dimension_key] = create_matrix(jobs) + end + end + groups +end -- 2.23.0

3 4

[PATCH compass-ci] container/netdata: use json-file save logs
by Wu Zhende 29 Oct '20

29 Oct '20

[Why] netdata is aperformance check tool and does not need to send logs to fluentd for analysis. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/netdata/start | 2 ++ 1 file changed, 2 insertions(+) diff --git a/container/netdata/start b/container/netdata/start index a3009a9..58fb675 100755 --- a/container/netdata/start +++ b/container/netdata/start @@ -17,6 +17,8 @@ cmd=( -v /var/run/docker.sock:/var/run/docker.sock:ro -v /srv/cache/netdata_cache:/var/cache/netdata -v /srv/cache/netdata_lib:/var/lib/netdata + --log-driver json-file + --log-opt max-size=1g --cap-add SYS_PTRACE --security-opt apparmor=unconfined netdata/netdatalkp -- 2.23.0

1 0

[PATCH lab-z9] hosts: Delete duplicate field
by Zhang Yu 29 Oct '20

29 Oct '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- hosts/taishan200-2280-2s48p-256g | 1 - hosts/taishan200-2280-2s64p-256g | 1 - 2 files changed, 2 deletions(-) diff --git a/hosts/taishan200-2280-2s48p-256g b/hosts/taishan200-2280-2s48p-256g index 642e8e1..b326025 100644 --- a/hosts/taishan200-2280-2s48p-256g +++ b/hosts/taishan200-2280-2s48p-256g @@ -2,4 +2,3 @@ arch: aarch64 nr_cpu: 96 nr_node: 4 memory: 256G -arch: aarch64 diff --git a/hosts/taishan200-2280-2s64p-256g b/hosts/taishan200-2280-2s64p-256g index 16349d9..7c7eb5c 100644 --- a/hosts/taishan200-2280-2s64p-256g +++ b/hosts/taishan200-2280-2s64p-256g @@ -2,4 +2,3 @@ arch: aarch64 nr_cpu: 128 nr_node: 4 memory: 256G -arch: aarch64 -- 2.23.0

1 0

[PATCH lkp-tests] tests: add get_cpu function
by Zhang Yu 29 Oct '20

29 Oct '20

[why] Obtain more host information from 'lscpu' Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- tests/host-info | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/host-info b/tests/host-info index 46f43f93..84f796dc 100755 --- a/tests/host-info +++ b/tests/host-info @@ -1,18 +1,25 @@ #!/bin/bash -get_node() +get_memory() { - echo "nr_node: $(grep -Eo 'Node [0-9]+,' /proc/zoneinfo | uniq | wc -l)" - echo "nr_cpu: $(nproc)" memory_total=$(cat /proc/meminfo |grep MemTotal | awk '{print $2}') memory_new=$(awk 'BEGIN{printf "%0.2f", '$memory_total'/1024/1024/16}') memory=$(echo `expr $(echo $memory_new | awk '{print int($0)+1}') \* 16`)G echo "memory: $memory" } -get_model_name() +get_cpu() { - echo "model_name: $(lscpu |grep "Model name" | awk '{print $3}')" + echo $1: $(lscpu | awk -F': *' '/'$2':/{print $2}') +} + +get_cpu_info() +{ + cpu_info=("arch Architecture" "nr_node NUMA\snode$s$" "nr_cpu ^CPU$s$" "model_name Model\sname") + for info in "${cpu_info[@]}" + do + get_cpu $info + done } get_nr_disk() @@ -101,11 +108,11 @@ get_ipmi_ip() main() { - get_node + get_memory get_nr_disk get_partitions get_mac - get_model_name + get_cpu_info get_ipmi_ip } -- 2.23.0

1 0

[PATCH v6 compass-ci] add queue field into job.yaml
by Xiao Shenwei 29 Oct '20

29 Oct '20

use queue field decide which queue to enter queue field come from user's specify(job.yaml) or dafault Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- src/lib/job.cr | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/lib/job.cr b/src/lib/job.cr index 8f5dd36..7fbc414 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -73,6 +73,7 @@ class Job tbox_group testbox lab + queue initrd_pkg initrd_deps initrds_uri @@ -139,6 +140,7 @@ class Job set_kernel_params() set_lkp_server() set_sshr_port() + set_queue() end private def append_init_field @@ -199,6 +201,16 @@ class Job self["result_service"] = "raw_upload" end + private def set_queue + return if @hash.has_key?("queue") + + # set default value + self["queue"] = tbox_group + if tbox_group.to_s.starts_with?(/(vm|dc)-/) + self["queue"] = "#{tbox_group}.#{arch}" + end + end + # if not assign tbox_group, set it to a match result from testbox # ?if job special testbox, should we just set tbox_group=textbox private def update_tbox_group_from_testbox -- 2.23.0

1 0

[PATCH compass-ci] sparrow/3-code: add centos in os file
by Zhang Yale 29 Oct '20

29 Oct '20

[Why] when run dev-env in centos system, error like this: ./dev-env:line 41: ./os/centos: No such file or directory. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- sparrow/3-code/os/centos | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sparrow/3-code/os/centos diff --git a/sparrow/3-code/os/centos b/sparrow/3-code/os/centos new file mode 100644 index 0000000..efb4fcb --- /dev/null +++ b/sparrow/3-code/os/centos @@ -0,0 +1,6 @@ +#!/bin/bash +cat >> /etc/default/docker <<EOF +DOCKER_OPTS="--dns 114.114.114.114" +EOF + +systemctl restart docker -- 2.23.0

4 6

[PATCH v2 compass-ci] LICENSE: add document license
by Bai Jing 29 Oct '20

29 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- LICENSES/CCBY-4.0 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 LICENSES/CCBY-4.0 diff --git a/LICENSES/CCBY-4.0 b/LICENSES/CCBY-4.0 new file mode 100644 index 0000000..abaf8d0 --- /dev/null +++ b/LICENSES/CCBY-4.0 @@ -0,0 +1,4 @@ +Copyright (c) 2020 Huawei Technologies Co., Ltd. +Your copying, use, modification, and distribution of this document is subject to the Creative Commons Attribution-ShareAlike 4.0 International Public License ("CC BY-SA 4.0"). +For ease of understanding, you can visit https://creativecommons.org/licenses/by-sa/4.0/to learn about the outline of CC BY-SA 4.0(but not a substitute). +The complete agreement of CC BY-SA 4.0 can be obtained from the following website: https://creativecommons.org/licenses/by-sa/4.0/legalcode. -- 2.23.0

2 2

[PATCH lkp-tests] lib/job.rb: expand load hosts file
by Wei Jihui 28 Oct '20

28 Oct '20

load_yaml(yaml_file, template_context) if template_context is not nil, it will expand read the yaml. this will read "<< : hosts/$tbox_group" in hosts file. Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/job.rb b/lib/job.rb index f24435a0..5c2c9517 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -305,7 +305,7 @@ class Job hosts_file = get_hosts_file if hosts_file - hwconfig = load_yaml(hosts_file, nil) + hwconfig = load_yaml(hosts_file, {}) @job[source_file_symkey(hosts_file)] = nil @job.merge!(hwconfig) { |_k, a, _b| a } # job's key/value has priority over hwconfig @load_hosts_done = true -- 2.23.0

1 0

[PATCH v4 compass-ci] fix: sched: add 2 fields into cluster state
by Ren Wen 28 Oct '20

28 Oct '20

[Why] 1) Each node will report it's infos (roles, ip, direct_ips, direct_macs) when running cluster job, so also add these 2 parameters into node state: "direct_ips", "direct_macs". Cluster test scripts needs "direct_server_ips" as server client's ip to connect to server to do a test. When request state is "roles_ip", return clients two variables: server, direct_server_ips. Clients will export them. 2) Alter funtion "get_ip"'s name and it's return value to fit for changes. Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index c32091f..4221b73 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -99,25 +99,30 @@ class Sched when "write_state" node_roles = env.params.query["node_roles"] node_ip = env.params.query["ip"] + direct_ips = env.params.query["direct_ips"] + direct_macs = env.params.query["direct_macs"] + update_cluster_state(cluster_id, job_id, "roles", node_roles) update_cluster_state(cluster_id, job_id, "ip", node_ip) + update_cluster_state(cluster_id, job_id, "direct_ips", direct_ips) + update_cluster_state(cluster_id, job_id, "direct_macs", direct_macs) when "roles_ip" role = "server" - server_ip = get_ip(cluster_id, role) - return "server=#{server_ip}" + role_state = get_role_state(cluster_id, role) + raise "Missing #{role} state in cluster state" unless role_state + return "server=#{role_state["ip"]}\n" \ + "direct_server_ips=#{role_state["direct_ips"]}" end # show cluster state return @redis.hash_get("sched/cluster_state", cluster_id) end - # get the ip of role from cluster_state - def get_ip(cluster_id, role) + # get the node state of role from cluster_state + private def get_role_state(cluster_id, role) cluster_state = get_cluster_state(cluster_id) - cluster_state.each_value do |config| - if %(#{config["roles"]}) == role - return config["ip"] - end + cluster_state.each_value do |role_state| + return role_state if role_state["roles"] == role end end -- 2.23.0

1 0

[PATCH compass-ci] container/srv-http: add new web directory
by Cui Yili 28 Oct '20

28 Oct '20

[why] The "/srv/initrd/qemu-image/" directory needs to be accessible through the web to obtain qemu image. [how] docker start add "-v /srv/initrd/qemu-image:/srv/initrd/qemu-image:ro" Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/srv-http/start | 1 + 1 file changed, 1 insertion(+) diff --git a/container/srv-http/start b/container/srv-http/start index 2b5bd1d..b56fe4d 100755 --- a/container/srv-http/start +++ b/container/srv-http/start @@ -13,6 +13,7 @@ cmd=( -v /srv/pub:/srv/pub:ro -v /etc/localtime:/etc/localtime:ro -v /srv/result:/srv/result:ro + -v /srv/initrd/qemu-image:/srv/initrd/qemu-image:ro -d srv-http ) -- 2.23.0

1 0