- Compass-ci - mailweb.openeuler.org

[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