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

[PATCH lkp-tests] lib/bootstrap.sh: fix the output error when ping not exist
by Wang Chenglong 26 Apr '21

26 Apr '21

[Why] If the ping command exists, then run test_ping, if not, then skip. [Error] [ 179.335889] Kernel tests: Boot OK! [ 180.180309] LKP: waiting for network... [ 182.991732] /lkp/lkp/src/lib/bootstrap.sh: line 90: ping: command not found [ 183.010815] /lkp/lkp/src/lib/bootstrap.sh: line 90: ping: command not found Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- lib/bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index 070dabf46..c5b8dcd12 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -88,6 +88,7 @@ net_devices_link() test_ping() { + [ $(command -v ping) ] || return 0 ping -c 1 -w 1 $LKP_SERVER > /dev/null } -- 2.23.0

2 2

[PATCH lkp-tests 2/2] lib/rpm.sh: add add_repo function
by Wang Yong 25 Apr '21

25 Apr '21

add function for rpmbuild-pkg and install-rpm Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- lib/rpm.sh | 20 ++++++++++++++++++++ tests/install-rpm | 22 +--------------------- tests/rpmbuild-pkg | 6 ++++++ 3 files changed, 27 insertions(+), 21 deletions(-) create mode 100755 lib/rpm.sh diff --git a/lib/rpm.sh b/lib/rpm.sh new file mode 100755 index 000000000..91f234da4 --- /dev/null +++ b/lib/rpm.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +add_repo() +{ + custom_repo_name=($custom_repo_name) + custom_repo_addr=($custom_repo_addr) + + for i in ${!custom_repo_name[@]} + do + cat <<EOF >> /etc/yum.repos.d/"${custom_repo_name[$i]}.repo" +[${custom_repo_name[$i]}] +name=${custom_repo_name[$i]} +baseurl=${custom_repo_addr[$i]} +enabled=1 +gpgcheck=0 +priority=100 + +EOF + done +} \ No newline at end of file diff --git a/tests/install-rpm b/tests/install-rpm index 428ca38d6..6c2f5731a 100755 --- a/tests/install-rpm +++ b/tests/install-rpm @@ -9,6 +9,7 @@ . $LKP_SRC/lib/debug.sh . $LKP_SRC/lib/upload.sh . $LKP_SRC/lib/log.sh +. $LKP_SRC/lib/rpm.sh : "${compat_os:=budding-openeuler}" : "${DISTRO:=openeuler}" @@ -19,29 +20,8 @@ [ -n "${custom_repo_name}" ] || die "custom_repo_name is empty" [ -n "${custom_repo_addr}" ] || die "custom_repo_addr is empty" -custom_repo_name=($custom_repo_name) -custom_repo_addr=($custom_repo_addr) rpm_name=($rpm_name) -add_repo() -{ - custom_repo_name=($custom_repo_name) - custom_repo_addr=($custom_repo_addr) - - for i in ${!custom_repo_name[@]} - do - cat <<EOF >> /etc/yum.repos.d/"${custom_repo_name[$i]}.repo" -[${custom_repo_name[$i]}] -name=${custom_repo_name[$i]} -baseurl=${custom_repo_addr[$i]} -enabled=1 -gpgcheck=0 -priority=100 - -EOF - done -} - install_rpm() { log_info "Starting install test: yum install -y ${rpm_name[@]}" diff --git a/tests/rpmbuild-pkg b/tests/rpmbuild-pkg index 312582d16..5c694b9d4 100755 --- a/tests/rpmbuild-pkg +++ b/tests/rpmbuild-pkg @@ -3,10 +3,15 @@ # - compat_os # - repo_name # - repo_addr +# - custom_repo_name +# - custom_repo_addr # Git repo jobs only use the first two parameters, SRPMs jobs use all +# user can add custom_repo_name and custom_repo_addr to setup +# local repo, value can be an array . $LKP_SRC/lib/debug.sh . $LKP_SRC/lib/upload.sh +. $LKP_SRC/lib/rpm.sh : "${compat_os:=budding-openeuler}" @@ -133,6 +138,7 @@ update_repo_mq() -d "{\"upload_rpms\": ["${full_list}"]}" } +add_repo [ -n "$repo_name" ] && from_srpm || from_git build_rpm upload_rpm_pkg -- 2.23.0

1 0

[PATCH compass-ci] sbin/es-jobs-mapping.sh: add filed
by Lu Weitao 25 Apr '21

25 Apr '21

add nr_run(integer), author_email(keyword) Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- sbin/es-jobs-mapping.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sbin/es-jobs-mapping.sh b/sbin/es-jobs-mapping.sh index 67b1ed14..0c2fc62d 100755 --- a/sbin/es-jobs-mapping.sh +++ b/sbin/es-jobs-mapping.sh @@ -148,6 +148,12 @@ else "upstream_commit": { "type": "keyword" }, + "base_commit": { + "type": "keyword" + }, + "nr_run": { + "type": "integer" + }, "my_email": { "type": "keyword" }, -- 2.23.0

2 2

[PATCH compass-ci] container/submit: mount /c/lab-z9
by Li Yuanchao 25 Apr '21

25 Apr '21

So can use hostfiles in lab-z9/hosts Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- container/auto-submit/start | 2 ++ 1 file changed, 2 insertions(+) diff --git a/container/auto-submit/start b/container/auto-submit/start index ad4ba9d..55b40f2 100755 --- a/container/auto-submit/start +++ b/container/auto-submit/start @@ -27,8 +27,10 @@ cmd = %w[ -d -e CCI_SRC=#{DOCKER_CCI} -e LKP_SRC=#{DOCKER_LKP} + -e CCI_REPOS=/c -v #{ENV['CCI_SRC']}:#{DOCKER_CCI} -v #{ENV['LKP_SRC']}:#{DOCKER_LKP} + -v /c/lab-z9:/c/lab-z9 -v /etc/localtime:/etc/localtime:ro -v /etc/compass-ci/defaults:/etc/compass-ci/defaults:ro -v /etc/compass-ci/register:/etc/compass-ci/register:ro -- 2.23.0

1 0

[PATCH compass-ci 2/2] lib/mail_job_result: optimize mail body
by Lu Weitao 25 Apr '21

25 Apr '21

Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/mail_job_result.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/mail_job_result.rb b/lib/mail_job_result.rb index 752b8dcf..389ad26a 100644 --- a/lib/mail_job_result.rb +++ b/lib/mail_job_result.rb @@ -37,9 +37,11 @@ class MailJobResult Hi, - html_part: Thanks for your participation in Kunpeng and software ecosystem! + Thanks for your participation in Kunpeng and software ecosystem! Your Job: #{@job_id} had finished. - Bellow are comparsion result of the base_commit: + Bellow are comparsion result of the base_commit and current_commit: + \tbase_commit: #{@job['base_commit']} + \tcurrent_commit: #{@job['upstream_commit']} #{context.to_s} \n\n#{signature}" BODY @@ -72,14 +74,15 @@ end def get_compare_result(job) min_samples = job['nr_num'].to_i base_commit = job['base_commit'] - commit_id = job['commit_id'] + commit_id = job['upstream_commit'] return nil unless base_commit && commit_id - condition_list = [{'base_commit' => base_commit}, {'commit_id' => commit_id}] + condition_list = [{'base_commit' => base_commit}, {'upstream_commit' => commit_id}] options = { :min_samples => min_samples, :no_print => true} matrices_list, suite_list = create_matrices_list(condition_list, options[:min_samples]) return nil if matrices_list.size < 2 - compare_matrixes(matrices_list, suite_list, options: options) + m_titles = [base_commit.slice(0, 16), commit_id.slice(0, 24)] + compare_matrixes(matrices_list, suite_list, nil, m_titles, options: options) end -- 2.23.0

1 0

[PATCH compass-ci 1/2] lib/compare_matrixes.rb: ahead of the success result
by Lu Weitao 25 Apr '21

25 Apr '21

[Why] user care more about successful result Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/compare_matrixes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compare_matrixes.rb b/lib/compare_matrixes.rb index 67001265..fef5714a 100644 --- a/lib/compare_matrixes.rb +++ b/lib/compare_matrixes.rb @@ -812,7 +812,7 @@ def get_all_result_str(matrixes_values, suite_list, matrixes_titles, matrixes_nu failure_str = get_result_str(matrixes_values[false].sort, suite_list, matrixes_titles, false, theme) success_str = get_result_str(matrixes_values[true].sort, suite_list, matrixes_titles, true, theme) - failure_str + success_str + success_str + failure_str end def get_result_str(values, suite_list, matrixes_titles, success, theme) -- 2.23.0

1 0

[PATCH v2 lkp-tests 2/2] lkp/host: add taishan200-2280-2s48p-256g
by Li Yuanchao 25 Apr '21

25 Apr '21

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- hosts/taishan200-2280-2s48p-256g | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 hosts/taishan200-2280-2s48p-256g diff --git a/hosts/taishan200-2280-2s48p-256g b/hosts/taishan200-2280-2s48p-256g new file mode 100644 index 000000000..b326025d7 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g @@ -0,0 +1,4 @@ +arch: aarch64 +nr_cpu: 96 +nr_node: 4 +memory: 256G -- 2.23.0

1 0

[PATCH v2 lkp-tests 1/2] get repo my-sql_with_boostkit_patch from git_server
by Li Yuanchao 25 Apr '21

25 Apr '21

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- pkg/mysql-8-0-20/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/mysql-8-0-20/PKGBUILD b/pkg/mysql-8-0-20/PKGBUILD index 5be0d9cf9..66df6b33f 100644 --- a/pkg/mysql-8-0-20/PKGBUILD +++ b/pkg/mysql-8-0-20/PKGBUILD @@ -5,8 +5,8 @@ pkgrel=1 arch=('aarch64' 'x86_64') url="http://www.mysql.com" license=('GPLv2') -source=("https://gitee.com/li-yancheng/my-sql_with_boostkit_patch.git" - "https://gitee.com/li-yancheng/gcc.git" +source=("git://$GIT_SERVER/upstream/m/my-sql_with_boostkit_patch/my-sql_with_boostkit_patch.git" + "git://$GIT_SERVER/upstream/g/gcc/gcc.git" "my.cnf") md5sums=('SKIP' 'SKIP' '99c4965aa870c475000993f52a0dee66') -- 2.23.0

1 0

[PATCH lkp-tests] tests/self-test: add the execute permission
by Lin Jiaxin 25 Apr '21

25 Apr '21

Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- tests/self-test | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tests/self-test diff --git a/tests/self-test b/tests/self-test old mode 100644 new mode 100755 -- 2.23.0

1 0

[PATCH lkp-tests] get repo my-sql_with_boostkit_patch from git_server
by Li Yuanchao 25 Apr '21

25 Apr '21

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- pkg/mysql-8-0-20/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/mysql-8-0-20/PKGBUILD b/pkg/mysql-8-0-20/PKGBUILD index 5be0d9cf9..66df6b33f 100644 --- a/pkg/mysql-8-0-20/PKGBUILD +++ b/pkg/mysql-8-0-20/PKGBUILD @@ -5,8 +5,8 @@ pkgrel=1 arch=('aarch64' 'x86_64') url="http://www.mysql.com" license=('GPLv2') -source=("https://gitee.com/li-yancheng/my-sql_with_boostkit_patch.git" - "https://gitee.com/li-yancheng/gcc.git" +source=("git://$GIT_SERVER/upstream/m/my-sql_with_boostkit_patch/my-sql_with_boostkit_patch.git" + "git://$GIT_SERVER/upstream/g/gcc/gcc.git" "my.cnf") md5sums=('SKIP' 'SKIP' '99c4965aa870c475000993f52a0dee66') -- 2.23.0

1 0