January 2021 - Compass-ci - mailweb.openeuler.org

[PATCH compass-ci 1/2] sparrow: move gem pkg into install script
by Liu Yinsi 29 Jan '21

29 Jan '21

Easy to call individually common script without internet Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/common | 2 -- sparrow/0-package/install | 2 +- sparrow/install-tiny | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 2d7c9e3..ccdc3f3 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -2,8 +2,6 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. -gem install --no-user-install git activesupport rest-client cucumber json faye-websocket elasticsearch - grep -q '^lkp:' /etc/passwd || useradd -u 1090 lkp grep -q '^mailer:' /etc/passwd || useradd -u 1144 mailer grep -q '^team:' /etc/group || groupadd team diff --git a/sparrow/0-package/install b/sparrow/0-package/install index 2b9a8f5..e01fc45 100755 --- a/sparrow/0-package/install +++ b/sparrow/0-package/install @@ -6,4 +6,4 @@ source /etc/os-release . $(dirname ${BASH_SOURCE[0]})/os/${ID} -. $(dirname ${BASH_SOURCE[0]})/common +gem install --no-user-install git activesupport rest-client cucumber json faye-websocket elasticsearch diff --git a/sparrow/install-tiny b/sparrow/install-tiny index a291549..cb47cf5 100755 --- a/sparrow/install-tiny +++ b/sparrow/install-tiny @@ -8,6 +8,7 @@ cd $CCI_SRC/sparrow || exit 0-package/install +0-package/common 1-storage/tiny 1-storage/permission 2-network/br0 -- 2.23.0

2 2

[PATCH v3 compass-ci 1/2] lib: add log.sh
by Liu Yinsi 29 Jan '21

29 Jan '21

Records the run logs of the shell program Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- lib/log.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 lib/log.sh diff --git a/lib/log.sh b/lib/log.sh new file mode 100644 index 0000000..626a6e4 --- /dev/null +++ b/lib/log.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +log_info() +{ + date +"[INFO] %F %T ${0##*/}: $*" +} + +log_debug() +{ + date +"[DEBUG] %F %T ${0##*/}: $*" +} + +log_warn() +{ + date +"[WARN] %F %T ${0##*/}: $*" >&2 +} + +log_error() +{ + date +"[ERROR] %F %T ${0##*/}: $*" >&2 +} -- 2.23.0

3 4

[PATCH v2 compass-ci] sparrow/0-package: set umask 002
by Liu Yinsi 29 Jan '21

29 Jan '21

Insure programs have necessary permission to work normally. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/common | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 2d7c9e3..6b4a834 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -27,6 +27,12 @@ cat >> /etc/modules-load.d/cifs <<EOF cifs EOF +cat >> /etc/bashrc <<EOF +umask 002 +EOF + +source /etc/bashrc + server_ip=$(ip route get 1.2.3.4 | awk '{print $7; exit}') : ${DOCKER_REGISTRY_HOST:=$server_ip} -- 2.23.0

2 2

[PATCH v2 compass-ci] lib/es_jobs.rb: more accurate matching summary info
by Wu Zhende 29 Jan '21

29 Jan '21

1. The fail/error/warning cases should not take input from stderr.* stderr is rather chaotic -- let it stay in any_stderr. 2. The warning match should be more exact. Avoid matching nr_warning So does error Don't use stderr.* as examples for them. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- lib/es_jobs.rb | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/es_jobs.rb b/lib/es_jobs.rb index e367a91..9e0c671 100644 --- a/lib/es_jobs.rb +++ b/lib/es_jobs.rb @@ -33,29 +33,30 @@ class ESJobs def set_job_summary(stats, job) summary_result = '' stats.each_key do |stat| - # "stderr.warning:rubygems_will_be_installed_before_its_ruby_dependency": 1, - # "stderr._#warning_FORTIFY_SOURCE_requires_compiling_with_optimization(-O)": 1, - # "stderr.disk_src.c:#:#:warning:incompatible_implicit_declaration_of_built-in_function'strcpy'": 1, - if stat.match(/warning/i) - job['summary.any_warning'] = 1 - summary_result = 'warning' - end # "stderr.linux-perf": 1, # "stderr.error:target_not_found:ruby-dev": 1, # "stderr.error:could_not_open_file/var/lib/pacman/local/ldb-#:#-#/desc:Not_a_directory": 1, if stat.match(/stderr\./i) job['summary.any_stderr'] = 1 summary_result = 'stderr' + next end - # "stderr.::Proceed_with_installation?[Y/n]error:target_not_found:liblzma-dev": 1, - # "stderr.==>ERROR:Failure_while_downloading_apache-cassandra": 1, - # "stderr.ftq.h:#:#:error:unknown_type_name'ticks'": 1, + + # sum.stats.build-pkg.mb_cache.c:warning:‘read_cache’defined-but-not-used[-Wunused-function]: 1 + # sum.stats.build-pkg.mb_cache.c:warning:control-reaches-end-of-non-void-function[-Wreturn-type]: 1 + if stat.match(/warning/i) && !stat.match(/nr_warning/i) + job['summary.any_warning'] = 1 + summary_result = 'warning' + end + # "last_state.test.iperf.exit_code.127": 1, # "last_state.test.cci-makepkg.exit_code.1": 1, - if stat.match(/error|\.exit_code\./i) + # sum.stats.build-pkg.cc1plus:error:unrecognized-command-line-option‘-Wno-unknown-warning-option’[-Werror]: 2 + if stat.match(/error|\.exit_code\./i) && !stat.match(/nr_error/i) job['summary.any_error'] = 1 summary_result = 'error' end + if stat.match(/\.fail$/i) job['summary.any_fail'] = 1 summary_result = 'fail' -- 2.23.0

2 1

[PATCH v3 lab-z9] modify the lab-z9/allot/idle
by Zhang Dewan 28 Jan '21

28 Jan '21

dewan@crystal ~/128/lab-z9/allot% tree . . └── idle ├── taishan200-2280-2s48p-256g--a11 -> taishan200-2280-2s48p-256g--multi-docker ├── taishan200-2280-2s48p-256g--a12 -> taishan200-2280-2s48p-256g--multi-docker ├── taishan200-2280-2s48p-256g--a13 -> taishan200-2280-2s48p-256g--multi-docker ├── taishan200-2280-2s48p-256g--a14 -> taishan200-2280-2s48p-256g--multi-docker ├── taishan200-2280-2s48p-256g--a15 -> taishan200-2280-2s48p-256g--multi-docker ├── taishan200-2280-2s48p-256g--a16 -> taishan200-2280-2s48p-256g--multi-docker ├── taishan200-2280-2s48p-256g--a17 -> taishan200-2280-2s48p-256g--multi-docker ├── taishan200-2280-2s48p-256g--a18 -> taishan200-2280-2s48p-256g--multi-docker ├── taishan200-2280-2s48p-256g--a19 -> taishan200-2280-2s48p-256g--multi-docker ├── taishan200-2280-2s48p-256g--a20 -> taishan200-2280-2s48p-256g--multi-docker ├── taishan200-2280-2s48p-256g--a60 -> taishan200-2280-2s48p-256g--multi-qemu ├── taishan200-2280-2s48p-256g--a61 -> taishan200-2280-2s48p-256g--multi-qemu ├── taishan200-2280-2s48p-256g--a62 -> taishan200-2280-2s48p-256g--multi-qemu ├── taishan200-2280-2s48p-256g--multi-docker │ └── multi-docker.yaml └── taishan200-2280-2s48p-256g--multi-qemu └── multi-qemu.yaml Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- allot/idle/taishan200-2280-2s48p-256g--a11 | 2 +- allot/idle/taishan200-2280-2s48p-256g--a12 | 2 +- allot/idle/taishan200-2280-2s48p-256g--a13 | 2 +- allot/idle/taishan200-2280-2s48p-256g--a14 | 2 +- allot/idle/taishan200-2280-2s48p-256g--a15 | 2 +- allot/idle/taishan200-2280-2s48p-256g--a16 | 2 +- allot/idle/taishan200-2280-2s48p-256g--a17 | 2 +- allot/idle/taishan200-2280-2s48p-256g--a18 | 2 +- allot/idle/taishan200-2280-2s48p-256g--a19 | 2 +- allot/idle/taishan200-2280-2s48p-256g--a20 | 2 +- allot/idle/taishan200-2280-2s48p-256g--a21 | 1 - allot/idle/taishan200-2280-2s48p-256g--a22 | 1 - allot/idle/taishan200-2280-2s48p-256g--a24 | 1 - allot/idle/taishan200-2280-2s48p-256g--a25 | 1 - allot/idle/taishan200-2280-2s48p-256g--a26 | 1 - allot/idle/taishan200-2280-2s48p-256g--a27 | 1 - allot/idle/taishan200-2280-2s48p-256g--a28 | 1 - allot/idle/taishan200-2280-2s48p-256g--a29 | 1 - allot/idle/taishan200-2280-2s48p-256g--a30 | 1 - allot/idle/taishan200-2280-2s48p-256g--a31 | 1 - allot/idle/taishan200-2280-2s48p-256g--a32 | 1 - allot/idle/taishan200-2280-2s48p-256g--a33 | 1 - allot/idle/taishan200-2280-2s48p-256g--a34 | 1 - allot/idle/taishan200-2280-2s48p-256g--a35 | 1 - allot/idle/taishan200-2280-2s48p-256g--a60 | 1 + allot/idle/taishan200-2280-2s48p-256g--a61 | 2 +- allot/idle/taishan200-2280-2s48p-256g--a62 | 2 +- allot/idle/taishan200-2280-2s48p-256g--a63 | 1 - allot/idle/taishan200-2280-2s48p-256g--a64 | 1 - allot/idle/taishan200-2280-2s48p-256g--a65 | 1 - allot/idle/taishan200-2280-2s48p-256g--a66 | 1 - allot/idle/taishan200-2280-2s48p-256g--a67 | 1 - allot/idle/taishan200-2280-2s48p-256g--a68 | 1 - allot/idle/taishan200-2280-2s48p-256g--a69 | 1 - allot/idle/taishan200-2280-2s48p-256g--a70 | 1 - allot/idle/taishan200-2280-2s48p-256g--a71 | 1 - .../multi-docker.yaml | 17 +++++++++++++++++ .../multi-qemu.yaml | 0 38 files changed, 30 insertions(+), 35 deletions(-) delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a21 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a22 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a24 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a25 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a26 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a27 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a28 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a29 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a30 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a31 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a32 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a33 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a34 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a35 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a60 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a63 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a64 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a65 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a66 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a67 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a68 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a69 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a70 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a71 create mode 100644 allot/idle/taishan200-2280-2s48p-256g--multi-docker/multi-docker.yaml rename allot/idle/{taishan200-2280-2s48p-256g--a60 => taishan200-2280-2s48p-256g--multi-qemu}/multi-qemu.yaml (100%) diff --git a/allot/idle/taishan200-2280-2s48p-256g--a11 b/allot/idle/taishan200-2280-2s48p-256g--a11 index 479a75a..d9306d4 120000 --- a/allot/idle/taishan200-2280-2s48p-256g--a11 +++ b/allot/idle/taishan200-2280-2s48p-256g--a11 @@ -1 +1 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file +taishan200-2280-2s48p-256g--multi-docker \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a12 b/allot/idle/taishan200-2280-2s48p-256g--a12 index 479a75a..d9306d4 120000 --- a/allot/idle/taishan200-2280-2s48p-256g--a12 +++ b/allot/idle/taishan200-2280-2s48p-256g--a12 @@ -1 +1 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file +taishan200-2280-2s48p-256g--multi-docker \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a13 b/allot/idle/taishan200-2280-2s48p-256g--a13 index 479a75a..d9306d4 120000 --- a/allot/idle/taishan200-2280-2s48p-256g--a13 +++ b/allot/idle/taishan200-2280-2s48p-256g--a13 @@ -1 +1 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file +taishan200-2280-2s48p-256g--multi-docker \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a14 b/allot/idle/taishan200-2280-2s48p-256g--a14 index 479a75a..d9306d4 120000 --- a/allot/idle/taishan200-2280-2s48p-256g--a14 +++ b/allot/idle/taishan200-2280-2s48p-256g--a14 @@ -1 +1 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file +taishan200-2280-2s48p-256g--multi-docker \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a15 b/allot/idle/taishan200-2280-2s48p-256g--a15 index 479a75a..d9306d4 120000 --- a/allot/idle/taishan200-2280-2s48p-256g--a15 +++ b/allot/idle/taishan200-2280-2s48p-256g--a15 @@ -1 +1 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file +taishan200-2280-2s48p-256g--multi-docker \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a16 b/allot/idle/taishan200-2280-2s48p-256g--a16 index 479a75a..d9306d4 120000 --- a/allot/idle/taishan200-2280-2s48p-256g--a16 +++ b/allot/idle/taishan200-2280-2s48p-256g--a16 @@ -1 +1 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file +taishan200-2280-2s48p-256g--multi-docker \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a17 b/allot/idle/taishan200-2280-2s48p-256g--a17 index 479a75a..d9306d4 120000 --- a/allot/idle/taishan200-2280-2s48p-256g--a17 +++ b/allot/idle/taishan200-2280-2s48p-256g--a17 @@ -1 +1 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file +taishan200-2280-2s48p-256g--multi-docker \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a18 b/allot/idle/taishan200-2280-2s48p-256g--a18 index 479a75a..d9306d4 120000 --- a/allot/idle/taishan200-2280-2s48p-256g--a18 +++ b/allot/idle/taishan200-2280-2s48p-256g--a18 @@ -1 +1 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file +taishan200-2280-2s48p-256g--multi-docker \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a19 b/allot/idle/taishan200-2280-2s48p-256g--a19 index 479a75a..d9306d4 120000 --- a/allot/idle/taishan200-2280-2s48p-256g--a19 +++ b/allot/idle/taishan200-2280-2s48p-256g--a19 @@ -1 +1 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file +taishan200-2280-2s48p-256g--multi-docker \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a20 b/allot/idle/taishan200-2280-2s48p-256g--a20 index 479a75a..d9306d4 120000 --- a/allot/idle/taishan200-2280-2s48p-256g--a20 +++ b/allot/idle/taishan200-2280-2s48p-256g--a20 @@ -1 +1 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file +taishan200-2280-2s48p-256g--multi-docker \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a21 b/allot/idle/taishan200-2280-2s48p-256g--a21 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a21 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a22 b/allot/idle/taishan200-2280-2s48p-256g--a22 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a22 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a24 b/allot/idle/taishan200-2280-2s48p-256g--a24 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a24 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a25 b/allot/idle/taishan200-2280-2s48p-256g--a25 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a25 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a26 b/allot/idle/taishan200-2280-2s48p-256g--a26 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a26 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a27 b/allot/idle/taishan200-2280-2s48p-256g--a27 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a27 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a28 b/allot/idle/taishan200-2280-2s48p-256g--a28 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a28 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a29 b/allot/idle/taishan200-2280-2s48p-256g--a29 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a29 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a30 b/allot/idle/taishan200-2280-2s48p-256g--a30 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a30 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a31 b/allot/idle/taishan200-2280-2s48p-256g--a31 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a31 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a32 b/allot/idle/taishan200-2280-2s48p-256g--a32 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a32 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a33 b/allot/idle/taishan200-2280-2s48p-256g--a33 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a33 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a34 b/allot/idle/taishan200-2280-2s48p-256g--a34 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a34 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a35 b/allot/idle/taishan200-2280-2s48p-256g--a35 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a35 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a60 b/allot/idle/taishan200-2280-2s48p-256g--a60 new file mode 120000 index 0000000..3c3d0c3 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a60 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--multi-qemu \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a61 b/allot/idle/taishan200-2280-2s48p-256g--a61 index 479a75a..3c3d0c3 120000 --- a/allot/idle/taishan200-2280-2s48p-256g--a61 +++ b/allot/idle/taishan200-2280-2s48p-256g--a61 @@ -1 +1 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file +taishan200-2280-2s48p-256g--multi-qemu \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a62 b/allot/idle/taishan200-2280-2s48p-256g--a62 index 479a75a..3c3d0c3 120000 --- a/allot/idle/taishan200-2280-2s48p-256g--a62 +++ b/allot/idle/taishan200-2280-2s48p-256g--a62 @@ -1 +1 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file +taishan200-2280-2s48p-256g--multi-qemu \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a63 b/allot/idle/taishan200-2280-2s48p-256g--a63 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a63 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a64 b/allot/idle/taishan200-2280-2s48p-256g--a64 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a64 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a65 b/allot/idle/taishan200-2280-2s48p-256g--a65 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a65 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a66 b/allot/idle/taishan200-2280-2s48p-256g--a66 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a66 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a67 b/allot/idle/taishan200-2280-2s48p-256g--a67 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a67 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a68 b/allot/idle/taishan200-2280-2s48p-256g--a68 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a68 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a69 b/allot/idle/taishan200-2280-2s48p-256g--a69 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a69 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a70 b/allot/idle/taishan200-2280-2s48p-256g--a70 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a70 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a71 b/allot/idle/taishan200-2280-2s48p-256g--a71 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a71 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--multi-docker/multi-docker.yaml b/allot/idle/taishan200-2280-2s48p-256g--multi-docker/multi-docker.yaml new file mode 100644 index 0000000..8e42208 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--multi-docker/multi-docker.yaml @@ -0,0 +1,17 @@ +suite: multi-docker +category: functional +simplify-ci: +runtime: 100d +multi-docker-0: + nr_container: 20 + tbox_group: dc-1g +multi-docker-1: + nr_container: 10 + tbox_group: dc-2g +multi-docker-2: + nr_container: 5 + tbox_group: dc-4g +multi-docker-3: + nr_container: 20 + tbox_group: dc-8g +sleep: diff --git a/allot/idle/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml b/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/multi-qemu.yaml similarity index 100% rename from allot/idle/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml rename to allot/idle/taishan200-2280-2s48p-256g--multi-qemu/multi-qemu.yaml -- 2.23.0

1 0

[PATCH compass-ci 2/3] scheduler/redis_client.cr: add singleton pattern
by Wu Zhende 28 Jan '21

28 Jan '21

Singleton pattern will only generate an instance. The Redis pool needs to be initialized only once and the connection is obtained from the pool. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/scheduler/redis_client.cr | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/scheduler/redis_client.cr b/src/scheduler/redis_client.cr index 1253108..a8d9dcb 100644 --- a/src/scheduler/redis_client.cr +++ b/src/scheduler/redis_client.cr @@ -6,12 +6,17 @@ require "redis" require "./constants" require "../lib/job" +require "singleton" class Redis::Client class_property :client HOST = (ENV.has_key?("REDIS_HOST") ? ENV["REDIS_HOST"] : JOB_REDIS_HOST) PORT = (ENV.has_key?("REDIS_PORT") ? ENV["REDIS_PORT"] : JOB_REDIS_PORT).to_i32 + def self.instance + Singleton::Of(self).instance + end + def initialize(host = HOST, port = PORT) @client = Redis::PooledClient.new(host: host, port: port, pool_size: 25, pool_timeout: 0.01) end -- 2.23.0

2 1

[PATCH compass-ci 3/3] lib/sched.cr: redis use singleton pattern
by Wu Zhende 28 Jan '21

28 Jan '21

[Why] A redis pool is created for each HTTP request. This is wrong. This can cause too many connections to be established. All HTTP requests should share a redis pool. [How] Use singleton pattern Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/sched.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index f46d97c..b90759f 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -32,7 +32,7 @@ class Sched def initialize(env : HTTP::Server::Context) @es = Elasticsearch::Client.new - @redis = Redis::Client.new + @redis = Redis::Client.instance @task_queue = TaskQueueAPI.new @rgc = RemoteGitClient.new @env = env -- 2.23.0

1 0

[PATCH compass-ci 1/3] crystal-shards/shard.yml: add singleton.cr
by Wu Zhende 28 Jan '21

28 Jan '21

In order to use the singleton pattern Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/crystal-shards/shard.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/container/crystal-shards/shard.yml b/container/crystal-shards/shard.yml index 65a7622..44d175d 100644 --- a/container/crystal-shards/shard.yml +++ b/container/crystal-shards/shard.yml @@ -30,3 +30,5 @@ dependencies: github: anykeyh/json_on_steroids rate_limiter: github: z64/rate_limiter + singleton: + github: waterlink/singleton.cr -- 2.23.0

1 0

[PATCH v4 compass-ci] providers/lib: introduce context.rb
by Xiao Shenwei 28 Jan '21

28 Jan '21

[why] expand erb templates need a class to save context [how] Context class provides a readable property @info, it will save the context required by erb, and a expand_erb method, it can expand a erb templates based on @info. Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/lib/context.rb | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 providers/lib/context.rb diff --git a/providers/lib/context.rb b/providers/lib/context.rb new file mode 100644 index 0000000..6f9f579 --- /dev/null +++ b/providers/lib/context.rb @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'erb' +require_relative "#{ENV['LKP_SRC']}/lib/hashugar" + +# saves the context required by expand erb templates +class Context + attr_reader :info + + def initialize(mac, hostname, queues) + @info = { + 'mac' => mac, + 'hostname' => hostname, + 'queues' => queues + } + end + + def merge!(hash) + @info.merge!(hash) + end + + # existing variables of @info, can be used by erb + # @info: { 'name' => 'xxx' } + # Templates: + # This is <%= name %> + # After expanding: + # This is xxx + def expand_erb(template, context_hash = {}) + @info.merge!(context_hash) + context = Hashugar.new((a)info).instance_eval { binding } + ERB.new(template, nil, '%').result(context) + end +end -- 2.23.0

1 0

[PATCH v2 lkp-tests] tests/cci-depends: fix generate wrong symlink file
by Wang Yong 28 Jan '21

28 Jan '21

[before] $ ll $LKP_SRC/distro/depends/sysbench-cpu sysbench-cpu -> sysbench $ tree /srv/initrd/deps/$os/$os_arch/$os_version/ . ├── sysbench_20200903.cgz ├── sysbench.cgz -> sysbench_20200903.cgz └── sysbench-cpu.cgz -> sysbench.cgz all cgz file under one directory, so we can generate symlink when depends file is a symlink [after] $ tree /srv/initrd/deps/$os/$os_arch/$os_version/sysbench-cpu . ├── sysbench-cpu_20210128.cgz └── sysbench-cpu.cgz -> sysbench-cpu_20210128.cgz now we upload cgz file through curl, it's not appropriate to generate symlink directly, now generate original cgz file and rename it Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- distro/aliyun | 2 +- distro/archlinux | 2 +- distro/common | 12 ++++++++++++ distro/debian | 2 +- tests/cci-depends | 9 ++------- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/distro/aliyun b/distro/aliyun index 598243d8e..5c234ada6 100755 --- a/distro/aliyun +++ b/distro/aliyun @@ -80,7 +80,7 @@ yum_download() yum_pack() { local target_dir=/opt/rpms - local date=$(date +"%Y%m%d") + date=$(date +"%Y%m%d") local downloaded_rpms=$(find /var/ -type f -name "*.rpm") diff --git a/distro/archlinux b/distro/archlinux index 3942080a6..3d576555c 100755 --- a/distro/archlinux +++ b/distro/archlinux @@ -50,7 +50,7 @@ pacman_download() pacman_pack() { local target_dir=/opt/pkgs - local date=$(date +"%Y%m%d") + date=$(date +"%Y%m%d") local downloaded_pkgs=$(find_pacman_package) diff --git a/distro/common b/distro/common index 1fd7df4e8..d1a3a5447 100755 --- a/distro/common +++ b/distro/common @@ -94,3 +94,15 @@ upload_to_target_dir() upload_one_curl "${dir}/${file}" "${dir}" >/dev/null } + +rename_symlink_name() +{ + [ "${BM_NAME}" == "${benchmark}" ] && return + + cd "$pack_to" + [ -f ${BM_NAME}.cgz ] || return + rm ${BM_NAME}.cgz + mv ${BM_NAME}_$date.cgz ${benchmark}_$date.cgz + + ln -sf ${benchmark}_$date.cgz ${benchmark}.cgz +} diff --git a/distro/debian b/distro/debian index 8821e3ddd..b07d395b6 100755 --- a/distro/debian +++ b/distro/debian @@ -99,7 +99,7 @@ fixup_perf() pack() { - local date=$(date +"%Y%m%d") + date=$(date +"%Y%m%d") [[ $(type -t fixup_$BM_NAME) = 'function' ]] && fixup_$BM_NAME diff --git a/tests/cci-depends b/tests/cci-depends index 8ac1d7e58..0684a1025 100755 --- a/tests/cci-depends +++ b/tests/cci-depends @@ -38,13 +38,6 @@ umask 002 chown .lkp "$pack_to" } -check_shared_package "$benchmark" && { - ln -sf $BM_NAME.cgz $pack_to/$benchmark.cgz - echo "create symlink for shared package: $benchmark -> $BM_NAME" - - exit 0 -} - share_debian_package distro_install_depends cci-depends @@ -59,4 +52,6 @@ fixup_arch_install $pack_arch pack_benchmark_deps +rename_symlink_name + upload_to_target_dir ${pack_to} -- 2.23.0

1 0

2024

2023

2022

2021

2020

Compass-ci January 2021