- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] lib/error_messages.rb: add obtain_error_messages_by_errorid function
by Lin Jiaxin 03 Dec '20

03 Dec '20

Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- lib/error_messages.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/error_messages.rb b/lib/error_messages.rb index 7bf3aa8..3a74d29 100644 --- a/lib/error_messages.rb +++ b/lib/error_messages.rb @@ -3,10 +3,13 @@ # frozen_string_literal: true require 'set' +require_relative "#{ENV['LKP_SRC']}/lib/common" # usage: # foo = ErrorMessages.new(build-pkg) # build-pkg is a file that includes errors generated by make +# errorid_array = foo.obtain_error_messages_by_errorid(errorid) +# errorid_array includes all error_messages that error same as errorid # error_messages_hash = foo.obtain_error_messages # error_messages_hash.each { |k,v| puts k; puts; v.each {|m| puts m } } # output: @@ -37,6 +40,17 @@ class ErrorMessages return @error_messages end + def obtain_error_messages_by_errorid(errorid) + error_messages_by_errorid = [] + error_messages = obtain_error_messages + error_messages.each do | k, v | + if ("build-pkg." + build_pkg_error_id(k)) == errorid + error_messages_by_errorid << v + end + end + error_messages_by_errorid + end + private def extract_error_message(line) -- 2.23.0

1 0

[PATCH compass-ci] user-client/maintain: add '|' for multi args
by Liu Yinsi 03 Dec '20

03 Dec '20

multi args changed from os os_arch os_version to os|os_arch|os_version, and if use os|os_arch|os_version, job yaml must as the first parameter. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- .../maintain/walk-os-test/walk-os-iperf-test | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/user-client/maintain/walk-os-test/walk-os-iperf-test b/user-client/maintain/walk-os-test/walk-os-iperf-test index ed97999..9f75516 100755 --- a/user-client/maintain/walk-os-test/walk-os-iperf-test +++ b/user-client/maintain/walk-os-test/walk-os-iperf-test @@ -101,8 +101,8 @@ def run_qemu end end -def submit_job(os_str, os_mount) - `submit --my-queue 'os os_arch os_version=#{os_str}' 'testbox=#{TESTBOX}' 'os_mount=#{os_mount}' #{TEST_YAML}` +def submit_job(os_args, os_mount) + `submit #{TEST_YAML} --my-queue 'os|os_arch|os_version=#{os_args}' testbox=#{TESTBOX} os_mount=#{os_mount}` end def traversal_os_mount @@ -113,12 +113,13 @@ end def traversal_test_os(os_mount) TEST_OS.each do |os_str| - test_rootfs(os_str, os_mount) + os_args = os_str.gsub(' ', '|') + test_rootfs(os_args, os_mount) end end -def test_rootfs(os_str, os_mount) - message = submit_job(os_str, os_mount).chomp +def test_rootfs(os_args, os_mount) + message = submit_job(os_args, os_mount).chomp job_id = message.split('=')[1] run_qemu @@ -128,7 +129,7 @@ def test_rootfs(os_str, os_mount) find_by_id(job_id) end - report_all = job_id.split(', ') + os_str.split + os_mount.split + job_result + report_all = job_id.split(', ') + os_args.split + os_mount.split + job_result write_report(report_all) end -- 2.23.0

1 0

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

03 Dec '20

[why] Originally submit_job is too complicated, it needs to be simplified. Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- spec/submit_spec.rb | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/spec/submit_spec.rb b/spec/submit_spec.rb index 4096cb73..75ad9798 100644 --- a/spec/submit_spec.rb +++ b/spec/submit_spec.rb @@ -16,44 +16,22 @@ end def traverse_file(output_dir) Dir.glob("#{output_dir}/*.yaml").each do |yaml_file| - stable_yaml_file(yaml_file) + stable_yaml_file(yaml_file) unless File.basename(yaml_file) == 'job.yaml' 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')) +def submit_job() + Dir.glob("#{LKP_SRC}/spec/submit/*").each do |dir| submit_cmd = [ "#{LKP_SRC}/sbin/submit", '-o', output_dir, '-s', 'lab: spec_lab', '-s', 'testbox: vm-2p8g--spec_submit', - yaml_file + "#{dir}/job.yaml" ] system(*submit_cmd) - traverse_file(output_dir) + traverse_file(out_dir) 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

1 0

[PATCH compass-ci] src/scheduler: delete job2sh field in job.yaml
by Zhang Yu 03 Dec '20

03 Dec '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- src/scheduler/jobfile_operate.cr | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/scheduler/jobfile_operate.cr b/src/scheduler/jobfile_operate.cr index 98bf011..82ed885 100644 --- a/src/scheduler/jobfile_operate.cr +++ b/src/scheduler/jobfile_operate.cr @@ -80,16 +80,13 @@ module Jobfile::Operate job_content = job_content.as_h # put job2sh in an array - if job_content.has_key?("job2sh") - tmp_job_sh_content = job_content["job2sh"] - - job_sh_array = [] of JSON::Any + job_sh_array = [] of JSON::Any + tmp_job_sh_content = job_content.delete("job2sh") + if tmp_job_sh_content tmp_job_sh_content.as_h.each do |_key, val| next if val == nil job_sh_array += val.as_a end - else - job_sh_array = [] of JSON::Any end # generate job.yaml -- 2.23.0

2 2

[PATCH v2 lkp-tests] tests/build-pkg: fix upload in container
by Wang Yong 03 Dec '20

03 Dec '20

docker can not use mount operation, so now use curl to upload build-pkg cgz file Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- tests/build-pkg | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/build-pkg b/tests/build-pkg index cde2f0edd..38d8bace9 100755 --- a/tests/build-pkg +++ b/tests/build-pkg @@ -18,6 +18,8 @@ ## See: https://wiki.archlinux.org/index.php/Makepkg . $LKP_SRC/lib/debug.sh +. $LKP_SRC/lib/env.sh +. $LKP_SRC/distro/common check_vars() { @@ -29,6 +31,13 @@ check_vars() [ -n "$os_mount" ] || die "os_mount is empty" } +mount_pkg_mnt() +{ + [ -n "$LKP_SERVER" ] && { + mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" + } +} + mount_dest() { # the same image is mounted to cifs and nfs, the generated cgz files @@ -39,9 +48,7 @@ mount_dest() PKG_MNT=/initrd/build-pkg mkdir -p "$PKG_MNT" - [ -n "$LKP_SERVER" ] && { - mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" - } + is_docker || mount_pkg_mnt } get_pkgfile() @@ -139,10 +146,15 @@ build_source_pkg() replace_tar_source cgz_name="$PKG_MNT/${pack_to}/${pkgname}/${upstream_commit}.cgz" + PACMAN=true BUILDDIR=$TMP CARCH=$os_arch PKGEXT=.cgz CGZDEST="$cgz_name" \ $LKP_SRC/sbin/makepkg -A --check --skippgpcheck --config $LKP_SRC/etc/makepkg.conf 2>&1 - [ "$?" == 0 ] && create_softlink + [ "$?" == 0 ] || exit 1 + create_softlink + + is_docker || exit 0 + upload_to_target_dir ${PKG_MNT}/${pack_to}/${pkgname} } check_vars -- 2.23.0

2 1

[PATCH v3 compass-ci] sbin/mail-job: add help option
by Lu Weitao 03 Dec '20

03 Dec '20

[Why] It's more friendly to user that command-line tool have a help option. Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- sbin/mail-job | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/sbin/mail-job b/sbin/mail-job index 954c149..5dc68c8 100755 --- a/sbin/mail-job +++ b/sbin/mail-job @@ -3,11 +3,28 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. # frozen_string_literal: true -# Usage: -# mail-job job_id - +require 'optparse' require_relative '../lib/mail_job_result.rb' -job_id = ARGV[0] +# mail job results to job submitter +# require the job had submitted job.yaml include email + +opt_parser = OptionParser.new do |opts| + opts.banner = 'Usage: mail-job job_id' + opts.separator 'eg: mail-job crystal.123012' + opts.separator '' + opts.separator 'options:' + + opts.on_tail('-h', '--help', 'show this message') do + puts opts + exit + end +end + +argv = ARGV.empty? ? ['-h'] : ARGV + +opt_parser.parse!(argv) + +job_id = argv[0] mail = MailJobResult.new(job_id) mail.send_mail -- 2.23.0

1 0

[PATCH compass-ci] container/conserver: change executable script
by Cui Yili 03 Dec '20

03 Dec '20

Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/conserver/build | 2 +- container/conserver/{conserver-head.cf => conserver.cf} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename container/conserver/{conserver-head.cf => conserver.cf} (100%) diff --git a/container/conserver/build b/container/conserver/build index 25c785c..0700c5e 100755 --- a/container/conserver/build +++ b/container/conserver/build @@ -2,6 +2,6 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. -sh generate_conserver || exit 1 +./generate_conserver.rb || exit 1 docker build -t conserver_server . diff --git a/container/conserver/conserver-head.cf b/container/conserver/conserver.cf similarity index 100% rename from container/conserver/conserver-head.cf rename to container/conserver/conserver.cf -- 2.23.0

1 0

[PATCH compass-ci] manual/如何申请测试机.md: change the borrow-1h.yaml to latest
by Zhang Yale 03 Dec '20

03 Dec '20

Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- ...257\267\346\265\213\350\257\225\346\234\272.md" | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git "a/doc/manual/\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" "b/doc/manual/\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" index d70136f..85d385d 100644 --- "a/doc/manual/\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" +++ "b/doc/manual/\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" @@ -209,14 +209,14 @@ suite: borrow testcase: borrow + pub_key: <%= + begin + File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp + rescue + nil + end + %> sshd: - pub_key: <%= - begin - File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp - rescue - nil - end - %> # sleep at the bottom sleep: 1h hi684@account-vm ~/lkp-tests/jobs% grep sleep: borrow-1h.yaml -- 2.23.0

2 2

[PATCH compass-ci 2/2] mail-robot: update start
by Luan Shengde 03 Dec '20

03 Dec '20

add MAILDIR to default yaml file avoid change start file if there is a new maildir. add ES_PORT Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/mail-robot/start | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/container/mail-robot/start b/container/mail-robot/start index 1c55dd3..f8078b6 100755 --- a/container/mail-robot/start +++ b/container/mail-robot/start @@ -14,10 +14,11 @@ names = Set.new %w[ SEND_MAIL_PORT SCHED_HTTPS_HOST SCHED_HTTPS_PORT + ES_PORT + MAILDIR ] defaults = relevant_defaults(names) -defaults['MAILDIR'] = '/srv/cci/Maildir/.compass-ci' env = docker_env(defaults) -- 2.23.0

1 0

[PATCH compass-ci 1/2] mail-robot: add check assigned account for email
by Luan Shengde 03 Dec '20

03 Dec '20

avoid multi accounts assignment for single email address [why] the mail-robot may assign a new account if user send 'apply account' email with the same email address. this is a big waste of account resource [how] when get the request for applying account, check whether the email already has an account before applying account. apply a new one if there is none return the old one if there is already one for the email. and update my_info if the email has new: my_name my_ssh_pubkey Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/mail-robot/lib/apply-account.rb | 37 +++++++++++++++++------ 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/container/mail-robot/lib/apply-account.rb b/container/mail-robot/lib/apply-account.rb index bf40429..24f41bc 100755 --- a/container/mail-robot/lib/apply-account.rb +++ b/container/mail-robot/lib/apply-account.rb @@ -12,6 +12,7 @@ require_relative 'apply-jumper-account' require_relative 'parse-apply-account-email' SEND_MAIL_PORT = ENV['SEND_MAIL_PORT'] || 49000 +ES_PORT = ENV['ES_PORT'] || 9200 # assign uuid/account for user # when mail-robot listened new email, and the email's subject @@ -51,6 +52,8 @@ class ApplyAccount @send_mail_host = %x(/sbin/ip route | awk '/default/ {print $3}').chomp @send_mail_port = SEND_MAIL_PORT @mail_content = mail_content + @es_host = @send_mail_host + @es_port = ES_PORT @my_info = {} end @@ -61,9 +64,8 @@ class ApplyAccount # firstly get my_email before execute parse_mail_content is needed @my_info['my_email'] = @mail_content.from[0] parse_mail_content - acct_info = apply_my_account - - @my_info['my_login_name'] = acct_info['my_login_name'] + my_account_es = check_account_es + apply_my_account(my_account_es) store_account_info send_mail('') @@ -82,15 +84,32 @@ class ApplyAccount @my_info.update parsed_email_info end - def apply_my_account - my_uuid = %x(uuidgen).chomp - - @my_info['my_uuid'] = my_uuid + def apply_my_account(my_account_es) + apply_info = {} + if my_account_es['found'] + apply_info.update my_account_es['_source'] + apply_info.update @my_info + @my_info.update apply_info + apply_info['is_update_account'] = true + else + my_uuid = %x(uuidgen).chomp + @my_info['my_uuid'] = my_uuid + apply_info.update @my_info + end + apply_new_account(apply_info, my_account_es) + end - apply_account = ApplyJumperAccount.new(@my_info) + def apply_new_account(apply_info, my_account_es) + apply_account = ApplyJumperAccount.new(apply_info) acct_info = apply_account.apply_jumper_account - return acct_info + @my_info['my_login_name'] = acct_info['my_login_name'] unless my_account_es['found'] + # return acct_info + end + + def check_account_es + my_account_info_str = %x(curl -XGET #{@es_host}:#{@es_port}/accounts/_doc/#{@my_info['my_email']}) + YAML.safe_load my_account_info_str end def store_account_info -- 2.23.0

1 0