- Compass-ci - mailweb.openeuler.org

[PATCH lkp-tests] etc/latency: added
by Lu Weitao 26 Apr '21

26 Apr '21

Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- etc/latency | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 etc/latency diff --git a/etc/latency b/etc/latency new file mode 100644 index 000000000..25dab098e --- /dev/null +++ b/etc/latency @@ -0,0 +1,13 @@ +dbench.max_latency +dd.kill_time +dd.startup_time +ebizzy.throughput.per_thread.stddev_percent +fileio.latency_95th_ms +fileio.latency_max_ms +iostat\..*\.(await|r_await|w_await|svctm|avgqu-sz)\.max +latency_stats\..* +oltp.latency_95th_ms +oltp.latency_max_ms +oltp.latency_min_ms +tbench.max_latency +vm-scalability.stddev -- 2.23.0

2 2

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

26 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 d69d2d4c1..7449b3bd1 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 lkp-tests 1/2] tests/install-rpm: add suite install-rpm
by Wang Yong 26 Apr '21

26 Apr '21

add install-rpm to install/remove and ldd test for rpm packages Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- distro/depends/install-rpm | 1 + jobs/install-rpm.yaml | 4 ++ tests/install-rpm | 79 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 distro/depends/install-rpm create mode 100755 jobs/install-rpm.yaml create mode 100755 tests/install-rpm diff --git a/distro/depends/install-rpm b/distro/depends/install-rpm new file mode 100644 index 000000000..602479c9a --- /dev/null +++ b/distro/depends/install-rpm @@ -0,0 +1 @@ +dnf-plugins-core diff --git a/jobs/install-rpm.yaml b/jobs/install-rpm.yaml new file mode 100755 index 000000000..9afa9d992 --- /dev/null +++ b/jobs/install-rpm.yaml @@ -0,0 +1,4 @@ +suite: install-rpm +category: functional + +install-rpm: diff --git a/tests/install-rpm b/tests/install-rpm new file mode 100755 index 000000000..428ca38d6 --- /dev/null +++ b/tests/install-rpm @@ -0,0 +1,79 @@ +#!/bin/bash +# - compat_os +# - rpm_name +# - custom_repo_name +# - custom_repo_addr +# 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/log.sh + +: "${compat_os:=budding-openeuler}" +: "${DISTRO:=openeuler}" +: "${basearch:=$(arch)}" +. $LKP_SRC/distro/${DISTRO} + +[ -n "${rpm_name}" ] || die "rpm_name is empty" +[ -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[@]}" + yum install -y ${rpm_name[@]} || die "install rpm failed" +} + +ldd_test() +{ + log_info "Starting ldd test" + for i in $(rpm -qa ${rpm_name[@]}) + do + ldd_list=$(rpm -ql $i | awk -F'/' '$3 ~ /bin|sbin|lib|lib64/') + [ -z "${ldd_list}" ] || { + for i in ${ldd_list[@]} + do + [[ -f "$i" && -x "$i" ]] && { + echo "ldd for $i" + ldd -d -r $i + } + done + } + done +} + +remove_rpm() +{ + log_info "Starting remove test: yum remove -y ${rpm_name[@]}" + yum remove -y ${rpm_name[@]} || die "uninstall rpm failed" +} + +distro_install_depends install-rpm +add_repo +install_rpm +ldd_test +remove_rpm -- 2.23.0

1 1

[PATCH v3 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index 070dabf46..5b82c2a6b 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -88,6 +88,10 @@ net_devices_link() test_ping() { + has_cmd ping || { + echo "no command ping, skip ping test." + return 0 + } ping -c 1 -w 1 $LKP_SERVER > /dev/null } -- 2.23.0

2 2

[PATCH v4 compass-ci] sbin/download-rootfs: download osimage
by Liu Yinsi 26 Apr '21

26 Apr '21

the default os_mount=initramfs, so download osimage to run qemu kvm. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sbin/download-rootfs | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/sbin/download-rootfs b/sbin/download-rootfs index 68a68039..cea416c0 100755 --- a/sbin/download-rootfs +++ b/sbin/download-rootfs @@ -19,22 +19,35 @@ os_version=${3:-20.03} load_cci_defaults rootfs_dir=/srv/os/${os}/${os_arch}/${os_version} +osimage_dir=/srv/initrd/osimage/${os}/${os_arch}/${os_version} -download_os_rootfs() -{ - mkdir -p $rootfs_dir - cd $rootfs_dir +mkdir -p $rootfs_dir $osimage_dir - download_url="http://api.compass-ci.openeuler.org:${SRV_HTTP_OS_PORT}/os/${os}/${os_arch}…" - wget $download_url +wget_download() +{ + local download_url=$1 + wget $download_url + + [ "$?" -ne 0 ] && { + log_error "failed to download os rootfs: $download_url" + exit 1 + } +} - [ "$?" -ne 0 ] && { - log_error "failed to download os rootfs: $download_url" - exit 1 - } +download_os_rootfs() +{ + cd $rootfs_dir + wget_download "http://api.compass-ci.openeuler.org:${SRV_HTTP_OS_PORT}/os/${os}/${os_arch}…" + + gzip -dc ${os_version}.cgz | cpio -id + rm -rf ${os_version}.cgz +} - gzip -dc ${os_version}.cgz | cpio -id - rm -rf ${os_version}.cgz +download_osimage() +{ + cd $osimage_dir + wget_download "http://api.compass-ci.openeuler.org:${SRV_HTTP_INITRD_PORT}/initrd/osimage/…" + wget_download "http://api.compass-ci.openeuler.org:${SRV_HTTP_INITRD_PORT}/initrd/deps/nfs…" } is_virtual() @@ -42,4 +55,4 @@ is_virtual() dmidecode -s system-product-name | grep -iq "virtual" } -is_virtual || download_os_rootfs +is_virtual || ( download_os_rootfs && download_osimage ) -- 2.23.0

3 4

[PATCH compass-ci] sparrow/3-code/dev-env: rename some variables
by Liu Yinsi 26 Apr '21

26 Apr '21

[why] prevent to use variables value from z9 in testbox. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/3-code/dev-env | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index a478fffe..ba213e3a 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -41,16 +41,16 @@ server_name=$(hostname | cut -f1 -d.) : ${git_server:=$server_ip} : ${SCHED_HTTPS_HOST:=$server_ip} : ${SCHED_HTTPS_PORT:=20002} -: ${DOCKER_PROXY_HOST:=$server_ip} +: ${docker_proxy_host:=$server_ip} : ${DOCKER_PROXY_PORT:=3128} -: ${JUMPER_HOST:=$server_ip} +: ${jumper_host:=$server_ip} : ${JUMPER_PORT:=10000} -: ${MONITOR_HOST:=$server_ip} +: ${monitor_host:=$server_ip} : ${MONITOR_PORT:=20001} : ${FETCH_MAIL_DIR:=/srv/cci/Maildir} : ${FETCH_MAIL_BOX:=.compass-ci} : ${GIT_DAEMON_HOST:=$server_ip} -: ${GIT_MIRROR_HOST:=$server_ip} +: ${git_mirror_host:=$server_ip} : ${REDIS_PORT:=6379} : ${MAILDIR:=/srv/cci/Maildir/.compass-ci} : ${SENT_MAILDIR:=/srv/cci/Maildir/.sent} @@ -122,16 +122,16 @@ DOCKER_REGISTRY_PORT: $DOCKER_REGISTRY_PORT LOCAL_SEND_MAIL_PORT: $LOCAL_SEND_MAIL_PORT MAILDIR: /srv/cci/Maildir/.compass-ci LOCAL_ROBOT_EMAIL_ADDRESS: $LOCAL_ROBOT_EMAIL_ADDRESS -DOCKER_PROXY_HOST: $DOCKER_PROXY_HOST +DOCKER_PROXY_HOST: $docker_proxy_host DOCKER_PROXY_PORT: $DOCKER_PROXY_PORT -JUMPER_HOST: $JUMPER_HOST +JUMPER_HOST: $jumper_host JUMPER_PORT: $JUMPER_PORT -MONITOR_HOST: $MONITOR_HOST +MONITOR_HOST: $monitor_host MONITOR_PORT: $MONITOR_PORT FETCH_MAIL_DIR: $FETCH_MAIL_DIR FETCH_MAIL_BOX: $FETCH_MAIL_BOX GIT_DAEMON_HOST: $GIT_DAEMON_HOST -GIT_MIRROR_HOST: $GIT_MIRROR_HOST +GIT_MIRROR_HOST: $git_mirror_host REDIS_PORT: $REDIS_PORT MAILDIR: $MAILDIR SENT_MAILDIR: $SENT_MAILDIR -- 2.23.0

2 3

[PATCH compass-ci] sparrow: set default value $CCI_SRC
by Liu Yinsi 26 Apr '21

26 Apr '21

if $CCI_SRC is null, can't find check_public_network.sh script. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/common | 2 ++ sparrow/0-package/os/openEuler | 2 ++ sparrow/5-build/os-ready | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index eb86b242..82c09ff5 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -2,6 +2,8 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +[[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci + . $CCI_SRC/lib/check_public_network.sh public_network_ok && { diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index 8cdadd52..5829a123 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -2,6 +2,8 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +[[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci + . $CCI_SRC/lib/check_public_network.sh pkgs=( diff --git a/sparrow/5-build/os-ready b/sparrow/5-build/os-ready index 5e1acc48..91323379 100755 --- a/sparrow/5-build/os-ready +++ b/sparrow/5-build/os-ready @@ -2,6 +2,8 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +[[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci + . $CCI_SRC/lib/check_public_network.sh public_network_ok && $CCI_SRC/sbin/download-rootfs -- 2.23.0

2 1

[PATCH v2 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index 070dabf46..c699b40e4 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -88,6 +88,10 @@ net_devices_link() test_ping() { + [ $(command -v ping) ] || { + echo "no command ping, skip ping test." + return 0 + } ping -c 1 -w 1 $LKP_SERVER > /dev/null } -- 2.23.0

2 2

[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

[PATCH compass-ci] delimiter: use delimiter job id as the group_id in every bisect process job
by Cao Xueliang 25 Apr '21

25 Apr '21

we use es-jobs to track bisect process job, for example: es-jobs group_id=z9.3117489 | grep job_stat kvcount.job_state=failed: 1 kvcount.job_state=finished: 2 raw.id.[job_state=failed]: ["z9.3117506"] raw.id.[job_state=finished]: ["z9.3117490","z9.3117512"] Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/delimiter/utils.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/delimiter/utils.rb b/src/delimiter/utils.rb index c782ea2..5ecbeb5 100644 --- a/src/delimiter/utils.rb +++ b/src/delimiter/utils.rb @@ -136,12 +136,13 @@ module Utils job = JSON.parse job_yaml record_jobs(job['id'], job['upstream_commit']) - job['suite'] = 'bisect' + job['suite'] = 'bisect-process' job['my_name'] = ENV['my_name'] job['my_email'] = ENV['my_email'] job['my_token'] = ENV['secrets_my_token'] job['bad_job_id'] = job_id job['testbox'] = job['tbox_group'] + job['group_id'] = "#{ENV['id']}" job.delete('id') job.delete('queue') -- 2.23.0

1 0

[PATCH compass-ci] delimiter: use delimiter id as the group_id in every bisect process job
by Cao Xueliang 25 Apr '21

25 Apr '21

we use es-jobs to track bisect process job, for example: es-jobs group_id=z9.3117489 | grep job_stat kvcount.job_state=failed: 1 kvcount.job_state=finished: 2 raw.id.[job_state=failed]: ["z9.3117506"] raw.id.[job_state=finished]: ["z9.3117490","z9.3117512"] Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/delimiter/utils.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/delimiter/utils.rb b/src/delimiter/utils.rb index c782ea2..5ecbeb5 100644 --- a/src/delimiter/utils.rb +++ b/src/delimiter/utils.rb @@ -136,12 +136,13 @@ module Utils job = JSON.parse job_yaml record_jobs(job['id'], job['upstream_commit']) - job['suite'] = 'bisect' + job['suite'] = 'bisect-process' job['my_name'] = ENV['my_name'] job['my_email'] = ENV['my_email'] job['my_token'] = ENV['secrets_my_token'] job['bad_job_id'] = job_id job['testbox'] = job['tbox_group'] + job['group_id'] = "#{ENV['id']}" job.delete('id') job.delete('queue') -- 2.23.0

1 1

[PATCH lkp-tests] jobs/mysql-8-0-20.yaml: delete set testbox
by Luan Shengde 25 Apr '21

25 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- jobs/mysql-8-0-20.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/jobs/mysql-8-0-20.yaml b/jobs/mysql-8-0-20.yaml index 070c851d5..dbf8340d7 100644 --- a/jobs/mysql-8-0-20.yaml +++ b/jobs/mysql-8-0-20.yaml @@ -1,8 +1,6 @@ suite: cci-makepkg category: functional -testbox: taishan200-2280-2s48p-256g--a18 - os: openeuler os_version: 20.03 os_mount: initramfs -- 2.23.0

1 0

[PATCH compass-ci] lib/mail_bisect_result: fix can't open git url
by Cao Xueliang 25 Apr '21

25 Apr '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/mail_bisect_result.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mail_bisect_result.rb b/lib/mail_bisect_result.rb index 5a71225..38828a3 100644 --- a/lib/mail_bisect_result.rb +++ b/lib/mail_bisect_result.rb @@ -55,7 +55,7 @@ class MailBisectResult Hi #{(a)git_commit.author_name}, Some error/warning(s) are found in - git url: #{@upstream_url}/#{@commit_id} + git url: #{@upstream_url}/commit/#{@commit_id} git commit: #{@commit_id} ("#{(a)git_commit.subject}") All error/warning(s) (new ones prefixed by >>): -- 2.23.0

1 0

[PATCH compass-ci] container/assign-account: delete useless varilables
by Luan Shengde 25 Apr '21

25 Apr '21

service assign-account doesnot use ES Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/assign-account/start | 2 -- 1 file changed, 2 deletions(-) diff --git a/container/assign-account/start b/container/assign-account/start index c8c55da0..42b34c29 100755 --- a/container/assign-account/start +++ b/container/assign-account/start @@ -13,8 +13,6 @@ cmd=( --restart=always --name=assign-account -d - -e ES_USER=$ES_USER - -e ES_PASSWORD=$ES_PASSWORD -v /etc:/etc:rw -v /srv/account-info:/opt/account_data/:rw -v /home:/home:rw -- 2.23.0

1 0

[PATCH lkp-tests] jobs/mysql-8-0-20.yaml: add default value for mysql server
by Luan Shengde 25 Apr '21

25 Apr '21

tests/sysbench-mysql need the default value in the following line: : "${mysql_host:=$server}" Signed-off-by: Luan Shengde <shdluan(a)163.com> --- jobs/mysql-8-0-20.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/mysql-8-0-20.yaml b/jobs/mysql-8-0-20.yaml index 8c30f963e..070c851d5 100644 --- a/jobs/mysql-8-0-20.yaml +++ b/jobs/mysql-8-0-20.yaml @@ -8,7 +8,7 @@ os_version: 20.03 os_mount: initramfs mysql_user: -mysql_host: +mysql_host: localhost mysql_port: mysql_db: mysql_password: -- 2.23.0

1 0

[PATCH v2 lkp-tests] pkg/mysql-8-0-20: enable make install gcc
by Luan Shengde 25 Apr '21

25 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- pkg/mysql-8-0-20/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/mysql-8-0-20/PKGBUILD b/pkg/mysql-8-0-20/PKGBUILD index 154f936cf..5be0d9cf9 100644 --- a/pkg/mysql-8-0-20/PKGBUILD +++ b/pkg/mysql-8-0-20/PKGBUILD @@ -12,7 +12,7 @@ md5sums=('SKIP' 'SKIP' '99c4965aa870c475000993f52a0dee66') build() { - # build_gcc + build_gcc build_mysql } @@ -48,7 +48,8 @@ build_gcc() --with-boot-ldflags='-Wl,-z,relro,-z,now' \ --with-multilib-list=lp64 make -j96 - make install + make install & + wait } } -- 2.23.0

1 0