- Compass-ci - mailweb.openeuler.org

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

28 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..83c330c --- /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 +"%F %T $* [INFO]" +} + +log_debug() +{ + date +"%F %T $* [DEBUG]" +} + +log_warn() +{ + date +"%F %T $* [WARN]" >&2 +} + +log_error() +{ + date +"%F %T $* [ERROR]" >&2 +} -- 2.23.0

2 5

[PATCH lkp-tests 3/3] sbin/install-dependencies: replace gem sources
by Liu Yinsi 28 Jan '21

28 Jan '21

Encapsulating functions install_gem_pkg for easy gem sources replacement Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sbin/install-dependencies.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sbin/install-dependencies.sh b/sbin/install-dependencies.sh index f2a9155f6..8bd1a1ddb 100755 --- a/sbin/install-dependencies.sh +++ b/sbin/install-dependencies.sh @@ -6,6 +6,13 @@ PROJECT_DIR=$(dirname $SCRIPT_DIR) . $PROJECT_DIR/lib/env.sh # choose install function base on DISTRIBUTION + +install_gem_pkg() +{ + gem sources -r https://rubygems.org/ -a https://gems.ruby-china.com/ + sudo gem install -f git activesupport rest-client faye-websocket +} + linux_dep() { source /etc/os-release @@ -13,7 +20,7 @@ linux_dep() ubuntu|debian) export DEBIAN_FRONTEND=noninteractive sudo apt-get install -yqm ruby-dev libssl-dev gcc g++ - sudo gem install -f faye-websocket git activesupport rest-client + install_gem_pkg ;; openEuler|fedora|rhel|centos) if type dnf > /dev/null 2>&1; then @@ -21,7 +28,7 @@ linux_dep() else sudo yum install -y --skip-broken ruby rubygems gcc gcc-c++ make ruby-devel git lftp fi - sudo gem install -f git activesupport rest-client faye-websocket + install_gem_pkg ;; *) echo "$ID not support! please install dependencies manually." @@ -34,7 +41,7 @@ mac_dep() { brew install ruby write_shell_profile "export PATH=/usr/local/opt/ruby/bin:$PATH" - sudo gem install -f git activesupport rest-client + install_gem_pkg } run() -- 2.23.0

1 0

[PATCH lkp-tests 2/3] sbin/install-dependencies: classify gem pkg
by Liu Yinsi 28 Jan '21

28 Jan '21

Install ruby pkg by gem install, not by apt-get install. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sbin/install-dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/install-dependencies.sh b/sbin/install-dependencies.sh index aa069bfcd..f2a9155f6 100755 --- a/sbin/install-dependencies.sh +++ b/sbin/install-dependencies.sh @@ -12,8 +12,8 @@ linux_dep() case $ID in ubuntu|debian) export DEBIAN_FRONTEND=noninteractive - sudo apt-get install -yqm ruby-git ruby-activesupport ruby-rest-client ruby-dev libssl-dev gcc g++ - sudo gem install -f faye-websocket + sudo apt-get install -yqm ruby-dev libssl-dev gcc g++ + sudo gem install -f faye-websocket git activesupport rest-client ;; openEuler|fedora|rhel|centos) if type dnf > /dev/null 2>&1; then -- 2.23.0

1 0

[PATCH lkp-tests 1/3] sbin/install-dependencies: fix inconsistent gem command
by Liu Yinsi 28 Jan '21

28 Jan '21

Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sbin/install-dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/install-dependencies.sh b/sbin/install-dependencies.sh index 6b418e5f4..aa069bfcd 100755 --- a/sbin/install-dependencies.sh +++ b/sbin/install-dependencies.sh @@ -13,7 +13,7 @@ linux_dep() ubuntu|debian) export DEBIAN_FRONTEND=noninteractive sudo apt-get install -yqm ruby-git ruby-activesupport ruby-rest-client ruby-dev libssl-dev gcc g++ - sudo gem install faye-websocket + sudo gem install -f faye-websocket ;; openEuler|fedora|rhel|centos) if type dnf > /dev/null 2>&1; then @@ -34,7 +34,7 @@ mac_dep() { brew install ruby write_shell_profile "export PATH=/usr/local/opt/ruby/bin:$PATH" - gem install git activesupport rest-client + sudo gem install -f git activesupport rest-client } run() -- 2.23.0

1 0

[PATCH compass-ci] git_mirror.rb: delete unnecessary update of es
by Li Yuanchao 28 Jan '21

28 Jan '21

It does not need to update es when init, cause nothing changes yet. And update es here would make git-mirror start slowly. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index a111e51..2090f6b 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -214,7 +214,6 @@ class MirrorMain @git_info[git_repo]['git_repo'] = git_repo @git_info[git_repo].merge!(@defaults[project]) if @defaults[project] fork_stat_init(git_repo) - es_repo_update(git_repo) @priority_queue.push git_repo, @priority @priority += 1 end -- 2.23.0

1 0

[PATCH lkp-tests] lib/monitor: change ip url to domain name url
by Li Ping 28 Jan '21

28 Jan '21

when the external ip address of host is the same as the srv_http_host, the host can not use the url to get result. --- lib/monitor.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/monitor.rb b/lib/monitor.rb index 9091c92a9..82e48c3e6 100755 --- a/lib/monitor.rb +++ b/lib/monitor.rb @@ -107,9 +107,7 @@ class Monitor def lftp_mirror @result_root.delete_prefix!('/srv') - srv_http_host = job['SRV_HTTP_HOST'] || 'api.compass-ci.openeuler.org' - srv_http_port = job['SRV_HTTP_PORT'] || '11300' - url = "http://#{srv_http_host}:#{srv_http_port}#{@result_root}" + url = "http://api.compass-ci.openeuler.org:11300#{@result_root}" system "lftp -c mirror #{url} >/dev/null 2>&1" end -- 2.23.0

2 2

[PATCH v2 lab-z9] modify lab-z9/allot/idle, and add queue to the testbox about multi-qemu and multi-docker
by Zhang Dewan 28 Jan '21

28 Jan '21

dewan@crystal ~/tmp/lab-z9/allot/idle% tree . . ├── taishan200-2280-2s48p-256g--multi-docker │ ├── taishan200-2280-2s48p-256g--a11 │ ├── taishan200-2280-2s48p-256g--a12 │ ├── taishan200-2280-2s48p-256g--a13 │ ├── taishan200-2280-2s48p-256g--a14 │ └── taishan200-2280-2s48p-256g--a15 └── taishan200-2280-2s48p-256g--multi-qemu ├── taishan200-2280-2s48p-256g--a60 ├── taishan200-2280-2s48p-256g--a61 └── taishan200-2280-2s48p-256g--a62 2 directories, 8 files Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- allot/idle/taishan200-2280-2s48p-256g--a11 | 1 - allot/idle/taishan200-2280-2s48p-256g--a12 | 1 - allot/idle/taishan200-2280-2s48p-256g--a13 | 1 - allot/idle/taishan200-2280-2s48p-256g--a14 | 1 - allot/idle/taishan200-2280-2s48p-256g--a15 | 1 - allot/idle/taishan200-2280-2s48p-256g--a16 | 1 - allot/idle/taishan200-2280-2s48p-256g--a17 | 1 - allot/idle/taishan200-2280-2s48p-256g--a18 | 1 - allot/idle/taishan200-2280-2s48p-256g--a19 | 1 - allot/idle/taishan200-2280-2s48p-256g--a20 | 1 - 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 - .../multi-qemu.yaml | 18 -------------- allot/idle/taishan200-2280-2s48p-256g--a61 | 1 - allot/idle/taishan200-2280-2s48p-256g--a62 | 1 - 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 - .../taishan200-2280-2s48p-256g--a11 | 24 +++++++++++++++++++ .../taishan200-2280-2s48p-256g--a12 | 24 +++++++++++++++++++ .../taishan200-2280-2s48p-256g--a13 | 24 +++++++++++++++++++ .../taishan200-2280-2s48p-256g--a14 | 24 +++++++++++++++++++ .../taishan200-2280-2s48p-256g--a15 | 24 +++++++++++++++++++ .../taishan200-2280-2s48p-256g--a60 | 24 +++++++++++++++++++ .../taishan200-2280-2s48p-256g--a61 | 24 +++++++++++++++++++ .../taishan200-2280-2s48p-256g--a62 | 24 +++++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a11 | 2 ++ hosts/taishan200-2280-2s48p-256g--a12 | 2 ++ hosts/taishan200-2280-2s48p-256g--a13 | 2 ++ hosts/taishan200-2280-2s48p-256g--a14 | 2 ++ hosts/taishan200-2280-2s48p-256g--a15 | 2 ++ hosts/taishan200-2280-2s48p-256g--a60 | 2 ++ hosts/taishan200-2280-2s48p-256g--a61 | 2 ++ hosts/taishan200-2280-2s48p-256g--a62 | 2 ++ 52 files changed, 208 insertions(+), 53 deletions(-) delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a11 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a12 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a13 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a14 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a15 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a16 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a17 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a18 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a19 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a20 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 delete mode 100644 allot/idle/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a61 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a62 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/taishan200-2280-2s48p-256g--a11 create mode 100644 allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a12 create mode 100644 allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a13 create mode 100644 allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a14 create mode 100644 allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a15 create mode 100644 allot/idle/taishan200-2280-2s48p-256g--multi-qemu/taishan200-2280-2s48p-256g--a60 create mode 100644 allot/idle/taishan200-2280-2s48p-256g--multi-qemu/taishan200-2280-2s48p-256g--a61 create mode 100644 allot/idle/taishan200-2280-2s48p-256g--multi-qemu/taishan200-2280-2s48p-256g--a62 diff --git a/allot/idle/taishan200-2280-2s48p-256g--a11 b/allot/idle/taishan200-2280-2s48p-256g--a11 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a11 +++ /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--a12 b/allot/idle/taishan200-2280-2s48p-256g--a12 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a12 +++ /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--a13 b/allot/idle/taishan200-2280-2s48p-256g--a13 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a13 +++ /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--a14 b/allot/idle/taishan200-2280-2s48p-256g--a14 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a14 +++ /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--a15 b/allot/idle/taishan200-2280-2s48p-256g--a15 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a15 +++ /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--a16 b/allot/idle/taishan200-2280-2s48p-256g--a16 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a16 +++ /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--a17 b/allot/idle/taishan200-2280-2s48p-256g--a17 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a17 +++ /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--a18 b/allot/idle/taishan200-2280-2s48p-256g--a18 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a18 +++ /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--a19 b/allot/idle/taishan200-2280-2s48p-256g--a19 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a19 +++ /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--a20 b/allot/idle/taishan200-2280-2s48p-256g--a20 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a20 +++ /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--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/multi-qemu.yaml b/allot/idle/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml deleted file mode 100644 index 513b631..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml +++ /dev/null @@ -1,18 +0,0 @@ -suite: multi-qemu -category: functional - -os: openeuler -os_version: 20.03 -os_arch: aarch64 -os_mount: initramfs -simplify-ci: -multi-qemu-0: - nr_vm: 20 - tbox_group: vm-2p8g -multi-qemu-1: - nr_vm: 2 - tbox_group: vm-2p4g -multi-qemu-2: - nr_vm: 2 - tbox_group: vm-1p1g -sleep: 100d diff --git a/allot/idle/taishan200-2280-2s48p-256g--a61 b/allot/idle/taishan200-2280-2s48p-256g--a61 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a61 +++ /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--a62 b/allot/idle/taishan200-2280-2s48p-256g--a62 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a62 +++ /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--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/taishan200-2280-2s48p-256g--a11 b/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a11 new file mode 100644 index 0000000..0a7f15e --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a11 @@ -0,0 +1,24 @@ +arch: aarch64 +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8891431-part1 + - /dev/disk/by-id/scsi-350000399b8890e09 + - /dev/disk/by-id/scsi-350000399b8890cd1 +rootfs_disk: + - /dev/disk/by-id/scsi-350000399b8727929 +mac_addr: + - cc:05:77:ab:97:62 + - cc:05:77:ab:97:63 + - cc:05:77:ab:97:64 + - cc:05:77:ab:97:65 + - cc:05:77:ab:97:66 + - cc:05:77:ab:97:67 + - cc:05:77:ab:97:68 + - cc:05:77:ab:97:69 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.1 +queues: + taishan200-2280-2s48p-256g--multi-docker diff --git a/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a12 b/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a12 new file mode 100644 index 0000000..0ac46fe --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a12 @@ -0,0 +1,24 @@ +arch: aarch64 +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500c276c347 + - /dev/disk/by-id/scsi-35000c500c276eb87 + - /dev/disk/by-id/scsi-35000c500c276b6ff +rootfs_disk: + - /dev/disk/by-id/scsi-35000c500c276f47b +mac_addr: + - 44:67:47:97:22:37 + - 44:67:47:97:22:38 + - 44:67:47:97:22:39 + - 44:67:47:97:22:3a + - 44:67:47:97:22:3b + - 44:67:47:97:22:3c + - 44:67:47:97:22:3d + - 44:67:47:97:22:3e +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.2 +queues: + taishan200-2280-2s48p-256g--multi-docker diff --git a/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a13 b/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a13 new file mode 100644 index 0000000..5cc2506 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a13 @@ -0,0 +1,24 @@ +arch: aarch64 +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500c2799bb3 + - /dev/disk/by-id/scsi-35000c500c278b18b + - /dev/disk/by-id/scsi-35000c500c279f96b +rootfs_disk: + - /dev/disk/by-id/scsi-35000c500c2789b4b +mac_addr: + - 44:67:47:97:2b:bf + - 44:67:47:97:2b:c0 + - 44:67:47:97:2b:c1 + - 44:67:47:97:2b:c2 + - 44:67:47:97:2b:c3 + - 44:67:47:97:2b:c4 + - 44:67:47:97:2b:c5 + - 44:67:47:97:2b:c6 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.3 +queues: + taishan200-2280-2s48p-256g--multi-docker diff --git a/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a14 b/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a14 new file mode 100644 index 0000000..ce617ad --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a14 @@ -0,0 +1,24 @@ +arch: aarch64 +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88b4475 + - /dev/disk/by-id/scsi-350000399b88b4371 + - /dev/disk/by-id/scsi-350000399b88b432d +rootfs_disk: + - /dev/disk/by-id/scsi-350000399b88b4531 +mac_addr: + - 44:67:47:c9:e9:c2 + - 44:67:47:c9:e9:c3 + - 44:67:47:c9:e9:c4 + - 44:67:47:c9:e9:c5 + - 44:67:47:c9:e9:c6 + - 44:67:47:c9:e9:c7 + - 44:67:47:c9:e9:c8 + - 44:67:47:c9:e9:c9 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.4 +queues: + taishan200-2280-2s48p-256g--multi-docker diff --git a/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a15 b/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a15 new file mode 100644 index 0000000..ce2079e --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--multi-docker/taishan200-2280-2s48p-256g--a15 @@ -0,0 +1,24 @@ +arch: aarch64 +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b841fff5 + - /dev/disk/by-id/scsi-350000399b841fcb9 + - /dev/disk/by-id/scsi-350000399b8420a0d +rootfs_disk: + - /dev/disk/by-id/scsi-350000399b841ff55 +mac_addr: + - 44:67:47:85:d4:9e + - 44:67:47:85:d4:9f + - 44:67:47:85:d4:a0 + - 44:67:47:85:d4:a1 + - 44:67:47:85:d4:a2 + - 44:67:47:85:d4:a3 + - 44:67:47:85:d4:a4 + - 44:67:47:85:d4:a5 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.5 +queues: + taishan200-2280-2s48p-256g--multi-docker diff --git a/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/taishan200-2280-2s48p-256g--a60 b/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/taishan200-2280-2s48p-256g--a60 new file mode 100644 index 0000000..01aa6a6 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/taishan200-2280-2s48p-256g--a60 @@ -0,0 +1,24 @@ +arch: aarch64 +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-35000c500bd67640b + - /dev/disk/by-id/scsi-35000c500bd6707a7 + - /dev/disk/by-id/scsi-35000c500bd680dc3 +rootfs_disk: + - /dev/disk/by-id/scsi-35000c500bd683a73 +mac_addr: + - e0:00:84:2b:51:7d + - e0:00:84:2b:51:7e + - e0:00:84:2b:51:7f + - e0:00:84:2b:51:80 + - e0:00:84:2b:51:81 + - e0:00:84:2b:51:82 + - e0:00:84:2b:51:83 + - e0:00:84:2b:51:84 +model_name: Kunpeng-920 +ipmi_ip: 9.3.4.1 +queues: + taishan200-2280-2s48p-256g--multi-qemu diff --git a/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/taishan200-2280-2s48p-256g--a61 b/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/taishan200-2280-2s48p-256g--a61 new file mode 100644 index 0000000..e935de7 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/taishan200-2280-2s48p-256g--a61 @@ -0,0 +1,24 @@ +arch: aarch64 +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a7869 + - /dev/disk/by-id/scsi-350000399886acc5d + - /dev/disk/by-id/scsi-350000399886b6861 +rootfs_disk: + - /dev/disk/by-id/scsi-350000399886ac70d +mac_addr: + - 44:67:47:c9:e4:b8 + - 44:67:47:c9:e4:b9 + - 44:67:47:c9:e4:ba + - 44:67:47:c9:e4:bb + - 44:67:47:c9:e4:bc + - 44:67:47:c9:e4:bd + - 44:67:47:c9:e4:be + - 44:67:47:c9:e4:bf +model_name: Kunpeng-920 +ipmi_ip: 9.3.4.2 +queues: + taishan200-2280-2s48p-256g--multi-qemu diff --git a/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/taishan200-2280-2s48p-256g--a62 b/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/taishan200-2280-2s48p-256g--a62 new file mode 100644 index 0000000..03e043a --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/taishan200-2280-2s48p-256g--a62 @@ -0,0 +1,24 @@ +arch: aarch64 +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b892d131 + - /dev/disk/by-id/scsi-350000399b892d619 + - /dev/disk/by-id/scsi-350000399b892dc1d +rootfs_disk: + - /dev/disk/by-id/scsi-350000399b892dbb5 +mac_addr: + - 44:67:47:c9:e3:3a + - 44:67:47:c9:e3:3b + - 44:67:47:c9:e3:3c + - 44:67:47:c9:e3:3d + - 44:67:47:c9:e3:3e + - 44:67:47:c9:e3:3f + - 44:67:47:c9:e3:40 + - 44:67:47:c9:e3:41 +model_name: Kunpeng-920 +ipmi_ip: 9.3.4.3 +queues: + taishan200-2280-2s48p-256g--multi-qemu diff --git a/hosts/taishan200-2280-2s48p-256g--a11 b/hosts/taishan200-2280-2s48p-256g--a11 index 412154f..0a7f15e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a11 +++ b/hosts/taishan200-2280-2s48p-256g--a11 @@ -20,3 +20,5 @@ mac_addr: - cc:05:77:ab:97:69 model_name: Kunpeng-920 ipmi_ip: 9.3.5.1 +queues: + taishan200-2280-2s48p-256g--multi-docker diff --git a/hosts/taishan200-2280-2s48p-256g--a12 b/hosts/taishan200-2280-2s48p-256g--a12 index 3baa8f1..0ac46fe 100644 --- a/hosts/taishan200-2280-2s48p-256g--a12 +++ b/hosts/taishan200-2280-2s48p-256g--a12 @@ -20,3 +20,5 @@ mac_addr: - 44:67:47:97:22:3e model_name: Kunpeng-920 ipmi_ip: 9.3.5.2 +queues: + taishan200-2280-2s48p-256g--multi-docker diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 index 4b9548f..5cc2506 100644 --- a/hosts/taishan200-2280-2s48p-256g--a13 +++ b/hosts/taishan200-2280-2s48p-256g--a13 @@ -20,3 +20,5 @@ mac_addr: - 44:67:47:97:2b:c6 model_name: Kunpeng-920 ipmi_ip: 9.3.5.3 +queues: + taishan200-2280-2s48p-256g--multi-docker diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 index b96e79c..ce617ad 100644 --- a/hosts/taishan200-2280-2s48p-256g--a14 +++ b/hosts/taishan200-2280-2s48p-256g--a14 @@ -20,3 +20,5 @@ mac_addr: - 44:67:47:c9:e9:c9 model_name: Kunpeng-920 ipmi_ip: 9.3.5.4 +queues: + taishan200-2280-2s48p-256g--multi-docker diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 index a1d63ed..ce2079e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a15 +++ b/hosts/taishan200-2280-2s48p-256g--a15 @@ -20,3 +20,5 @@ mac_addr: - 44:67:47:85:d4:a5 model_name: Kunpeng-920 ipmi_ip: 9.3.5.5 +queues: + taishan200-2280-2s48p-256g--multi-docker diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 index 13612be..01aa6a6 100644 --- a/hosts/taishan200-2280-2s48p-256g--a60 +++ b/hosts/taishan200-2280-2s48p-256g--a60 @@ -20,3 +20,5 @@ mac_addr: - e0:00:84:2b:51:84 model_name: Kunpeng-920 ipmi_ip: 9.3.4.1 +queues: + taishan200-2280-2s48p-256g--multi-qemu diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 index 1619d17..e935de7 100644 --- a/hosts/taishan200-2280-2s48p-256g--a61 +++ b/hosts/taishan200-2280-2s48p-256g--a61 @@ -20,3 +20,5 @@ mac_addr: - 44:67:47:c9:e4:bf model_name: Kunpeng-920 ipmi_ip: 9.3.4.2 +queues: + taishan200-2280-2s48p-256g--multi-qemu diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 index f1d72af..03e043a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a62 +++ b/hosts/taishan200-2280-2s48p-256g--a62 @@ -20,3 +20,5 @@ mac_addr: - 44:67:47:c9:e3:41 model_name: Kunpeng-920 ipmi_ip: 9.3.4.3 +queues: + taishan200-2280-2s48p-256g--multi-qemu -- 2.23.0

2 1

[PATCH v2 compass-ci 2/2] mail-robot: optimize assign-account-fail-email
by Luan Shengde 28 Jan '21

28 Jan '21

add message for newly added error types. Signed-off-by: Luan Shengde <shdluan(a)163.com> --- .../lib/assign-account-fail-eamil.rb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/container/mail-robot/lib/assign-account-fail-eamil.rb b/container/mail-robot/lib/assign-account-fail-eamil.rb index 242dfe1..3597159 100755 --- a/container/mail-robot/lib/assign-account-fail-eamil.rb +++ b/container/mail-robot/lib/assign-account-fail-eamil.rb @@ -33,17 +33,20 @@ def email_err_message(message) https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/manual/test-oss-p… EMAIL_MESSAGE - when 'COMMIT_URL_NOT_AVAILABLE' + when 'COMMIT_AUTHOR_ERROR' err_message = <<~EMAIL_MESSAGE - We cannot confirm the commit url matches your email. + We cannot confirm the commit author matches your email. + Make sure it is truely submitted with your email. - Make sure the commit exists. - Make sure it is truely submitted with your email. - - Go to the commit history and find your commit. - Enter the commit and you will get your commit url. + Choose a commit that was submitted with your own email and try again. + EMAIL_MESSAGE + when 'NO_COMMIT_ID' + err_message = <<~EMAIL_MESSAGE + There is no such commit ID in the repo. - Try again after you have correctted the url + Please check the commit ID exists. + or + You have write the commit ID correctly. EMAIL_MESSAGE when 'NO_PUBKEY' err_message = <<~EMAIL_MESSAGE -- 2.23.0

1 0

[PATCH v2 compass-ci 1/2] mail-robot: fix bug for parsing email
by Luan Shengde 28 Jan '21

28 Jan '21

[why] for non-gitee repos: we may sometimes can not get the author email from the http request feedback when checking the commit. users may still receive a fail email even if they send 'apply account' email correctly. [how] both gitee and non-gitee will clone the repo tree and check the commit: - check commit id exists - check commit author matches the email Signed-off-by: Luan Shengde <shdluan(a)163.com> --- .../lib/parse-apply-account-email.rb | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/container/mail-robot/lib/parse-apply-account-email.rb b/container/mail-robot/lib/parse-apply-account-email.rb index a41a89a..95b967a 100755 --- a/container/mail-robot/lib/parse-apply-account-email.rb +++ b/container/mail-robot/lib/parse-apply-account-email.rb @@ -6,7 +6,6 @@ require 'json' require 'mail' require 'rest-client' -require_relative 'gitee-commit-url-check' # used to parse mail_content for my_commit_url and my_ssh_pubkey # be called by AssignAccount when it needs to extract required data: @@ -91,29 +90,34 @@ class ParseApplyAccountEmail end def commit_url_availability(url, base_url) - hub_name = url.split('/')[2] - - # it requires authentication when sending request to get the commit information - # clone the repo and then validate the commit for the email address - if hub_name.eql? 'gitee.com' - gitee_commit(url, base_url) - else - non_gitee_commit(url) - end - end + repo_url = [base_url, 'git'].join('.') + repo_dir = repo_url.split('/')[-1] + commit_id = url.split('/')[-1] + + Dir.chdir '/tmp' + %x(/usr/bin/git clone --bare #{repo_url} #{repo_dir}) + + # get all commit IDs and check commit id exists + repo_commits = %x(git -C #{repo_dir} log --pretty=format:'%H').split(/\n/) + check_commit_exist(commit_id, repo_commits) - def gitee_commit(url, base_url) - my_gitee_commit = GiteeCommitUrlCheck.new(@my_info, url, base_url) - my_gitee_commit.gitee_commit_check + # get the auther's email for the commit + author_email = %x(/usr/bin/git -C #{repo_dir} show -s --format=%aE #{commit_id}).chomp + check_commit_email(author_email) + + FileUtils.rm_rf repo_dir end - def non_gitee_commit(url) - url_fdback = RestClient.get(url).body - email_index = url_fdback.index @my_info['my_email'] + def check_commit_exist(commit_id, repo_commits) + return if repo_commits.include? commit_id + + raise 'NO_COMMIT_ID' + end - return unless email_index.nil? + def check_commit_email(author_email) + return if author_email.eql? @my_info['my_email'] - raise 'COMMIT_URL_NOT_AVAILABLE' + raise 'COMMIT_AUTHOR_ERROR' end def parse_pub_key -- 2.23.0

1 0

[PATCH lkp-tests 2/2] 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..0994dff30 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 + [ -f ${BM_NAME}.cgz ] || return + + cd "$pack_to" + 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