- Compass-ci - mailweb.openeuler.org

[PATCH v3 lkp-tests 1/7] jobs: add job yaml
by Luan Shengde 30 Apr '21

30 Apr '21

add job yaml for sysbench-mysql Signed-off-by: Luan Shengde <shdluan(a)163.com> --- jobs/sysbench-mysql.yaml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 jobs/sysbench-mysql.yaml diff --git a/jobs/sysbench-mysql.yaml b/jobs/sysbench-mysql.yaml new file mode 100644 index 000000000..6c6606ea2 --- /dev/null +++ b/jobs/sysbench-mysql.yaml @@ -0,0 +1,33 @@ +suite: sysbench-mysql + +os: openeuler +os_version: 20.03 +os_mount: initramfs + +mysql_user: +mysql_host: localhost +mysql_port: +mysql_db: +benchmark_db: tpcc +mysql_password: +data_dev: sdb + +cci-makepkg: + benchmark: mysql-8-0-20 + +mysql-8-0-20: + +sysbench-mysql: + oltp_test_mode: complex + max_requests: 0 + mysql_table_engine: innodb + oltp_tables_count: 1000 + oltp_table_size: 100000 + nr_threads: 256 + runtime: 60 + rand_type: special + rand_spec_pct: 100 + oltp_read_only: false + report_interval: 1 + events: 20000 + mysql_socket: /data/mysql/run/mysql.sock -- 2.23.0

1 0

[PATCH v2 compass-ci] lib/mail_job_result: optimize mail content
by Lu Weitao 30 Apr '21

30 Apr '21

optimize mail content limit max lines(100) of compare result Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/mail_job_result.rb | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/lib/mail_job_result.rb b/lib/mail_job_result.rb index 744b7d5c..7937de66 100644 --- a/lib/mail_job_result.rb +++ b/lib/mail_job_result.rb @@ -24,10 +24,10 @@ class MailJobResult def compose_mail set_submitter_info - context = get_compare_result(@job) + context = keep_100_lines(get_compare_result(@job)) return nil unless context - subject = "[Compass-CI] job: #{@job_id} compare result" + subject = "[Compass-CI] #{@job['commit_title'] || @job_id} comparsion" signature = "Regards\nCompass-CI\nhttps://gitee.com/openeuler/compass-ci" data = <<~BODY @@ -38,10 +38,17 @@ class MailJobResult Hi, Thanks for your participation in Kunpeng and software ecosystem! - Your Job: #{@job_id} had finished. - Bellow are comparsion result of the base_commit and current_commit: - \tbase_commit: #{@job['base_commit']} - \tcurrent_commit: #{@job['upstream_commit']} + Your job id: #{@job_id} + Bellow are comparsion result of the base commit and your commit: + \tbase commit: #{@job['base_commit']} + \tcommit_link: #{@job['upstream_url']}/commit/#{@job['base_commit']} + + \tyour commit: #{@job['upstream_commit']} + \tbranch: #{@job['upstream_branch']} + \tcommit_link: #{@job['upstream_url']}/commit/#{@job['upstream_commit']} + + compare command: + \tcompare upstream_commit=#{@job['base_commit']} upstream_commit=#{@job['upstream_commit']} --min_samples #{@job['nr_run']} #{context.to_s} \n\n#{signature}" BODY @@ -86,3 +93,7 @@ def get_compare_result(job) m_titles = [base_commit.slice(0, 16), commit_id.slice(0, 24)] compare_matrixes(matrices_list, suite_list, nil, m_titles, options: options) end + +def keep_100_lines(context) + context.split("\n")[0,99].join("\n") +end -- 2.23.0

1 0

[PATCH compass-ci] lib/mail_job_result: optimize mail content
by Lu Weitao 30 Apr '21

30 Apr '21

optimize mail content limit max lines(100) of compare result Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/mail_job_result.rb | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/lib/mail_job_result.rb b/lib/mail_job_result.rb index 744b7d5c..0bf52b6e 100644 --- a/lib/mail_job_result.rb +++ b/lib/mail_job_result.rb @@ -24,10 +24,10 @@ class MailJobResult def compose_mail set_submitter_info - context = get_compare_result(@job) + context = keep_100_lines(get_compare_result(@job)) return nil unless context - subject = "[Compass-CI] job: #{@job_id} compare result" + subject = "[Compass-CI] commit: #{@job['upstream_commit']} comparsion result" signature = "Regards\nCompass-CI\nhttps://gitee.com/openeuler/compass-ci" data = <<~BODY @@ -38,10 +38,15 @@ class MailJobResult Hi, Thanks for your participation in Kunpeng and software ecosystem! - Your Job: #{@job_id} had finished. - Bellow are comparsion result of the base_commit and current_commit: - \tbase_commit: #{@job['base_commit']} - \tcurrent_commit: #{@job['upstream_commit']} + Bellow are comparsion result of the base commit and your commit: + \tbase commit: #{@job['base_commit']} + \tcommit_link: #{@job['upstream_url']}/commit/#{@job['base_commit']} + + \tyour commit: #{@job['upstream_commit']} + \tbranch: #{@job['upstream_branch']} + \tcommit_link: #{@job['upstream_url']}/commit/#{@job['upstream_commit']} + + compare upstream_commit=#{@job['base_commit']} upstream_commit=#{@job['upstream_commit']} --min_samples #{@job['nr_run']} #{context.to_s} \n\n#{signature}" BODY @@ -86,3 +91,15 @@ def get_compare_result(job) m_titles = [base_commit.slice(0, 16), commit_id.slice(0, 24)] compare_matrixes(matrices_list, suite_list, nil, m_titles, options: options) end + +def keep_100_lines(context) + num = 0 + new_context = '' + context.each_line do |line| + new_context += line + num += 1 + break if num > 99 + end + + new_context +end -- 2.23.0

2 3

Re: [PATCH lkp-tests 1/6] add job yaml for sysbenc
by Li Ping 30 Apr '21

30 Apr '21

sysbench-mysql Reply-To: In-Reply-To: <20210429133100.902627-1-shdluan(a)163.com> On Thu, Apr 29, 2021 at 09:30:55PM +0800, Luan Shengde wrote: >Signed-off-by: Luan Shengde <shdluan(a)163.com> >--- > jobs/sysbench-mysql.yaml | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 insertions(+) > create mode 100644 jobs/sysbench-mysql.yaml > >diff --git a/jobs/sysbench-mysql.yaml b/jobs/sysbench-mysql.yaml >new file mode 100644 >index 000000000..6c6606ea2 >--- /dev/null >+++ b/jobs/sysbench-mysql.yaml >@@ -0,0 +1,33 @@ >+suite: sysbench-mysql >+ >+os: openeuler >+os_version: 20.03 >+os_mount: initramfs >+ >+mysql_user: >+mysql_host: localhost >+mysql_port: >+mysql_db: >+benchmark_db: tpcc >+mysql_password: >+data_dev: sdb >+ >+cci-makepkg: >+ benchmark: mysql-8-0-20 >+ >+mysql-8-0-20: >+ >+sysbench-mysql: >+ oltp_test_mode: complex >+ max_requests: 0 >+ mysql_table_engine: innodb >+ oltp_tables_count: 1000 >+ oltp_table_size: 100000 >+ nr_threads: 256 >+ runtime: 60 >+ rand_type: special >+ rand_spec_pct: 100 >+ oltp_read_only: false >+ report_interval: 1 >+ events: 20000 >+ mysql_socket: /data/mysql/run/mysql.sock >-- >2.23.0 >

2 1

Re: [PATCH lkp-tests 2/6] add job yaml for benmarksql
by Li Ping 30 Apr '21

30 Apr '21

benchmark-sql Reply-To: In-Reply-To: <20210429133100.902627-2-shdluan(a)163.com> On Thu, Apr 29, 2021 at 09:30:56PM +0800, Luan Shengde wrote: >Signed-off-by: Luan Shengde <shdluan(a)163.com> >--- > jobs/benchmark-sql.yaml | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > create mode 100644 jobs/benchmark-sql.yaml > >diff --git a/jobs/benchmark-sql.yaml b/jobs/benchmark-sql.yaml >new file mode 100644 >index 000000000..152253c4e >--- /dev/null >+++ b/jobs/benchmark-sql.yaml >@@ -0,0 +1,20 @@ >+suite: benchmark-sql >+ >+os: openeuler >+os_version: 20.03 >+os_mount: initramfs >+ >+mysql_user: >+mysql_host: localhost >+mysql_port: >+mysql_db: >+benchmark_db: tpcc >+mysql_password: >+data_dev: sdb >+ >+cci-makepkg: >+ benchmark: mysql-8-0-20 >+ >+mysql-8-0-20: >+ >+benchmark-sql: >-- >2.23.0 >

2 1

[PATCH lkp-tests] install-iso-sync-rootfs: delete cgz content for firstboot reboot
by Yu Chuan 30 Apr '21

30 Apr '21

[Why] In install-iso-firstboot step, we put the reboot-after-systemd-logind.cgz to rootfs, so we need delete all file in that cgz before we archive the result rootfs. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- distro/depends/install-iso-sync-rootfs | 1 + tests/install-iso-sync-rootfs | 28 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/distro/depends/install-iso-sync-rootfs b/distro/depends/install-iso-sync-rootfs index 2abb6b833291..41c472eda77e 100644 --- a/distro/depends/install-iso-sync-rootfs +++ b/distro/depends/install-iso-sync-rootfs @@ -1,2 +1,3 @@ nfs-common lvm2 +wget diff --git a/tests/install-iso-sync-rootfs b/tests/install-iso-sync-rootfs index b74c7bed2044..c2b64a2b44d8 100755 --- a/tests/install-iso-sync-rootfs +++ b/tests/install-iso-sync-rootfs @@ -53,6 +53,31 @@ prepare_exclude_file() done } +delete_firstboot_cgz() +{ + local cgz_url="http://${INITRD_HTTP_HOST}:${INITRD_HTTP_PORT}/initrd/custom_bootstrap/reboot-after-systemd-logind.cgz" + + local tmp_dir="/tmp/$(basename $cgz_url)_${ROOTFS_SUFFIX}" + rm -rf $tmp_dir && mkdir -p $tmp_dir && cd $tmp_dir + + wget $cgz_url || { + log_info "wget cgz failed, skip delete it: $cgz_url" + return 0 + } + + gzip -dc reboot-after-systemd-logind.cgz | cpio -id + + [ -d "custom_bootstrap" ] || { + log_info "cannot find custom_bootstrap dir after unzip" + return 0 + } + + for i in $(find custom_bootstrap/* -not -type d) + do + rm -f ${lv_rootfs_mount_point}/${i#custom_bootstrap/} + done +} + sync_rootfs_to_nfs_server() { # mount nfs rootfs @@ -70,6 +95,9 @@ sync_rootfs_to_nfs_server() mkdir -p ${lv_rootfs_mount_point} mount /dev/mapper/${VG_NAME}-${iso_os}_${iso_arch}_${iso_version}_${ROOTFS_SUFFIX} ${lv_rootfs_mount_point} || die "mount lv rootfs failed" + # delete cgz for firstboot reboot + delete_firstboot_cgz + # sync rootfs local exclude_file=/tmp/exclude_file_${ROOTFS_SUFFIX} -- 2.23.0

1 0

[PATCH v4 lkp-tests] add email feedback for rpmbuild-pkg
by Li Ping 30 Apr '21

30 Apr '21

tests/rpmbuild-pkg: add a new input parameter whether_email [usage]: rpmbuild-pkg: whether_email: 1 when job failed, send an rpmbuild failed email. when job run success, send an rpmbuild success email. Signed-off-by: Li Ping <1477412247(a)qq.com> --- lib/email.sh | 35 +++++++++++++++++++++++++++++++++++ tests/rpmbuild-pkg | 24 ++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/lib/email.sh b/lib/email.sh index b5e56df79..a6e0bc3ba 100755 --- a/lib/email.sh +++ b/lib/email.sh @@ -96,6 +96,41 @@ Compass-CI " } +rpmbuild_report() +{ + email_content="To: $author_email +Subject: [NOTIFY Compass-CI] rpmbuild report + +Dear $author_name: + + $rpmbuild_result + +Regards +Compass-CI +" +} + +rpmbuild_success_content() +{ + rpmbuild_result="Your RPM Package is successfully built. + +You can click the follow link to obtain your RPM Package: +http://api.compass-ci.openeuler.org:20012/rpm/pub/${os}-${os_version}/${compat_os}/${os_arch}/Packages + +And you can click the following link to view RPM Package build details: +http://api.compass-ci.openeuler.org:${SRV_HTTP_RESULT_PORT:-20007}$result_root" + + rpmbuild_report +} + +rpmbuild_failed_content() +{ + rpmbuild_result="Sorry to inform you that RPM Package built failed, you can click the following link to view details. +http://api.compass-ci.openeuler.org:${SRV_HTTP_RESULT_PORT:-20007}$result_root" + + rpmbuild_report +} + send_email() { local subject=$1 diff --git a/tests/rpmbuild-pkg b/tests/rpmbuild-pkg index 3dd75b896..5ad5caf56 100755 --- a/tests/rpmbuild-pkg +++ b/tests/rpmbuild-pkg @@ -5,6 +5,7 @@ # - repo_addr # - custom_repo_name # - custom_repo_addr +# - whether_email # 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 @@ -12,6 +13,7 @@ . $LKP_SRC/lib/debug.sh . $LKP_SRC/lib/upload.sh . $LKP_SRC/lib/rpm.sh +. $LKP_SRC/lib/email.sh : "${compat_os:=budding-openeuler}" @@ -19,6 +21,13 @@ dest_dir="/rpm/upload/${os}-${os_version}/${compat_os}" +die() +{ + rpmbuild_email "rpmbuild_failed" + echo "$@" 1>&2 + exit 99 +} + from_git() { package_name=${upstream_repo##*/} @@ -29,6 +38,20 @@ from_git() download_upstream_repo } +git_pretty_format() +{ + curl -sS -H 'Content-Type: Application/json' -XPOST "$LKP_SERVER"':8100/git_command' -d '{"git_repo": "'${upstream_dir}/${upstream_repo}.git'", "git_command": ["git-log","-n1","--pretty=format:'$1'", "'${upstream_commit}'"]}' +} + +rpmbuild_email() +{ + [ -n "$whether_email" ] && { + author_email=$(git_pretty_format "%ae") + author_name=$(git_pretty_format "%an") + send_email $1 + } +} + from_srpm() { [ -n "$repo_name" ] || die "repo_name is empty" @@ -143,3 +166,4 @@ add_repo build_rpm upload_rpm_pkg update_repo_mq +rpmbuild_email "rpmbuild_success" -- 2.23.0

1 0

[PATCH lkp-tests] alter the tmpfs use 90% memory
by Zhang Dewan 30 Apr '21

30 Apr '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- lib/bootstrap.sh | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index 417c8662a..124b872bd 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -57,6 +57,27 @@ mount_tmpfs() mount -t tmpfs -o mode=1777 tmp /tmp } +resize_virtual_rootfs() +{ + # tmpfs and rootfs default use 50% memory: + # + # root@taishan200-2280-2s48p-256g--a13 ~# mount | head -n 1 + # rootfs on / type rootfs (rw,size=133395136k,nr_inodes=2084299) + # + # root@taishan200-2280-2s48p-256g--a13 ~# df -h / + # Filesystem Size Used Avail Use% Mounted on + # rootfs 128G 114G 14G 90% / + # + # this maybe cause the docker no space error. + + if mount | head -n 1 | grep "type rootfs" > /dev/null + then + echo "Set the rootfs to 90% memory" + mount -o remount,rw,size=90% rootfs / + fi + +} + get_net_devices() { local net_devices @@ -88,10 +109,6 @@ net_devices_link() test_ping() { - has_cmd ping || { - echo "command not found: ping, skip ping test." - return 0 - } ping -c 1 -w 1 $LKP_SERVER > /dev/null } @@ -411,7 +428,6 @@ install_rpms() [ -d /opt/rpms ] || return echo "install $(ls /opt/rpms/*.rpm)" rpm -ivh --force --ignoresize /opt/rpms/*.rpm - rm -f /opt/rpms/*.rpm } try_get_and_set_distro() @@ -737,6 +753,7 @@ boot_init() mount_kernel_fs mount_tmpfs + resize_virtual_rootfs redirect_stdout_stderr echo 'Kernel tests: Boot OK!' -- 2.23.0

2 2

[PATCH v2 lkp-tests] tests/self-test: send result email to commiter and author
by Wu Zhende 30 Apr '21

30 Apr '21

Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- lib/email.sh | 8 ++++++-- tests/self-test | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/email.sh b/lib/email.sh index b5e56df79..99863aa1b 100755 --- a/lib/email.sh +++ b/lib/email.sh @@ -82,10 +82,14 @@ Compass-CI selftest_content() { - email_content="To: $my_email + email_content="To: $recipient_email Subject: [NOTIFY Compass-CI] Self-test report -Dear $my_name: +Dear $author_name and $commiter: + + commit_id: $commit_id + + commit_subject: $commit_subject Your self-test groud_id=selftest job result is: diff --git a/tests/self-test b/tests/self-test index fb3e87b17..11786ac3f 100755 --- a/tests/self-test +++ b/tests/self-test @@ -28,5 +28,23 @@ submit_job() log_info "selftest job result: $report_content" } +get_commit_info() +{ + cd /c/compass-ci || exit + + commit_id=$(git log -1 --format="%H") + commit_subject=$(git log -1 --format="%s") + + author_name=$(git log -1 --format="%an") + author_email=$(git log -1 --format="%ae") + + commiter=$(git log -1 --format="%cn") + commiter_email=$(git log -1 --format="%ce") + + recipient_email="$author_email;$commiter_email" + +} + +get_commit_info submit_job send_email selftest -- 2.23.0

1 0

[PATCH lkp-tests] tsets/self-test: send result email to commiter and author
by Wu Zhende 30 Apr '21

30 Apr '21

Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- lib/email.sh | 8 ++++++-- tests/self-test | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/email.sh b/lib/email.sh index b5e56df79..99863aa1b 100755 --- a/lib/email.sh +++ b/lib/email.sh @@ -82,10 +82,14 @@ Compass-CI selftest_content() { - email_content="To: $my_email + email_content="To: $recipient_email Subject: [NOTIFY Compass-CI] Self-test report -Dear $my_name: +Dear $author_name and $commiter: + + commit_id: $commit_id + + commit_subject: $commit_subject Your self-test groud_id=selftest job result is: diff --git a/tests/self-test b/tests/self-test index fb3e87b17..11786ac3f 100755 --- a/tests/self-test +++ b/tests/self-test @@ -28,5 +28,23 @@ submit_job() log_info "selftest job result: $report_content" } +get_commit_info() +{ + cd /c/compass-ci || exit + + commit_id=$(git log -1 --format="%H") + commit_subject=$(git log -1 --format="%s") + + author_name=$(git log -1 --format="%an") + author_email=$(git log -1 --format="%ae") + + commiter=$(git log -1 --format="%cn") + commiter_email=$(git log -1 --format="%ce") + + recipient_email="$author_email;$commiter_email" + +} + +get_commit_info submit_job send_email selftest -- 2.23.0

1 0