- Compass-ci - mailweb.openeuler.org

[PATCH v2 compass-ci 2/5] container/send-mail: mail-post.rb
by Luan Shengde 28 Oct '20

28 Oct '20

fix invoke function name error Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- lib/mail-post.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mail-post.rb b/lib/mail-post.rb index 5832bfb..0b1f94a 100755 --- a/lib/mail-post.rb +++ b/lib/mail-post.rb @@ -22,7 +22,7 @@ post '/send_mail_yaml' do 'body' => data['body'] } - check_send_mail(mail_info) + send_mail(mail_info) end post '/send_mail_text' do -- 2.23.0

1 0

[PATCH v2 compass-ci 1/5] container/send-mail: send-mail.rb
by Luan Shengde 28 Oct '20

28 Oct '20

setup smtp config for email server invoke mail-post to hand the send mail request Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-mail/send-mail.rb | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/container/send-mail/send-mail.rb b/container/send-mail/send-mail.rb index f459e78..436736c 100755 --- a/container/send-mail/send-mail.rb +++ b/container/send-mail/send-mail.rb @@ -4,25 +4,14 @@ # frozen_string_literal: true require 'mail' +require 'sinatra' +require "#{ENV['CCI_SRC']}/lib/mail-post" -mail_server = `/sbin/ip route |awk '/default/ {print $3}'`.chomp +mail_server = %x(/sbin/ip route |awk '/default/ {print $3}').chomp -# setup smtp config smtp = { address: mail_server, enable_starttls_auto: false } Mail.defaults { delivery_method :smtp, smtp } - -# send mail -def send_mail(mail_info) - mail = Mail.new do - references mail_info['references'] - from mail_info['from'] - subject mail_info['subject'] - to mail_info['to'] - body mail_info['body'] - end - mail.deliver! -end -- 2.23.0

1 0

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

27 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- LICENSES/CCBY-4.0 | 2 ++ 1 file changed, 2 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..112f1cd --- /dev/null +++ b/LICENSES/CCBY-4.0 @@ -0,0 +1,2 @@ +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 1

[PATCH compass-ci] sparrow: 3-code/dev-env: add ENV TASKQUEUE_HOST
by Liu Yinsi 27 Oct '20

27 Oct '20

TASKQUEUE_HOST used by container service taskqueue, taskqueue port is default 3060. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/3-code/dev-env | 1 + 1 file changed, 1 insertion(+) diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 11c7fb0..44f7a93 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -17,6 +17,7 @@ mkdir -p /etc/compass-ci/defaults cat > /etc/compass-ci/defaults/$server_name.yaml <<EOF SCHED_HOST: $sched_host SCHED_PORT: $sched_port +TASKQUEUE_HOST: $server_ip OS_HTTP_HOST: $os_http_host INITRD_HTTP_HOST: $initrd_http_host INITRD_HTTP_PORT: $initrd_http_port -- 2.23.0

3 4

[PATCH v2 lkp-tests 1/2] jobs/block_size.yaml: add block_size.yaml
by Lu Kaiyi 27 Oct '20

27 Oct '20

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

2 1

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

27 Oct '20

[why] Obtain more host information from 'lscpu' Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- tests/host-info | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/host-info b/tests/host-info index 46f43f93..4d935944 100755 --- a/tests/host-info +++ b/tests/host-info @@ -1,20 +1,24 @@ #!/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}') } +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() { nr_hdd_disks=$(lsblk -d -o name,ROTA | grep -v loop | awk '{print $2}' | grep 1 | wc -l) @@ -101,11 +105,10 @@ get_ipmi_ip() main() { - get_node + get_memory get_nr_disk get_partitions get_mac - get_model_name get_ipmi_ip } -- 2.23.0

3 2

[PATCH v2 compass-ci] container/debian: solve build error
by Cui Yili 27 Oct '20

27 Oct '20

[why] Executing "container/debian/build", error when apt-get installs the package: E: Could not configure 'libc6:arm64'. E: Could not perform immediate configuration on 'libnss-nis:arm64'. Please see man 5 apt.conf under APT::Immediate-Configure for details. (2) [how] Increase the parameter "-o APT::Immediate-Configure=false" when apt-get installs the package. reference: https://www.debian.org/releases/wheezy/armhf/release-notes/ch-upgrading.en.… Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/debian/Dockerfile b/container/debian/Dockerfile index 1d310da..21b6a22 100644 --- a/container/debian/Dockerfile +++ b/container/debian/Dockerfile @@ -12,6 +12,6 @@ COPY root / RUN sed -i "s/^exit [0-9]*/exit 0/" /usr/sbin/policy-rc.d RUN apt-get update && \ apt-get install -y --no-install-recommends apt-utils > /dev/null 2>&1 && \ - apt-get install -y runit openssh-server zsh vim rsync git make gcc g++ tzdata sudo && \ + apt-get install -o APT::Immediate-Configure=false -y runit openssh-server zsh vim rsync git make gcc g++ tzdata sudo && \ mkdir -p /run/sshd -- 2.23.0

1 0

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

27 Oct '20

[why] Obtain more host information from 'lscpu' Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- tests/host-info | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/host-info b/tests/host-info index 46f43f93..e79680e9 100755 --- a/tests/host-info +++ b/tests/host-info @@ -1,20 +1,23 @@ #!/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 arch 'Architecture' +get_cpu nr_node 'NUMA\snode$s$' +get_cpu nr_cpu '^CPU$s$' +get_cpu model_name 'Model\sname' + get_nr_disk() { nr_hdd_disks=$(lsblk -d -o name,ROTA | grep -v loop | awk '{print $2}' | grep 1 | wc -l) @@ -101,11 +104,10 @@ get_ipmi_ip() main() { - get_node + get_memory get_nr_disk get_partitions get_mac - get_model_name get_ipmi_ip } -- 2.23.0

2 2

[PATCH v3 compass-ci] fix: taskqueue: add TASKQUEUE_HOST to container
by Tong Qunfeng 27 Oct '20

27 Oct '20

[how] 1. add TASKQUEUE_HOST to system default configure file (/etc/compass-ci/defaults/*.yaml) 2. add TASKQUEUE_HOST to taskqueue container start file. Signed-off-by: Tong Qunfeng <taxcom(a)tom.com> --- container/taskqueue/start | 1 + 1 file changed, 1 insertion(+) diff --git a/container/taskqueue/start b/container/taskqueue/start index bdd5e7c..45a8b03 100755 --- a/container/taskqueue/start +++ b/container/taskqueue/start @@ -8,6 +8,7 @@ require_relative '../defconfig.rb' names = Set.new %w[ TASKQUEUE_PORT + TASKQUEUE_HOST REDIS_HOST REDIS_PORT ] -- 2.23.0

1 1

[PATCH v2 compass-ci] [why] current container will only bind to special ip (172.17.0.1 and the configured TASKQUEUE_HOST at default configure file). some servier default visit 172.17.0.1, but some visit (at crystal) 172.168.131.113 as default.
by Tong Qunfeng 27 Oct '20

27 Oct '20

[how] 1. add TASKQUEUE_HOST to system default configure file (/etc/compass-ci/defaults/*.yaml) 2. add TASKQUEUE_HOST to taskqueue container start file. Signed-off-by: Tong Qunfeng <taxcom(a)tom.com> --- container/taskqueue/start | 1 + 1 file changed, 1 insertion(+) diff --git a/container/taskqueue/start b/container/taskqueue/start index bdd5e7c..45a8b03 100755 --- a/container/taskqueue/start +++ b/container/taskqueue/start @@ -8,6 +8,7 @@ require_relative '../defconfig.rb' names = Set.new %w[ TASKQUEUE_PORT + TASKQUEUE_HOST REDIS_HOST REDIS_PORT ] -- 2.23.0

1 1

[PATCH compass-ci] fix: taskqueue: add TQSKQUEUE_HOST to container
by Tong Qunfeng 27 Oct '20

27 Oct '20

[why] current container will only bind to special ip (172.17.0.1 and the configured TASKQUEUE_HOST at default configure file). some servier default visit 172.17.0.1, but some visit (at crystal) 172.168.131.113 as default. [how] 1. add TASKQUEUE_HOST to system default configure file (/etc/compass-ci/defaults/*.yaml) 2. add TASKQUEUE_HOST to taskqueue container start file. Signed-off-by: Tong Qunfeng <taxcom(a)tom.com> --- container/taskqueue/start | 1 + 1 file changed, 1 insertion(+) diff --git a/container/taskqueue/start b/container/taskqueue/start index bdd5e7c..45a8b03 100755 --- a/container/taskqueue/start +++ b/container/taskqueue/start @@ -8,6 +8,7 @@ require_relative '../defconfig.rb' names = Set.new %w[ TASKQUEUE_PORT + TASKQUEUE_HOST REDIS_HOST REDIS_PORT ] -- 2.23.0

1 1

[PATCH v4 compass-ci] fix: taskqueue: add TASKQUEUE_HOST to container
by Tong Qunfeng 27 Oct '20

27 Oct '20

[why] current container will only bind to special ip (172.17.0.1 and the configured TASKQUEUE_HOST at default configure file). some servier default visit 172.17.0.1, but some visit (at crystal) 172.168.131.113 as default. [how] 1. add TASKQUEUE_HOST to system default configure file (/etc/compass-ci/defaults/*.yaml) 2. add TASKQUEUE_HOST to taskqueue container start file. Signed-off-by: Tong Qunfeng <taxcom(a)tom.com> --- container/taskqueue/start | 1 + 1 file changed, 1 insertion(+) diff --git a/container/taskqueue/start b/container/taskqueue/start index bdd5e7c..45a8b03 100755 --- a/container/taskqueue/start +++ b/container/taskqueue/start @@ -8,6 +8,7 @@ require_relative '../defconfig.rb' names = Set.new %w[ TASKQUEUE_PORT + TASKQUEUE_HOST REDIS_HOST REDIS_PORT ] -- 2.23.0

1 0

[PATCH lab-z9 1/3] new hosts file
by Zhang Dewan 27 Oct '20

27 Oct '20

--- hosts/m | 40 ++++++++++++++++++++++++++++++++++++++++ hosts/p | 10 ++++++++++ 2 files changed, 50 insertions(+) create mode 100644 hosts/m create mode 100644 hosts/p diff --git a/hosts/m b/hosts/m new file mode 100644 index 0000000..b73dfb7 --- /dev/null +++ b/hosts/m @@ -0,0 +1,40 @@ +taishan200-2280-2s48p-256g--a11 a11 +taishan200-2280-2s48p-256g--a13 a13 +taishan200-2280-2s48p-256g--a14 a14 +taishan200-2280-2s48p-256g--a15 a15 +taishan200-2280-2s48p-256g--a17 a17 +taishan200-2280-2s48p-256g--a18 a18 +taishan200-2280-2s48p-256g--a19 a19 +taishan200-2280-2s48p-256g--a21 a21 +taishan200-2280-2s48p-256g--a22 a22 +taishan200-2280-2s48p-256g--a24 a24 +taishan200-2280-2s48p-256g--a25 a25 +taishan200-2280-2s48p-256g--a26 a26 +taishan200-2280-2s48p-256g--a27 a27 +taishan200-2280-2s48p-256g--a28 a28 +taishan200-2280-2s48p-256g--a29 a29 +taishan200-2280-2s48p-256g--a30 a30 +taishan200-2280-2s48p-256g--a31 a31 +taishan200-2280-2s48p-256g--a32 a32 +taishan200-2280-2s48p-256g--a33 a33 +taishan200-2280-2s48p-256g--a34 a34 +taishan200-2280-2s48p-256g--a52 a52 +taishan200-2280-2s48p-256g--a53 a53 +taishan200-2280-2s48p-256g--a60 a60 +taishan200-2280-2s48p-256g--a61 a61 +taishan200-2280-2s48p-256g--a62 a62 +taishan200-2280-2s48p-256g--a66 a66 +taishan200-2280-2s48p-256g--a67 a67 +taishan200-2280-2s48p-256g--a68 a68 +taishan200-2280-2s48p-256g--a69 a69 +taishan200-2280-2s48p-256g--a70 a70 +taishan200-2280-2s48p-256g--a71 a71 +taishan200-2280-2s64p-256g--a10 a10 +taishan200-2280-2s64p-256g--a3 a3 +taishan200-2280-2s64p-256g--a36 a36 +taishan200-2280-2s64p-256g--a4 a4 +taishan200-2280-2s64p-256g--a40 a40 +taishan200-2280-2s64p-256g--a41 a41 +taishan200-2280-2s64p-256g--a42 a42 +taishan200-2280-2s64p-256g--a8 a8 +taishan200-2280-2s64p-256g--a9 a9 diff --git a/hosts/p b/hosts/p new file mode 100644 index 0000000..9d47282 --- /dev/null +++ b/hosts/p @@ -0,0 +1,10 @@ +#!/bin/bash + +while read line +do + + i=$(echo $line | awk '{print $2}') + j=$(echo $line | awk '{print $1}') + ip=$(grep $i /home/dewan/servers.info | head -n 1 |awk '{print $1}') + echo "ipmi_ip: $ip" >> $j +done < m -- 2.23.0

5 5

[PATCH compass-ci] sparrow/0-package: add epel-release package.
by Zhang Yale 27 Oct '20

27 Oct '20

[Why] Before install redis and lockfile-progs in centos, need install epel-release package first. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- sparrow/0-package/os/centos | 1 + 1 file changed, 1 insertion(+) diff --git a/sparrow/0-package/os/centos b/sparrow/0-package/os/centos index 261592c..8dcab75 100755 --- a/sparrow/0-package/os/centos +++ b/sparrow/0-package/os/centos @@ -3,6 +3,7 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. pkgs=( + epel-release vim git gcc -- 2.23.0

2 1

[PATCH compass-ci] sparrow/0-package: add restart redis
by Zhang Yale 27 Oct '20

27 Oct '20

[Why] When redis was installed in centos, It need to start redis.service. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- sparrow/0-package/common | 1 + 1 file changed, 1 insertion(+) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 31588f4..f73f2c4 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -40,3 +40,4 @@ cat > /etc/docker/daemon.json <<EOF EOF systemctl restart docker +systemctl restart redis -- 2.23.0

1 0

[PATCH lab-z9 1/2] new hosts file
by Zhang Dewan 27 Oct '20

27 Oct '20

--- hosts/m | 40 ++++++++++++++++++++++++++++++++++++++++ hosts/p | 10 ++++++++++ 2 files changed, 50 insertions(+) create mode 100644 hosts/m create mode 100644 hosts/p diff --git a/hosts/m b/hosts/m new file mode 100644 index 0000000..b73dfb7 --- /dev/null +++ b/hosts/m @@ -0,0 +1,40 @@ +taishan200-2280-2s48p-256g--a11 a11 +taishan200-2280-2s48p-256g--a13 a13 +taishan200-2280-2s48p-256g--a14 a14 +taishan200-2280-2s48p-256g--a15 a15 +taishan200-2280-2s48p-256g--a17 a17 +taishan200-2280-2s48p-256g--a18 a18 +taishan200-2280-2s48p-256g--a19 a19 +taishan200-2280-2s48p-256g--a21 a21 +taishan200-2280-2s48p-256g--a22 a22 +taishan200-2280-2s48p-256g--a24 a24 +taishan200-2280-2s48p-256g--a25 a25 +taishan200-2280-2s48p-256g--a26 a26 +taishan200-2280-2s48p-256g--a27 a27 +taishan200-2280-2s48p-256g--a28 a28 +taishan200-2280-2s48p-256g--a29 a29 +taishan200-2280-2s48p-256g--a30 a30 +taishan200-2280-2s48p-256g--a31 a31 +taishan200-2280-2s48p-256g--a32 a32 +taishan200-2280-2s48p-256g--a33 a33 +taishan200-2280-2s48p-256g--a34 a34 +taishan200-2280-2s48p-256g--a52 a52 +taishan200-2280-2s48p-256g--a53 a53 +taishan200-2280-2s48p-256g--a60 a60 +taishan200-2280-2s48p-256g--a61 a61 +taishan200-2280-2s48p-256g--a62 a62 +taishan200-2280-2s48p-256g--a66 a66 +taishan200-2280-2s48p-256g--a67 a67 +taishan200-2280-2s48p-256g--a68 a68 +taishan200-2280-2s48p-256g--a69 a69 +taishan200-2280-2s48p-256g--a70 a70 +taishan200-2280-2s48p-256g--a71 a71 +taishan200-2280-2s64p-256g--a10 a10 +taishan200-2280-2s64p-256g--a3 a3 +taishan200-2280-2s64p-256g--a36 a36 +taishan200-2280-2s64p-256g--a4 a4 +taishan200-2280-2s64p-256g--a40 a40 +taishan200-2280-2s64p-256g--a41 a41 +taishan200-2280-2s64p-256g--a42 a42 +taishan200-2280-2s64p-256g--a8 a8 +taishan200-2280-2s64p-256g--a9 a9 diff --git a/hosts/p b/hosts/p new file mode 100644 index 0000000..9d47282 --- /dev/null +++ b/hosts/p @@ -0,0 +1,10 @@ +#!/bin/bash + +while read line +do + + i=$(echo $line | awk '{print $2}') + j=$(echo $line | awk '{print $1}') + ip=$(grep $i /home/dewan/servers.info | head -n 1 |awk '{print $1}') + echo "ipmi_ip: $ip" >> $j +done < m -- 2.23.0

4 3

[PATCH compass-ci 3/5] container/send-mail: Dockerfile
by Luan Shengde 27 Oct '20

27 Oct '20

updata Dockerfile Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-mail/Dockerfile | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/container/send-mail/Dockerfile b/container/send-mail/Dockerfile index 36b145c..d151bda 100644 --- a/container/send-mail/Dockerfile +++ b/container/send-mail/Dockerfile @@ -2,18 +2,8 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. FROM debian -MAINTAINER luanshd0525(a)163.com +MAINTAINER shdluan(a)163.com ENV DEBIAN_FRONTEND noninteractive -COPY conf/sources.list* /etc/apt/ RUN apt-get update && \ - apt-get install -y ruby-mail ruby-json ruby-sinatra && \ - ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo 'Asia/Shanghai' > /etc/timezone - -EXPOSE 25 - -COPY mail-post.rb /usr/local/bin/ -COPY send-mail.rb /usr/local/bin/ - -CMD ["/usr/local/bin/mail-post.rb"] + apt-get install -y ruby-mail ruby-json ruby-sinatra -- 2.23.0

2 1

[PATCH compass-ci 4/5] container/send-mail: start
by Luan Shengde 27 Oct '20

27 Oct '20

update start Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-mail/start | 68 +++++++++++++-------------------------- 1 file changed, 22 insertions(+), 46 deletions(-) diff --git a/container/send-mail/start b/container/send-mail/start index 80be86a..95d6b02 100755 --- a/container/send-mail/start +++ b/container/send-mail/start @@ -1,60 +1,36 @@ -#!/bin/bash +#!/usr/bin/env ruby # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true -. $CCI_SRC/container/defconfig.sh +require 'set' +require_relative '../defconfig' -docker_rm send-mail +docker_rm 'send-mail' -cmd=( +names = Set.new %w[ + LOCAL_SEND_MAIL_PORT + LOCAL_ROBOT_EMAIL_ADDRESS +] + +defaults = relevant_defaults(names) + +cmd = %W[ docker run --restart=always --name=send-mail -u nobody -d - -p 11311:11311 + -e CCI_SRC=/c/compass-ci + -e SEND_MAIL_PORT=#{defaults['LOCAL_SEND_MAIL_PORT']} + -e ROBOT_EMAIL_ADDRESS=#{defaults['LOCAL_ROBOT_EMAIL_ADDRESS']} + -p #{defaults['LOCAL_SEND_MAIL_PORT']}:#{defaults['LOCAL_SEND_MAIL_PORT']} + -v #{ENV['CCI_SRC']}:/c/compass-ci -v /etc/localtime:/etc/localtime:ro + -w /c/compass-ci/container/send-mail send-mail -) - -"${cmd[@]}" - -cat<<EOF -port: 11311 ---- -data='{ -"from": "email_from_addr" # default: team(a)crystal.ci -"subject": "email subject", -"to": "email_to_addr", -"body": "email message" -}' - -or - -data=" -from: email_from_addr # default: team(a)crystal.ci -subject: email subject -to: email_to_addr -body: email message" - -when compass-ci: - curl -XPOST 'localhost:11311/send_mail_yaml' -d "$data" -when other server: - curl -XPOST '124.90.34.227:11311/send_mail_yaml' -d "$data" - ---- -data=" -From: email_from_addr # default: team(a)crystal.ci -To: email_to_addr -Subject: email_subject +] -mail_msg_line1 -mail_msg_line2 -... -" +cmd += ['ruby', 'send-mail.rb'] -when compass-ci: - curl -XPOST 'localhost:11311/send_mail_text' -d "$data" -when other server: - curl -XPOST '124.90.34.227:11311/send_mail_text' -d "$data" -EOF +system(*cmd) -- 2.23.0

2 4

[PATCH lkp-tests 1/2] jobs/block_size.yaml: add block_size.yaml [why] need test different block_size value
by Lu Kaiyi 27 Oct '20

27 Oct '20

Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- jobs/block_size.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 jobs/block_size.yaml diff --git a/jobs/block_size.yaml b/jobs/block_size.yaml new file mode 100644 index 00000000..1e2239e5 --- /dev/null +++ b/jobs/block_size.yaml @@ -0,0 +1,21 @@ +suite: iozone +testcase: iozone +category: benchmark + +block_size: +- 64k +- 256k +- 1m +- 4m +- 16m + +disk: 2HDD + +fs: +- xfs +- ext4 +- btrfs +iosched: +- kyber + +iozone: -- 2.23.0

2 1

[PATCH lab-z9 2/2] add new host file
by Zhang Dewan 27 Oct '20

27 Oct '20

--- hosts/m | 43 ++------------------------ hosts/taishan200-2280-2s48p-256g--a102 | 1 - hosts/taishan200-2280-2s48p-256g--a103 | 24 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a104 | 23 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a105 | 24 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a106 | 24 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a107 | 24 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a16 | 20 ++++++++++++ hosts/taishan200-2280-2s48p-256g--a35 | 21 +++++++++++++ hosts/taishan200-2280-2s48p-256g--a63 | 19 ++++++++++++ hosts/taishan200-2280-2s48p-256g--a87 | 20 ++++++++++++ hosts/taishan200-2280-2s48p-256g--a95 | 1 - 12 files changed, 202 insertions(+), 42 deletions(-) create mode 100644 hosts/taishan200-2280-2s48p-256g--a103 create mode 100644 hosts/taishan200-2280-2s48p-256g--a104 create mode 100644 hosts/taishan200-2280-2s48p-256g--a105 create mode 100644 hosts/taishan200-2280-2s48p-256g--a106 create mode 100644 hosts/taishan200-2280-2s48p-256g--a107 create mode 100644 hosts/taishan200-2280-2s48p-256g--a16 create mode 100644 hosts/taishan200-2280-2s48p-256g--a35 create mode 100644 hosts/taishan200-2280-2s48p-256g--a63 create mode 100644 hosts/taishan200-2280-2s48p-256g--a87 diff --git a/hosts/m b/hosts/m index b73dfb7..73ba010 100644 --- a/hosts/m +++ b/hosts/m @@ -1,40 +1,3 @@ -taishan200-2280-2s48p-256g--a11 a11 -taishan200-2280-2s48p-256g--a13 a13 -taishan200-2280-2s48p-256g--a14 a14 -taishan200-2280-2s48p-256g--a15 a15 -taishan200-2280-2s48p-256g--a17 a17 -taishan200-2280-2s48p-256g--a18 a18 -taishan200-2280-2s48p-256g--a19 a19 -taishan200-2280-2s48p-256g--a21 a21 -taishan200-2280-2s48p-256g--a22 a22 -taishan200-2280-2s48p-256g--a24 a24 -taishan200-2280-2s48p-256g--a25 a25 -taishan200-2280-2s48p-256g--a26 a26 -taishan200-2280-2s48p-256g--a27 a27 -taishan200-2280-2s48p-256g--a28 a28 -taishan200-2280-2s48p-256g--a29 a29 -taishan200-2280-2s48p-256g--a30 a30 -taishan200-2280-2s48p-256g--a31 a31 -taishan200-2280-2s48p-256g--a32 a32 -taishan200-2280-2s48p-256g--a33 a33 -taishan200-2280-2s48p-256g--a34 a34 -taishan200-2280-2s48p-256g--a52 a52 -taishan200-2280-2s48p-256g--a53 a53 -taishan200-2280-2s48p-256g--a60 a60 -taishan200-2280-2s48p-256g--a61 a61 -taishan200-2280-2s48p-256g--a62 a62 -taishan200-2280-2s48p-256g--a66 a66 -taishan200-2280-2s48p-256g--a67 a67 -taishan200-2280-2s48p-256g--a68 a68 -taishan200-2280-2s48p-256g--a69 a69 -taishan200-2280-2s48p-256g--a70 a70 -taishan200-2280-2s48p-256g--a71 a71 -taishan200-2280-2s64p-256g--a10 a10 -taishan200-2280-2s64p-256g--a3 a3 -taishan200-2280-2s64p-256g--a36 a36 -taishan200-2280-2s64p-256g--a4 a4 -taishan200-2280-2s64p-256g--a40 a40 -taishan200-2280-2s64p-256g--a41 a41 -taishan200-2280-2s64p-256g--a42 a42 -taishan200-2280-2s64p-256g--a8 a8 -taishan200-2280-2s64p-256g--a9 a9 +taishan200-2280-2s48p-256g--a16 a16 +taishan200-2280-2s48p-256g--a35 a35 +taishan200-2280-2s48p-256g--a87 a87 diff --git a/hosts/taishan200-2280-2s48p-256g--a102 b/hosts/taishan200-2280-2s48p-256g--a102 index e1d3f10..267a962 100644 --- a/hosts/taishan200-2280-2s48p-256g--a102 +++ b/hosts/taishan200-2280-2s48p-256g--a102 @@ -1,4 +1,3 @@ -arch: aarch64 nr_node: 4 nr_cpu: 96 memory: 512G diff --git a/hosts/taishan200-2280-2s48p-256g--a103 b/hosts/taishan200-2280-2s48p-256g--a103 new file mode 100644 index 0000000..4afef3c --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a103 @@ -0,0 +1,24 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bdc69 + - /dev/disk/by-id/scsi-350000399b88bdd85 + - /dev/disk/by-id/scsi-350000399b88bdc4d + - /dev/disk/by-id/scsi-350000399b88bdc7d +mac_addr: + - 44:67:47:c9:d8:b8 + - 44:67:47:c9:d8:b9 + - 44:67:47:c9:d8:ba + - 44:67:47:c9:d8:bb + - 44:67:47:c9:d8:bc + - 44:67:47:c9:d8:bd + - 44:67:47:c9:d8:be + - 44:67:47:c9:d8:bf + - cc:05:77:ee:b5:4f + - cc:05:77:ee:b5:50 + - cc:05:77:ee:b5:51 + - cc:05:77:ee:b5:52 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a104 b/hosts/taishan200-2280-2s48p-256g--a104 new file mode 100644 index 0000000..3c5b807 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a104 @@ -0,0 +1,23 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8892431 + - /dev/disk/by-id/scsi-350000399b8892f81 + - /dev/disk/by-id/scsi-350000399b8891c49 + - /dev/disk/by-id/scsi-350000399b88930d1 +mac_addr: + - 44:67:47:d7:6d:f0 + - 44:67:47:d7:6d:f1 + - 44:67:47:d7:6d:f2 + - 44:67:47:d7:6d:f3 + - 44:67:47:d7:6d:f4 + - 44:67:47:d7:6d:f5 + - 44:67:47:d7:6d:f6 + - 44:67:47:d7:6d:f7 + - cc:05:77:ee:b9:6f + - cc:05:77:ee:b9:70 + - cc:05:77:ee:b9:71 + - cc:05:77:ee:b9:72 +model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a105 b/hosts/taishan200-2280-2s48p-256g--a105 new file mode 100644 index 0000000..3c28d2d --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a105 @@ -0,0 +1,24 @@ +nr_node: 4 +nr_cpu: 96 +memory: 512G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b891945d + - /dev/disk/by-id/scsi-350000399b8919135 + - /dev/disk/by-id/scsi-350000399b8919699 + - /dev/disk/by-id/scsi-350000399b89190d5 +mac_addr: + - 44:67:47:d7:76:c4 + - 44:67:47:d7:76:c5 + - 44:67:47:d7:76:c6 + - 44:67:47:d7:76:c7 + - 44:67:47:d7:76:c8 + - 44:67:47:d7:76:c9 + - 44:67:47:d7:76:ca + - 44:67:47:d7:76:cb + - cc:05:77:ee:b2:8f + - cc:05:77:ee:b2:90 + - cc:05:77:ee:b2:91 + - cc:05:77:ee:b2:92 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.10 diff --git a/hosts/taishan200-2280-2s48p-256g--a106 b/hosts/taishan200-2280-2s48p-256g--a106 new file mode 100644 index 0000000..a7b44a0 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a106 @@ -0,0 +1,24 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b883bf99 + - /dev/disk/by-id/scsi-350000399b883ba89 + - /dev/disk/by-id/scsi-350000399b883b94d + - /dev/disk/by-id/scsi-350000399b883b981 +mac_addr: + - 44:67:47:86:1c:30 + - 44:67:47:86:1c:31 + - 44:67:47:86:1c:32 + - 44:67:47:86:1c:33 + - 44:67:47:86:1c:34 + - 44:67:47:86:1c:35 + - 44:67:47:86:1c:36 + - 44:67:47:86:1c:37 + - cc:05:77:ee:b7:df + - cc:05:77:ee:b7:e0 + - cc:05:77:ee:b7:e1 + - cc:05:77:ee:b7:e2 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a107 b/hosts/taishan200-2280-2s48p-256g--a107 new file mode 100644 index 0000000..9d20e57 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a107 @@ -0,0 +1,24 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8917c39 + - /dev/disk/by-id/scsi-350000399b8918005 + - /dev/disk/by-id/scsi-350000399b8900a4d + - /dev/disk/by-id/scsi-350000399b8900799 +mac_addr: + - 84:46:fe:73:a2:71 + - 84:46:fe:73:a2:72 + - 84:46:fe:73:a2:73 + - 84:46:fe:73:a2:74 + - 84:46:fe:73:a2:75 + - 84:46:fe:73:a2:76 + - 84:46:fe:73:a2:77 + - 84:46:fe:73:a2:78 + - 44:a1:91:35:1a:70 + - 44:a1:91:35:1a:71 + - 44:a1:91:35:1a:72 + - 44:a1:91:35:1a:73 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.12 diff --git a/hosts/taishan200-2280-2s48p-256g--a16 b/hosts/taishan200-2280-2s48p-256g--a16 new file mode 100644 index 0000000..62cb124 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a16 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf271 + - /dev/disk/by-id/scsi-350000399b88bf1a9 + - /dev/disk/by-id/scsi-350000399b88bf0d5 + - /dev/disk/by-id/scsi-350000399b88bf385 +mac_addr: + - 84:46:fe:3d:a2:17 + - 84:46:fe:3d:a2:18 + - 84:46:fe:3d:a2:19 + - 84:46:fe:3d:a2:1a + - 84:46:fe:3d:a2:1b + - 84:46:fe:3d:a2:1c + - 84:46:fe:3d:a2:1d + - 84:46:fe:3d:a2:1e +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.6 diff --git a/hosts/taishan200-2280-2s48p-256g--a35 b/hosts/taishan200-2280-2s48p-256g--a35 new file mode 100644 index 0000000..ec1e524 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a35 @@ -0,0 +1,21 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a71a5 + - /dev/disk/by-id/scsi-350000399886b66dd-part1 + - /dev/disk/by-id/scsi-350000399886b66dd-part2 + - /dev/disk/by-id/scsi-350000399886b66dd-part3 + - /dev/disk/by-id/scsi-362c97b1c6eedb00026e527a2b8b998f2 +mac_addr: + - 44:67:47:c9:ec:ec + - 44:67:47:c9:ec:ed + - 44:67:47:c9:ec:ee + - 44:67:47:c9:ec:ef + - 44:67:47:c9:ec:f0 + - 44:67:47:c9:ec:f1 + - 44:67:47:c9:ec:f2 + - 44:67:47:c9:ec:f3 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.12 diff --git a/hosts/taishan200-2280-2s48p-256g--a63 b/hosts/taishan200-2280-2s48p-256g--a63 new file mode 100644 index 0000000..6d4b636 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a63 @@ -0,0 +1,19 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886b0431 + - /dev/disk/by-id/scsi-350000399886adc71 + - /dev/disk/by-id/scsi-350000399886b66f5 + - /dev/disk/by-id/scsi-350000399886b6b75 +mac_addr: + - 44:67:47:c9:e5:44 + - 44:67:47:c9:e5:45 + - 44:67:47:c9:e5:46 + - 44:67:47:c9:e5:47 + - 44:67:47:c9:e5:48 + - 44:67:47:c9:e5:49 + - 44:67:47:c9:e5:4a + - 44:67:47:c9:e5:4b +model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a87 b/hosts/taishan200-2280-2s48p-256g--a87 new file mode 100644 index 0000000..b87417b --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a87 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a6b55 + - /dev/disk/by-id/scsi-350000399886ad4a5 + - /dev/disk/by-id/scsi-350000399886a7139 + - /dev/disk/by-id/scsi-350000399886acb21 +mac_addr: + - 44:67:47:c9:eb:66 + - 44:67:47:c9:eb:67 + - 44:67:47:c9:eb:68 + - 44:67:47:c9:eb:69 + - 44:67:47:c9:eb:6a + - 44:67:47:c9:eb:6b + - 44:67:47:c9:eb:6c + - 44:67:47:c9:eb:6d +model_name: Kunpeng-920 +ipmi_ip: 9.3.8.4 diff --git a/hosts/taishan200-2280-2s48p-256g--a95 b/hosts/taishan200-2280-2s48p-256g--a95 index 213d10f..3fd8124 100644 --- a/hosts/taishan200-2280-2s48p-256g--a95 +++ b/hosts/taishan200-2280-2s48p-256g--a95 @@ -1,4 +1,3 @@ -arch: aarch64 nr_node: 4 nr_cpu: 96 memory: 512G -- 2.23.0

3 2

[PATCH compass-ci] fix: sched: alter 'ip' -> 'direct_ips', 'server' -> 'direct_server_ips'
by Ren Wen 27 Oct '20

27 Oct '20

[Why] 1) 'ip' -> 'direct_ips' : Cluster test script need to known direct-ip not ip. ip comes from node by command $(hostname -I | cut -d' ' -f1), it's not a direct-ip. 2) 'server' -> 'direct_server_ips' : Cluster test script uses variables 'direct_server_ips' or 'server' to connect daemon node, i perfer to 'direct_server_ips' example: iperf test: ```shell ... [ -n "$direct_server_ips" ] && server=$direct_server_ips [ -z "$server" ] && server=127.0.0.1 server=${server%% *} client_cmd="iperf3 -t $runtime -J -c $server $opt_udp" ... ``` Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index c32091f..ced0276 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -98,13 +98,13 @@ class Sched return cluster_state when "write_state" node_roles = env.params.query["node_roles"] - node_ip = env.params.query["ip"] + node_ip = env.params.query["direct_ips"] update_cluster_state(cluster_id, job_id, "roles", node_roles) update_cluster_state(cluster_id, job_id, "ip", node_ip) when "roles_ip" role = "server" server_ip = get_ip(cluster_id, role) - return "server=#{server_ip}" + return "direct_server_ips=#{server_ip}" end # show cluster state -- 2.23.0

1 0

[PATCH v1 compass-ci] specify the queues for the test machine to consume
by Xiao Shenwei 27 Oct '20

27 Oct '20

Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/my-qemu.sh | 4 +++- providers/qemu.sh | 13 +++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/providers/my-qemu.sh b/providers/my-qemu.sh index 954d3a0..7f3aa1b 100755 --- a/providers/my-qemu.sh +++ b/providers/my-qemu.sh @@ -4,6 +4,8 @@ [[ $tbox_group ]] || tbox_group=vm-2p8g -export hostname=$tbox_group--$USER-$$ +export hostname=$tbox_group.$USER-$$ +# specify which queues will be request, use " " to separate more than 2 values +export queues="vm-2p8g.aarch64 vm-2p8g~$USER" $CCI_SRC/providers/qemu.sh diff --git a/providers/qemu.sh b/providers/qemu.sh index d97fd85..9e7627f 100755 --- a/providers/qemu.sh +++ b/providers/qemu.sh @@ -9,6 +9,7 @@ load_cci_defaults : ${hostname:="vm-1p1g-1"} +: ${queue:="vm-1p1g.$(arch)"} # unicast prefix: x2, x6, xA, xE export mac=$(echo $hostname | md5sum | sed 's/^$..$$..$$..$$..$$..$.*$/0a-\1-\2-\3-\4-\5/') echo hostname: $hostname @@ -17,7 +18,15 @@ echo $mac > mac echo "arp -n | grep ${mac//-/:}" > ip.sh chmod +x ip.sh -curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}" +set_mac2host() +{ + local queues + # use "," replace " " + queues=${queue/ /,} + echo $queues + curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}&queues=${queues}" +} +set_mac2host del_host_mac() { @@ -33,7 +42,7 @@ trap del_host_mac EXIT tbox_group=$hostname fi - host=${tbox_group%%--*} + host=${tbox_group%.*} create_yaml_variables "$LKP_SRC/hosts/${host}" -- 2.23.0

2 6

[PATCH lkp-tests] check QEMU_EFI.fd file for multi-qemu
by Xiao Shenwei 27 Oct '20

27 Oct '20

[why] for multi-qemu job, the qemu-efi container will build error, then the QEMU_EFI.fd will not found, it caused one job will be remove from redis, but kvm can't execute it. so, this job looks like it's been executed, but not result file. Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- daemon/multi-qemu | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/multi-qemu b/daemon/multi-qemu index b407251f..5f4d976b 100755 --- a/daemon/multi-qemu +++ b/daemon/multi-qemu @@ -7,6 +7,7 @@ multi_qemu() { + [ -f "/usr/share/qemu-efi-aarch64/QEMU_EFI.fd" ] || return export CCI_SRC=/c/compass-ci local hostname=$tbox_group--$HOSTNAME -- 2.23.0

2 1

[PATCH compass-ci 2/5] container/send-mail: mail-post.rb
by Luan Shengde 27 Oct '20

27 Oct '20

fix function invoke bugs Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- lib/mail-post.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mail-post.rb b/lib/mail-post.rb index 5832bfb..0b1f94a 100755 --- a/lib/mail-post.rb +++ b/lib/mail-post.rb @@ -22,7 +22,7 @@ post '/send_mail_yaml' do 'body' => data['body'] } - check_send_mail(mail_info) + send_mail(mail_info) end post '/send_mail_text' do -- 2.23.0

2 2

[PATCH compass-ci] doc: reset tutorial
by Li Ping 27 Oct '20

27 Oct '20

--- doc/tutorial.md | 257 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 203 insertions(+), 54 deletions(-) diff --git a/doc/tutorial.md b/doc/tutorial.md index 03f1342..aea6cc2 100644 --- a/doc/tutorial.md +++ b/doc/tutorial.md @@ -5,7 +5,7 @@ ### 概念 -Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上游开源软件（来自 Github, Gitee, Gitlab 等托管平台）的测试服务、登录服务、故障辅助定界服务和基于历史数据的分析服务。通过 Compass-CI，社区开发者可以将开源软件快速引入 openEuler 社区，并补充更多的测试用例，共同构建一个开放、完整的开源软件生态系统。 +Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上游开源软件（来自 Github,Gitee,Gitlab 等托管平台）的测试服务、登录服务、故障辅助定界服务和基于历史数据的分析服务。通过Compass-CI，社区开发者可以将开源软件快速引入openEuler社区，并补充更多的测试用例，共同构建一个开放、完整的开源软件生态系统。 ### 功能描述 @@ -30,7 +30,7 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上 - 聚合开发者测试用例 - 开发者向代码托管平台提交代码、测试用例、测试工具时，Compass-CI 自动获取提交的代码开展构建测试，同时获取开发者编写到开源软件包的测试用例进行自动化测试，并反馈测试结果。 + 开发者向代码托管平台提交代码、测试用例、测试工具时，Compass-CI自动获取提交的代码开展构建测试，同时获取开发者编写到开源软件包的测试用例进行自动化测试，并反馈测试结果。 - 登录环境随时调测 @@ -46,28 +46,59 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上 -## 使用 Compass-CI -> 当您注册之后，便可以编写 yaml 文件并通过我们的工具上传任务以进行自定义测试，测试功能将尽快上线。 +## 使用Compass-CI +### 前提条件 + + +- 申请账号 + + 您可以通过向**compass-ci(a)139.xn--com**,-1y7i63cba145j8lao86rn19at45crrlpsetoortax6hia2663b"**apply account**"，在正文中提供**您向开源项目提交过的commit的url地址**(我们将根据此进行审查并决定是否发放账号)，并以附件方式添加**准备用来提交任务的个人电脑的公钥**。 + 发送邮件后，将收到一封回复邮件，邮件回复内容如下： + + account_uuird: xxxxxx + SCHED_HOST: ip # 下面配置中将会使用到的ip地址 + SCHED_PORT: port # 下面配置中将会使用到的端口 + +- 构建本地可以提交job的环境 + + - 下载安装[lkp-tests](https://gitee.com/wu_fengguang/lkp-tests) + ```bash + git clone https://gitee.com/wu_fengguang/lkp-tests.git + cd lkp-tests + sudo make install + ``` + + - 配置lab + + - 编辑`.../lkp-tests/include/lab/z9` + ```yaml + SCHED_HOST: ip # 申请账号时回复邮件中的ip + SCHED_PORT: port # 申请账号时回复邮件中的端口 + ``` + - 新建`$HOME/.config/compass-ci/defaults/$USER.yaml` 内容如下 + ```yaml + lab: z9 + ``` - 注册自己的仓库 - 如果您想在 `git push` 的时候, 自动触发测试, 那么需要把您的公开 git url 添加到如下仓库 [upstream-repos](https://gitee.com/wu_fengguang/upstream-repos)。 + 如果您想在 `git push` 的时候, 自动触发测试, 那么需要把您的公开 git url 添加到如下仓库[upstream-repos](https://gitee.com/wu_fengguang/upstream-repos)。 ```bash git clone https://gitee.com/wu_fengguang/upstream-repos.git less upstream-repos/README.md ``` -### 编写 job yaml 文件 +### 编写job yaml文件 -#### job yaml 简介 -job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAML_for_ruby.html)的格式编写，所有 job 文件位于```$LKP_SRC/jobs```路径下。[$LKP_SRC](https://gitee.com/wu_fengguang/lkp-te… +#### job yaml简介 +job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAML_for_ruby.html)的格式编写，所有 job 文件位于```$LKP_SRC/jobs```路径下。 -#### job yaml 的结构 +#### job yaml的结构 - 标识头部 Header（必选） - 每一个 job 文件的开始部分，都有一些基础的描述信息，称之为 yaml 的 Header。头部主要有 suite 和 category，suite 是测试套的名称。category 是测试类型，包括 benchmarch（性能测试）/functional（功能测试）/noise-benchmark（不常用）。 + 每一个job文件的开始部分，都有一些基础的描述信息，称之为yaml的Header。头部主要有suite和category，suite是测试套的名称。category是测试类型，包括benchmarch（性能测试）/functional（功能测试）/noise-benchmark（不常用）。 ```yaml suite: netperf \\测试套名称 @@ -76,7 +107,7 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM - 测试脚本和参数（必选） - - 测试脚本位于```$LKP_SRC/tests```，```$LKP_SRC/daemon```路径下。job yaml 中写入与上述路径中脚本相匹配的文件，将其视为可执行脚本。 + - 测试脚本位于```$LKP_SRC/tests```，```$LKP_SRC/daemon```路径下。job yaml中写入与上述路径中脚本相匹配的文件，将其视为可执行脚本。 ``` $LKP_SRC/setup @@ -101,7 +132,7 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM SUT/schduler/部署等资源相关变量。 ```yaml - testbox: vm-2p8g + testbox: vm-hi1620-2p8g os: openeuler os_version: 20.03 os_arch: aarch64 @@ -129,52 +160,170 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM nterval: 5 ``` -**了解更多 job yaml 相关知识** [Job definition to execution](https://gitee.com/wu_fengguang/lkp-tests/blob/master/jobs/README… +**了解更多job yaml相关知识** [Job definition to execution](https://gitee.com/wu_fengguang/lkp-tests/blob/master/jobs/README… ### 提交测试任务 + +使用```submit```关键字提交测试任务，以netperf为例，命令如下。 +```bash +submit netperf.yaml +``` + + +submit命令更多参数设置方法如下。 +``` +- Usage: submit [options] jobs... + submit test jobs to scheduler +- options: + - s, --set 'KEY: VALUE' #add YAML hash to job + - o, --output DIR #save job yaml to DIR + - a, --auto-define-files #auto add define_files + - c, --connect #auto connect to the host + - m, --monitor # monitor job status: use -m 'KEY: VALUE' to add rule" +``` + + ### 查看测试结果 + +- 生成与存储测试结果 + 测试执行机完成测试任务后，将结果保存到日志文件中，并上传至服务器，按照```$suite/$tbox_group/$date/job_id```的目录结构存储在本地```/srv/result```目录。 + extract-stats 服务将提取本地日志文件中的数据，生成与日志文件对应的json文件，并将汇总后的结果存储到obs数据库(ES)对应id的job中。 + + +- web页面查看结果: + - 点击链接查看obs数据库（ES）中的结果：https://compass-ci.openeuler.org/jobs + + - 点击链接查看文件中的结果,示例：http://124.90.34.227:11300/result/iperf/dc-2g--xiao/2020-09-21/crystal.83385/，文件分为两类： + + - 由测试执行机上传的日志文件： + boot-time, diskstats.gz, interrupts.gz, ...等。 + + - 由extract-stats服务生成的json文件： + boot-time.json, diskstats.json, interrupts.json,stats.json, ... 等。 + json 文件对应每一个日志文件提取后的结果，stats.json为汇总后的结果。 + + ### 比较测试结果 -### 提交 borrow 任务 +测试完成后，Compass-CI通过条件查询数据并将数据合并为多个矩阵，计算每个矩阵的平均值和标准差，以比较测试用例在特定维度的性能变化。最后，将比较结果打印输出。 + + +可以通过如下两种方式比较测试结果： + +- 通过compare web比较 + Compass CI/compare + +- 通过命令行比较 + ``` + compare conditions -d dimension + ``` + +示例比较测试结果如下。 +``` + os=openeuler/os_arch=aarch64/tbox_group=vm-hi1620-2p8g + + + 20 1 metric + -------------------- ------------------------------ ------------------------------ + fails:runs change fails:runs + | | | + 8:21 -38.1% 0:1 last_state.daemon.sshd.exit_code.1 + 1:21 -4.8% 0:1 last_state.daemon.sshd.exit_code.2 + 1:21 -4.8% 0:1 last_state.setup.disk.exit_code.1 + 1:21 -4.8% 0:1 last_state.test.dbench.exit_code.99 + 1:21 -4.8% 0:1 last_state.test.email.exit_code.7 + + + 20 1 metric + -------------------- ------------------------------ ------------------------------ + %stddev change %stddev + \ | \ + 0.02 ± 265% +2259.8% 0.57 mpstat.cpu.all.soft% + 0.48 ± 299% +1334.9% 6.90 mpstat.cpu.all.sys% + 2760.71 ± 164% +292.6% 10838.00 proc-vmstat.nr_dirty_background_threshold + 5522.10 ± 164% +292.6% 21680.00 proc-vmstat.nr_dirty_threshold + +``` + + +### 提交borrow任务 + +borrow任务是指通过提交任务的方式申请环境，提交borrow任务的yaml文件请参考lkp-tests/jobs/borrow-1h.yaml。 + +1. yaml文件配置说明： + + - 必填字段： + ``` + sshd: + pub_key \\将用户的公钥信息添加到job中 + email \\ 配置用户邮箱地址 + runtime \\申请环境的使用时间 h/d/w + testbox \\申请环境的规格 + ``` + - 选填字段： + ``` + os \\申请环境的操作系统参数 + os_arch + os_version + ``` + +2. 提交任务 + + 执行命令```submit -m -c borrow-1h.yaml```，可以提交borrow任务并自动ssh连接到申请的环境当中。 + ### 提交 bisect 任务 +bisect 任务可以找到首次在git repo中引入问题的commit信息。提交bisect任务的yaml文件请参考 $LKP_SRC/jobs/bisect.yaml。 + +1. yaml文件配置说明： + - 必填字段： + ``` + bisect: + job_id: \\提交job的job_id + error_id: \\在Compass-CI网页上搜索$job_id，得到$error_ids，从$error_ids中选择一个$error_id。 + ``` +2. 提交任务 + 执行命令```submit bisect.yaml```，提交成功后会收到通知邮件。 + + + ## 高级功能 -### 添加 OS 支持 +### 添加OS支持 -制作一个 initramfs 启动的 cgz 镜像，当系统内核启动时，直接从打包的 cgz 镜像中导出 rootfs，在内存中展开文件系统，利用磁盘的高速缓存机制让系统直接在内存中读写文件，以提升系统的 I/O 性能。 +制作一个initramfs启动的cgz镜像，当系统内核启动时，直接从打包的cgz镜像中导出rootfs，在内存中展开文件系统，利用磁盘的高速缓存机制让系统直接在内存中读写文件，以提升系统的I/O性能。 #### 操作步骤 - 1. 获取对应 os 版本的 rootfs（以 openEuler 为例） - - 通过 docker 获取 rootfs + 1. 获取对应os版本的rootfs（以openEuler为例） + - 通过docker获取rootfs - 1) 下载 openEuler 官方提供的 docker 镜像压缩包 + 1) 下载openEuler官方提供的docker镜像压缩包 ```bash wget https://repo.openeuler.org/openEuler-20.03-LTS/docker_img/aarch64/openEuler… ``` - 2) 加载 docker 镜像 + 2) 加载docker镜像 ```bash docker load -i openEuler-docker.aarch64 ``` - 3) 启动 openEuler 容器 + 3) 启动openEuler容器 ```bash docker run -id openeuler-20.03-lts ``` - 4) 拷贝 docker 的 rootfs + 4) 拷贝docker的rootfs ```bash docker cp -a docker run -d openeuler-20.03-lts:/ openEuler-rootfs ``` - - 通过 qemu.img(qcow2格式)获取 rootfs (openEuler为例) + - 通过qemu.img(qcow2格式)获取rootfs (以openEuler为例) - 1) 下载 openEule r官方网站提供的 qcow2 格式镜像 + 1) 下载openEuler官方网站提供的qcow2格式镜像 ```bash wget https://repo.openeuler.org/openEuler-20.03-LTS/virtual_machine_img/aarch64/… ``` @@ -184,22 +333,22 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM ./run openEuler-20.03-LTS.aarch64.qcow2.xz /tmp/openEuler-rootfs ``` 2. 定制rootfs - 1. 使用chroot命令切换到 rootfs (此步骤需要 root 权限) + 1. 使用chroot命令切换到rootfs中(此步骤需要root权限) ```bash chroot openEuler-rootfs ``` 2. 根据个人需要安装并配置服务 - a. 修改 root 密码 - b. 配置 ssh 服务 + a. 修改root密码 + b. 配置ssh服务 c. 检查系统时间 - d. 如果使用 docker 制作 osimage 还需要以下操作： + d. 如果使用docker制作osimage还需要以下操作： > 1. 安装所需版本内核 - > 2. 从 centos 官方网站下载内核rpm包 - > 3. 使用 yum 进行安装 - > 4. 删除 docker 环境变量文件 + > 2. 从centos官方网站下载内核rpm包 + > 3. 使用yum进行安装 + > 4. 删除docker环境变量文件 - 3. 退出 rootfs，并打包 + 3. 退出rootfs，并打包 ```bash cd $rootfs find . | coip -o -Hnewc |gzip -9 > $os_name.cgz @@ -218,7 +367,7 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM - 解决方法 1）启动内存不足，增加内存可解决。 - 2）内核文件权限不足，给予 644 权限。 + 2）内核文件权限不足，给予644权限。 2. 系统运行缓慢 @@ -227,7 +376,7 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM 打包镜像体积过大，会消耗很大内存 - 解决方法 - 建议用户根据具体需要对 rootfs 进行裁剪。 + 建议用户根据具体需要对rootfs进行裁剪。 ### 添加测试用例 @@ -238,13 +387,13 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM 1. 概述： - 使用 PKGBUILD 完成上游项目源代码的编译构建，同一项目可以使用不同 PKGBUILD 完成项目编译构建过程。 - PKGBUILD 相关参考文档：https://wiki.archlinux.org/index.php/PKGBUILD。 + 使用PKGBUILD完成上游项目源代码的编译构建，同一项目可以使用不同PKGBUILD完成项目编译构建过程。 + PKGBUILD相关参考文档：https://wiki.archlinux.org/index.php/PKGBUILD 2. 步骤： 1) 注册仓库 - 如果您想在 git push 的时候, 自动触发测试, 那么需要把您的公开 git url 添加到如下仓库 [upstream-repos](https://gitee.com/wu_fengguang/upstream-repos)。 + 如果您想在git push的时候, 自动触发测试, 那么需要把您的公开git url添加到如下仓库[upstream-repos](https://gitee.com/wu_fengguang/upstream-repos) ```bash git clone https://gitee.com/wu_fengguang/upstream-repos.git less upstream-repos/README.md @@ -254,17 +403,17 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM 项目代码更新后自动触发构建任务，无需其他操作。 3) 查看结果 - web: https://compass-ci.openeuler.org/jobs。 + web: https://compass-ci.openeuler.org/jobs 4) 备注 - 目前提供 archlinux 下已有 PKGBUILD 项目构建测试，暂不支持自主导入 PKGBUILD 文件。 - PKGBUILD 存放路径： /srv/git/archlinux/*/*/PKGBUILD。 + 目前提供archlinux下已有PKGBUILD项目构建测试，暂不支持自主导入PKGBUILD文件。 + PKGBUILD存放路径： /srv/git/archlinux/*/*/PKGBUILD ### depends - 依赖包构建 - 流程: 以下默认使用 debian:sid 版本进行,如果使用其他OS跑测试用例，则需要在 lkp-tests/distro/adaptation/ 下将包名以键值对的形式写入对应 OS 的文件中 + 流程: 以下默认使用debian:sid版本进行,如果使用其他OS跑测试用例，则需要在lkp-tests/distro/adaptation/下将包名以键值对的形式写入对应OS的文件中 > 例： `echo 'apache2: httpd' >> lkp-tests/distro/adaptation/openeuler` 1) 在lkp-tests/distro/depends/下新建一个与测试用例同名的文件 @@ -280,40 +429,40 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM -### 本地搭建 compass-ci 服务器节点 +### 本地搭建compass-ci 服务器节点 -在 openEuler 系统一键部署 compass-ci 环境，当前已支持 openEuler-aarch64-20.03-LTS 系统环境，以下配置仅供参考。 +在openEuler系统一键部署compass-ci环境，当前已支持 openEuler-aarch64-20.03-LTS 系统环境，以下配置仅供参考。 #### 准备工作 - 硬件 - 服务器类型：ThaiShan200-2280 (建议) - 架构：aarch64 - 内存：>= 8GB - CPU：64 nuclear (建议) + 服务器类型：ThaiShan200-2280 (建议) + 架构：aarch64 + 内存：>= 8GB + CPU：64 nuclear (建议) 硬盘：>= 500G - 软件 - OS：openEuler-aarch64-20.03 LTS - git：2.23.0版本 (建议) - 预留空间：>= 300G + OS：openEuler-aarch64-20.03 LTS + git：2.23.0版本 (建议) + 预留空间：>= 300G 网络：可以访问互联网 >**说明：** - >openEuler 系统安装详细操作请参考[添加测试用例](https://openeuler.org/zh/docs/20.03_LTS/docs/Installati… + >openEuler系统安装详细操作请参考[添加测试用例](https://openeuler.org/zh/docs/20.03_LTS/docs/I… #### 操作指导 -1. 登录 openEuler 系统 +1. 登录openEuler系统 2. 创建工作目录并设置文件权限 ```bash mkdir demo && cd demo && umask 002 ``` -3. 克隆 compass-ci 项目代码到 demo 目录 +3. 克隆compass-ci项目代码到demo目录 ```bash git clone https://gitee.com/wu_fengguang/compass-ci.git ``` -4. 执行一键部署脚本 install-tiny +4. 执行一键部署脚本install-tiny ```bash cd compass-ci/sparrow && ./install-tiny ``` -- 2.23.0

1 0