November 2020 - Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] modify README
by Li Ping 28 Nov '20

28 Nov '20

Signed-off-by: Li Ping <15396232681(a)163.com> --- README.md | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 644e9ba..6b96e87 100644 --- a/README.md +++ b/README.md @@ -5,26 +5,30 @@ ### 概念 -Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上游开源软件（来自 Github, Gitee, Gitlab 等托管平台）的测试服务、登录服务、故障辅助定界服务和基于历史数据的分析服务。通过 Compass-CI，社区开发者可以将开源软件快速引入 openEuler 社区，并补充更多的测试用例，共同构建一个开放、完整的开源软件生态系统。 +Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上游开源软件（来自 Github, Gitee, Gitlab 等托管平台）的测试服务、登录服务、故障辅助定界服务和基于历史数据的分析服务--。Compass-CI 基于开源软件PR进行自动化测试(包括构建测试，软件包自带用例测试等)，共同构建一个开放、完整的开源软件生态测试系统。 ### 功能描述 - **测试服务** - 支持开发者基于本地设备开发，往 github 提交代码，Compass-CI 自动获取代码开展测试，并向开发者反馈测试结果。 + 支持开发者基于本地设备开发，往远端代码仓提交代码时触发Compass-CI 自动获取代码开展测试，并向开发者反馈测试结果。 - **调测环境登录** - Compass-CI 提供 SSH 登录能力，测试过程中如果测出问题，开发者可根据需要登录环境进行调测。 + Compass-CI 提供 SSH 登录能力，测试过程中如果测试任务未执行成功，开发者可根据需要登录环境进行调测。 - **测试结果分析** - Compass-CI 记录历史测试结果，对外提供 web 及命令行接口，支持开发者针对已有的测试结果进行分析，挖掘影响测试结果的因素。 + Compass-CI 提供 web 及命令行接口，支持开发者针对历史测试结果进行分析和比较，挖掘影响测试结果的因素。 + +- **测试结果复现** + + Compass-CI 把测试过程中的各项环境参数保存在job文件中，开发者可以通过重新提交job复现测试结果。 - **辅助定位** - Compass-CI 在测试过程中可以自动识别错误信息，触发基于 git tree 的测试，找出引入问题模块的变化点。 + Compass-CI 可以识别自动化构建测试过程中的错误，触发基于 git tree 的测试，找出引入问题的commit。 ### 架构简介 @@ -35,7 +39,7 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上 - **服务层** - 提供测试服务、环境登录、结果分析、辅助定界、用户项目注册能力，为本项目的主要功能。 + 本项目的主要功能是：提供测试服务、环境登录、结果分析、结果复现、辅助定界。 - **支撑层** @@ -47,7 +51,7 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上 - **资源层** - 提供硬件设备，作为Compass-CI 服务部署的设备以及测试的物理设备、虚拟机、容器资源；提供测试过程中依赖软件仓库及依赖仓库、部署服务器。 + 提供作为Compass-CI 服务部署及测试的物理设备、虚拟设备、容器资源；提供测试过程中的依赖软件及依赖仓库、部署服务器。 ### 应用场景 @@ -64,6 +68,10 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上测试过程中，全面监控系统运行信息（CPU/MEM/IO/网络等），对测试过程中的数据做快照归档，提供多次测试之间快照数据分析对比能力，协助开发者对测试结果开展分析，找出影响测试结果的因素。 +- **复现测试结果** + + 将测试过程中的各项参数(包括环境参数，软件测试参数)完整保留，存放于测试结果文件job.yaml中，支持开发者通过重新提交job复现测试结果。 + - **辅助定界** 测试过程中，发现有 Bug 时，自动触发 Regression 机制，找出首次引入问题的 Commit 信息。 @@ -179,7 +187,7 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上建议用户根据具体需要对 rootfs 进行裁剪。 -## 呼吁合作 +## 欢迎合作 - 增强 git bisect 能力 - 增强数据分析能力 - 增强数据结果可视化能力 -- 2.23.0

1 0

[PATCH v1 compass-ci] delimiter: add delimiter account info to bisect job
by Cao Xueliang 28 Nov '20

28 Nov '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/delimiter/constants.rb | 1 + src/delimiter/utils.rb | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/delimiter/constants.rb b/src/delimiter/constants.rb index 93b633d..04f87f4 100644 --- a/src/delimiter/constants.rb +++ b/src/delimiter/constants.rb @@ -6,6 +6,7 @@ START_PROCESS_COUNT = 10 GIT_MIRROR_HOST = ENV['GIT_MIRROR_HOST'] || '172.17.0.1' MONITOR_HOST = ENV['MONITOR_HOST'] || '172.17.0.1' MONITOR_PORT = ENV['MONITOR_PORT'] || '11310' +DELIMITER_ACCONUT = ENV['DELIMITER_ACCONUT'] || 'compass-ci(a)qq.com' TMEP_GIT_BASE = '/c/public_git' DELIMITER_TASK_QUEUE = 'delimiter' BISECT_RUN_SCRIPT = "#{ENV['CCI_SRC']}/src/delimiter/find-commit/bisect_run_script.rb" diff --git a/src/delimiter/utils.rb b/src/delimiter/utils.rb index 679c8d9..90c3cce 100644 --- a/src/delimiter/utils.rb +++ b/src/delimiter/utils.rb @@ -88,16 +88,24 @@ module Utils return 'good' end + def get_account_info + ESQuery.new(index: 'accounts').query_by_id(DELIMITER_ACCONUT) + end + def init_job_content(job_id) es = ESQuery.new job = es.query_by_id(job_id) raise "es query job id: #{job_id} failed!" unless job - job['bad_job_id'] = job_id + account_info = get_account_info + raise "query #{DELIMITER_ACCONUT} account info failed!" unless account_info + job['suite'] = 'bisect' + job['my_uuid'] = account_info['my_uuid'] + job['my_name'] = account_info['my_name'] + job['my_email'] = account_info['my_email'] + job['bad_job_id'] = job_id - job.delete('id') - job.delete('uuid') job.delete('error_ids') job.delete('start_time') job.delete('end_time') -- 2.23.0

1 0

[PATCH compass-ci] delimiter: add common account info to bisect job
by Cao Xueliang 28 Nov '20

28 Nov '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/delimiter/utils.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/delimiter/utils.rb b/src/delimiter/utils.rb index 679c8d9..2be99b5 100644 --- a/src/delimiter/utils.rb +++ b/src/delimiter/utils.rb @@ -88,16 +88,24 @@ module Utils return 'good' end + def get_account_info + ESQuery.new(index: 'accounts').query_by_id('compass-ci(a)qq.com') + end + def init_job_content(job_id) es = ESQuery.new job = es.query_by_id(job_id) raise "es query job id: #{job_id} failed!" unless job + account_info = get_account_info + raise "query compass-ci(a)qq.com account info failed!" unless account_info + job['bad_job_id'] = job_id job['suite'] = 'bisect' + job['my_email'] = account_info['my_email'] + job['my_name'] = account_info['my_name'] + job['my_uuid'] = account_info['my_uuid'] - job.delete('id') - job.delete('uuid') job.delete('error_ids') job.delete('start_time') job.delete('end_time') -- 2.23.0

2 2

[PATCH v2 compass-ci 2/2] lib/compare_matrixes.rb: refactor format optimization
by Lu Kaiyi 28 Nov '20

28 Nov '20

reduce unnecessary indent to simplify code Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- lib/compare_matrixes.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/compare_matrixes.rb b/lib/compare_matrixes.rb index d8112e9..7a9870a 100644 --- a/lib/compare_matrixes.rb +++ b/lib/compare_matrixes.rb @@ -177,7 +177,7 @@ def get_matrixes_values(matrixes_list, options) end def remove_unchanged_field(matrixes_values) - # remove unchanged field from matrixes valus and remove :changed key + # remove unchanged field from matrixes values and remove :changed key # matrixes_values.each_key do |success| matrixes_values[success].delete_if do |field| @@ -316,21 +316,20 @@ def get_decimal_length(number, length) end def get_suitable_number_str(number, length, format_pattern) - # if number string length can't < target length, + # if number string length is no less than target length, # transform number string to scientific notation string format_str = format(format_pattern, number) return format_str if format_str.length <= length decimal_length = get_decimal_length(number, length) - unless decimal_length.negative? - scientific_str = format("%.#{decimal_length}e", number).sub('e+0', 'e+').sub('e-0', 'e-') - lack_length = length - scientific_str.length - unless lack_length.negative? - return scientific_str + ' ' * lack_length - end - end - format_str + return format_str if decimal_length.negative? + + scientific_str = format("%.#{decimal_length}e", number).sub('e+0', 'e+').sub('e-0', 'e-') + lack_length = length - scientific_str.length + return format_str if lack_length.negative? + + return scientific_str + ' ' * lack_length end # Colorize -- 2.23.0

1 0

[PATCH v2 compass-ci 1/2] lib/compare_matrixes.rb: refactor performance optimization
by Lu Kaiyi 28 Nov '20

28 Nov '20

Signed-off-by: Lu Kaiyi <2392863668(a)qq.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 dd9b86e..d8112e9 100644 --- a/lib/compare_matrixes.rb +++ b/lib/compare_matrixes.rb @@ -34,7 +34,7 @@ end def fill_missing_with_zeros(value_list, matrix_size) value_list ||= [0] * matrix_size - value_list << 0 while value_list.size < matrix_size + value_list.concat([0] * (matrix_size - value_list.size)) value_list end -- 2.23.0

1 0

[PATCH compass-ci] lib/compare_matrixes.rb: refactor format optimization
by Lu Kaiyi 28 Nov '20

28 Nov '20

reduce unnecessary indent to simplify code Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- lib/compare_matrixes.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/compare_matrixes.rb b/lib/compare_matrixes.rb index d8112e9..23c7931 100644 --- a/lib/compare_matrixes.rb +++ b/lib/compare_matrixes.rb @@ -177,7 +177,7 @@ def get_matrixes_values(matrixes_list, options) end def remove_unchanged_field(matrixes_values) - # remove unchanged field from matrixes valus and remove :changed key + # remove unchanged field from matrixes values and remove :changed key # matrixes_values.each_key do |success| matrixes_values[success].delete_if do |field| @@ -316,21 +316,20 @@ def get_decimal_length(number, length) end def get_suitable_number_str(number, length, format_pattern) - # if number string length can't < target length, + # if number string length no less than target length, # transform number string to scientific notation string format_str = format(format_pattern, number) return format_str if format_str.length <= length decimal_length = get_decimal_length(number, length) - unless decimal_length.negative? - scientific_str = format("%.#{decimal_length}e", number).sub('e+0', 'e+').sub('e-0', 'e-') - lack_length = length - scientific_str.length - unless lack_length.negative? - return scientific_str + ' ' * lack_length - end - end - format_str + return format_str if decimal_length.negative? + + scientific_str = format("%.#{decimal_length}e", number).sub('e+0', 'e+').sub('e-0', 'e-') + lack_length = length - scientific_str.length + return format_str if lack_length.negative? + + return scientific_str + ' ' * lack_length end # Colorize -- 2.23.0

2 1

[PATCH lkp-tests] spec/submit_spec.rb: update submit_job
by Hu Xuejiao 28 Nov '20

28 Nov '20

[why] Originally submit_job is too complicated, it need to be simplified. Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- spec/submit_spec.rb | 55 +++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/spec/submit_spec.rb b/spec/submit_spec.rb index 4096cb73..e2361b13 100644 --- a/spec/submit_spec.rb +++ b/spec/submit_spec.rb @@ -20,40 +20,27 @@ def traverse_file(output_dir) end end -def submit_job(submit_item) - submit_yaml_path = File.join("#{LKP_SRC}/spec/submit", submit_item) - Dir.glob("#{submit_yaml_path}/*.yaml").each do |yaml_file| - output_dir = File.join(submit_yaml_path, File.basename(yaml_file, '.yaml')) - submit_cmd = [ - "#{LKP_SRC}/sbin/submit", - '-o', output_dir, - '-s', 'lab: spec_lab', - '-s', 'testbox: vm-2p8g--spec_submit', - yaml_file - ] - system(*submit_cmd) - traverse_file(output_dir) +def submit_job() + submit_path = "#{LKP_SRC}/spec/submit" + Dir.foreach(submit_path) do |sub| + next if sub == '.' || sub == '..' + + path = "#{submit_path}/#{sub}" + if File.directory?(path) + Dir.glob("#{path}/*.yaml").each do |yaml_file| + output_dir = File.join(path, File.basename(yaml_file, '.yaml')) + submit_cmd = [ + "#{LKP_SRC}/sbin/submit", + '-o', output_dir, + '-s', 'lab: spec_lab', + '-s', 'testbox: vm-2p8g--spec_submit', + yaml_file + ] + system(*submit_cmd) + traverse_file(output_dir) + end + end end end -describe 'submit job spec' do - it 'link jobs spec' do - submit_job('link_jobs') - end - - it 'link matrix' do - submit_job('matrix') - end - - it 'separate yaml spec' do - submit_job('separate_yaml') - end - - it 'job on fail' do - submit_job('job_on_fail') - end - - it 'merge yaml' do - submit_job('merge_yaml') - end -end +submit_job -- 2.23.0

2 1

[PATCH lkp-tests] submit: fix can not set queue
by Wei Jihui 28 Nov '20

28 Nov '20

[why] it can not set my queue when submit with --my-queue, because user maybe set tbox at config yaml, not using command lines [how] each_jobs will load all config yaml, so move set queue under it. Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- sbin/submit | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sbin/submit b/sbin/submit index 23518eb0..cc2d940c 100755 --- a/sbin/submit +++ b/sbin/submit @@ -99,10 +99,6 @@ def find_jobfile(jobfile) exit 1 end -def add_my_queue(job) - job['queue'] = "#{job['tbox_group']}~#{ENV['USER']}" -end - ARGV.each do |jobfile| jobfile = find_jobfile(jobfile) jobs = Job2sh.new @@ -112,12 +108,13 @@ ARGV.each do |jobfile| jobs[:expand_params] = true jobs['testbox'] = opt_set_key_value['testbox'] if opt_set_key_value['testbox'] jobs['tbox_group'] = tbox_group(jobs['testbox']) if jobs.include?('testbox') - add_my_queue(jobs) if opt_my_queue jobs['node_roles'] ||= 'server client' if jobs['cluster'] jobs.each_jobs do |job| raise 'Please configure SCHED_HOST' unless job['SCHED_HOST'] raise 'Please configure SCHED_PORT' unless job['SCHED_PORT'] + job['queue'] = "#{jobs['tbox_group']}~#{ENV['USER']}" if opt_my_queue + job.add_pp job.add_monitors job.add_define_files if opt_auto_define_files -- 2.23.0

1 0

[PATCH compass-ci] lib/compare_matrixes.rb: refactor performance optimization
by Lu Kaiyi 28 Nov '20

28 Nov '20

Signed-off-by: Lu Kaiyi <2392863668(a)qq.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 dd9b86e..d8112e9 100644 --- a/lib/compare_matrixes.rb +++ b/lib/compare_matrixes.rb @@ -34,7 +34,7 @@ end def fill_missing_with_zeros(value_list, matrix_size) value_list ||= [0] * matrix_size - value_list << 0 while value_list.size < matrix_size + value_list.concat([0] * (matrix_size - value_list.size)) value_list end -- 2.23.0

1 0

[PATCH compass-ci] web_backend.rb: fix that lost some args
by Li Yuanchao 28 Nov '20

28 Nov '20

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- src/lib/web_backend.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/web_backend.rb b/src/lib/web_backend.rb index 4846dc5..e548d61 100644 --- a/src/lib/web_backend.rb +++ b/src/lib/web_backend.rb @@ -148,7 +148,7 @@ def get_es_must(params) must end -def _get_groups_matrices(query, dimension) +def do_get_groups_matrices(query, dimension, total, size, from) result = es_query(query) matrices, suites_list = combine_group_query_data(result, dimension) while matrices.empty? @@ -181,7 +181,7 @@ def get_groups_matrices(conditions, dimension, must, size, from) }] } - matrices, suites_list = _get_groups_matrices(query, dimension) + do_get_groups_matrices(query, dimension, total, size, from) end def get_compare_body(params) -- 2.23.0

2 2

2024

2023

2022

2021

2020

Compass-ci November 2020