- Compass-ci - mailweb.openeuler.org

[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

[PATCH compass-ci] sbin/auto_submit: don't get base_commit for master
by Li Yuanchao 24 Apr '21

24 Apr '21

base_commit is to find where a branch start from master, it's not for master. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- sbin/auto_submit | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/auto_submit b/sbin/auto_submit index dcf5b80..595053e 100755 --- a/sbin/auto_submit +++ b/sbin/auto_submit @@ -64,6 +64,8 @@ class AutoSubmit end def get_argvs_for_competition(real_argvs, mirror_dir, branch, commit_id) + return if branch == 'master' + argvs_for_base = Array.new(real_argvs) author_email = %x(git -C #{mirror_dir} log --format=%ae -1 #{commit_id}).chomp committer_email = %x(git -C #{mirror_dir} log --format=%ce -1 #{commit_id}).chomp -- 2.23.0

1 0

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

24 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..134a50096 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

[PATCH compass-ci 3/3] container/extrac-stats/Dockerfile: add terminal-table
by Lu Weitao 24 Apr '21

24 Apr '21

[Why] the ruby-dev need terminal-table Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- container/extract-stats/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/extract-stats/Dockerfile b/container/extract-stats/Dockerfile index 08abc8c2..30bc865d 100644 --- a/container/extract-stats/Dockerfile +++ b/container/extract-stats/Dockerfile @@ -10,7 +10,7 @@ RUN sed -ri.origin 's|^https?://dl-cdn.alpinelinux.org|http://mirrors.huaweiclou RUN umask 002 && \ gem sources -r https://rubygems.org/ -a https://gems.ruby-china.com/ && \ - gem install rest-client activesupport git json yaml elasticsearch + gem install rest-client activesupport git json yaml elasticsearch terminal-table ENV RUNTIME_DIR /c/cci/extract -- 2.23.0

1 0

[PATCH compass-ci 2/3] sbin/mail-job: mail compare result to author and committer
by Lu Weitao 24 Apr '21

24 Apr '21

Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/mail_job_result.rb | 55 +++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/lib/mail_job_result.rb b/lib/mail_job_result.rb index e5884705..752b8dcf 100644 --- a/lib/mail_job_result.rb +++ b/lib/mail_job_result.rb @@ -4,6 +4,7 @@ require_relative 'mail_client.rb' require_relative 'es_query.rb' +require_relative 'compare.rb' require_relative 'constants.rb' require 'json' @@ -16,27 +17,44 @@ class MailJobResult end def send_mail - json = compose_mail.to_json - MailClient.new.send_mail(json) + data = compose_mail + return nil unless data + MailClient.new.send_mail_encode(data) end def compose_mail set_submitter_info - subject = "[Compass-CI] job: #{@job_id} result" + context = get_compare_result(@job) + return nil unless context + + subject = "[Compass-CI] job: #{@job_id} compare result" signature = "Regards\nCompass-CI\nhttps://gitee.com/openeuler/compass-ci" - body = "Hi, - Thanks for your participation in Kunpeng and software ecosystem! + + data = <<~BODY + To: #{@email_to} + Bcc: #{@email_cc} + Subject: #{subject} + + Hi, + + html_part: Thanks for your participation in Kunpeng and software ecosystem! Your Job: #{@job_id} had finished. - Please check job result: http://#{@result_host}:#{@result_port}#{@result_root}\n\n#{signature}" - { 'to' => @submitter_email, 'body' => body, 'subject' => subject } + Bellow are comparsion result of the base_commit: + #{context.to_s} + \n\n#{signature}" + BODY + + data end def set_submitter_info - job = query_job - exit unless job && job['email'] + sleep 10 + @job = query_job + exit unless @job && @job['author_email'] - @submitter_email = job['email'] - @result_root = job['result_root'] + @email_to = @job['author_email'] + @email_cc = @job['committer_email'] + @result_root = @job['result_root'] end def query_job @@ -50,3 +68,18 @@ class MailJobResult query_result['hits']['hits'][0]['_source'] end end + +def get_compare_result(job) + min_samples = job['nr_num'].to_i + base_commit = job['base_commit'] + commit_id = job['commit_id'] + return nil unless base_commit && commit_id + + condition_list = [{'base_commit' => base_commit}, {'commit_id' => 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) +end -- 2.23.0

1 0

[PATCH compass-ci 1/3] sbin/compare: support min_samples mode
by Lu Weitao 24 Apr '21

24 Apr '21

[Example] sbin/compare id=crystal.1686878,crystal.1686879 id=crystal.1686880,crystal.1686881 --min_samples 3 Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/compare.rb | 22 +++++++++++++++++++--- lib/matrix2.rb | 4 +++- sbin/compare | 5 +++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/lib/compare.rb b/lib/compare.rb index 7386caea..a6fd9f98 100644 --- a/lib/compare.rb +++ b/lib/compare.rb @@ -20,7 +20,13 @@ require 'yaml' def compare_matrices_list(argv, common_conditions, options) condition_list = parse_argv(argv, common_conditions) - matrices_list, suite_list = create_matrices_list(condition_list) + matrices_list, suite_list = create_matrices_list(condition_list, options[:min_samples]) + if matrices_list.size < 2 + return nil if options[:no_print] + + warn "matrix less than min_samples" + end + compare_matrixes(matrices_list, suite_list, options: options) end @@ -35,13 +41,15 @@ def parse_argv(argv, common_conditions) conditions end -def create_matrices_list(conditions) +def create_matrices_list(conditions, min_samples) matrices_list = [] suite_list = [] es = ESQuery.new conditions.each do |condition| query_results = es.multi_field_query(condition, desc_keyword: 'start_time') - matrix, suites = combine_query_data(query_results) + matrix, suites = combine_query_data(query_results, min_samples) + next unless matrix + matrices_list << matrix suite_list.concat(suites) end @@ -49,6 +57,14 @@ def create_matrices_list(conditions) return matrices_list, suite_list end +def matrices_verification(matrices, options) + if matrices.size < 2 + return nil if options[:no_print] + + warn "matrix less than min_samples" + end +end + # ------------------------------------------------------------------------------------------- # compare_group # - one condition only diff --git a/lib/matrix2.rb b/lib/matrix2.rb index 12245a80..2fd63243 100644 --- a/lib/matrix2.rb +++ b/lib/matrix2.rb @@ -101,8 +101,10 @@ end # input: query results from es_query # return: matrix -def combine_query_data(query_data) +def combine_query_data(query_data, min_sample) job_list = extract_jobs_list(query_data['hits']['hits']) + return nil if job_list.size < min_sample + create_matrix(job_list) end diff --git a/sbin/compare b/sbin/compare index 2ee32688..bcb66ccf 100755 --- a/sbin/compare +++ b/sbin/compare @@ -22,6 +22,7 @@ is_group = false dimensions = nil colorful = nil options = {} +options[:min_samples] = 1 template = nil opt_parser = OptionParser.new do |opts| @@ -48,6 +49,10 @@ opt_parser = OptionParser.new do |opts| colorful = theme end + opts.on('--min_samples min_samples', 'give a number to litmit the min_samples of matrix which used to compare') do |min_samples| + options[:min_samples] = min_samples.to_i + end + opts.on('-t', '--template template', 'compare with user-defined template') do |t| template = t end -- 2.23.0

1 0