February 2021 - Compass-ci - mailweb.openeuler.org

[PATCH v5 compass-ci 1/3] mail-robot: fix bug for parsing email
by Luan Shengde 03 Feb '21

03 Feb '21

[why] for non-gitee repos: we may sometimes can not get the author email from the http request feedback when checking the commit. users may still receive a fail email even if they send 'apply account' email correctly. [how] both gitee and non-gitee will clone the repo tree and check the commit: - check commit id exists - check commit author matches the email Signed-off-by: Luan Shengde <shdluan(a)163.com> --- .../lib/parse-apply-account-email.rb | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/container/mail-robot/lib/parse-apply-account-email.rb b/container/mail-robot/lib/parse-apply-account-email.rb index a41a89a..c7fe9ea 100755 --- a/container/mail-robot/lib/parse-apply-account-email.rb +++ b/container/mail-robot/lib/parse-apply-account-email.rb @@ -6,7 +6,6 @@ require 'json' require 'mail' require 'rest-client' -require_relative 'gitee-commit-url-check' # used to parse mail_content for my_commit_url and my_ssh_pubkey # be called by AssignAccount when it needs to extract required data: @@ -91,29 +90,33 @@ class ParseApplyAccountEmail end def commit_url_availability(url, base_url) - hub_name = url.split('/')[2] - - # it requires authentication when sending request to get the commit information - # clone the repo and then validate the commit for the email address - if hub_name.eql? 'gitee.com' - gitee_commit(url, base_url) - else - non_gitee_commit(url) - end - end + repo_url = [base_url, 'git'].join('.') + repo_dir = repo_url.split('/')[-1] + commit_id = url.split('/')[-1] + + %x(/usr/bin/git -C /tmp clone --bare #{repo_url} #{repo_dir}) + + # get all commit IDs and check commit id exists + repo_commits = %x(/usr/bin/git -C /tmp/#{repo_dir} log --pretty=format:'%H').split(/\n/) + check_commit_exist(commit_id, repo_commits) - def gitee_commit(url, base_url) - my_gitee_commit = GiteeCommitUrlCheck.new(@my_info, url, base_url) - my_gitee_commit.gitee_commit_check + # get the auther's email for the commit + author_email = %x(/usr/bin/git -C /tmp/#{repo_dir} show -s --format=%aE #{commit_id}).chomp + check_commit_email(author_email) + + FileUtils.rm_rf "/tmp/#{repo_dir}" end - def non_gitee_commit(url) - url_fdback = RestClient.get(url).body - email_index = url_fdback.index @my_info['my_email'] + def check_commit_exist(commit_id, repo_commits) + return if repo_commits.include? commit_id.chomp + + raise 'NO_COMMIT_ID' + end - return unless email_index.nil? + def check_commit_email(author_email) + return if author_email.eql? @my_info['my_email'].chomp - raise 'COMMIT_URL_NOT_AVAILABLE' + raise 'COMMIT_AUTHOR_ERROR' end def parse_pub_key -- 2.23.0

1 0

[PATCH compass-ci] sparrow/4-docker: delete duplicate functions code
by Liu Yinsi 03 Feb '21

03 Feb '21

git show d265997c: buildall: avoid repeated building containers in sparrow git show 67ad8b6e: sparrow/4-docker/buildall: prevent duplicate build [why] delete one of the preceding patches because the two patches have the same functions. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/4-docker/buildall | 2 -- 1 file changed, 2 deletions(-) diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index 727abb9..c838f86 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -25,7 +25,6 @@ do_one() local container=$1 local container_name=$(basename $container) lockfile-create -q --use-pid --retry 100 --lock-name "$container_name".lock - echo "$started_containers" | grep -w -q "$container_name" && return 0 log_info "start build $container." mkdir $tmpdir/$container_name 2>/dev/null && @@ -42,7 +41,6 @@ do_one() [ "$container_name" == 'initrd-lkp' ] && ./run ) log_info "finish build $container." - started_containers+="$container_name" lockfile-remove --lock-name "$container_name".lock } -- 2.23.0

2 1

[PATCH compass-ci] sparrow/4-docker: move confusing log_info()
by Liu Yinsi 03 Feb '21

03 Feb '21

[how] before: whether build container or not, all will call log_info(): "start/finish build $container" after: only when actually build container, will call log_info(): "start/finish build $container" [why] if not build container, but echo "start build $container", it's very confusing, mistakenly think that repeatedly build container. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/4-docker/buildall | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index c838f86..c676e6f 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -26,21 +26,24 @@ do_one() local container_name=$(basename $container) lockfile-create -q --use-pid --retry 100 --lock-name "$container_name".lock - log_info "start build $container." mkdir $tmpdir/$container_name 2>/dev/null && ( cd "$container" [ "$container_name" == 'ssh-r' ] && exit docker images | grep -wq "$container_name" if [ "$?" != 0 ] || [ "$action" != "run-only" ]; then + + log_info "start build $container." + [ -x build ] && ./build [ -x install ] && ./install + + log_info "finish build $container." fi [ -x first-run ] && ./first-run [ -x start ] && ./start [ "$container_name" == 'initrd-lkp' ] && ./run ) - log_info "finish build $container." lockfile-remove --lock-name "$container_name".lock } -- 2.23.0

2 1

[PATCH lkp-tests] iso2rootfs: add new config_rootfs field: enable_repos
by Yu Chuan 03 Feb '21

03 Feb '21

[Why] Not all sources of one repo file are enabled, sometimes we need to enable all sources to install the specified pkg. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- jobs/iso2rootfs.yaml | 1 + tests/iso2rootfs | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index 2a6455245584..55c4345fad94 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -32,6 +32,7 @@ iso2rootfs: # - dns: will config /etc/resolv.conf. # - no_selinux: will disable selinux in /etc/selinux/config. # - no_fstab: will comment all line in /etc/fstab. + # - enable_repos: will enable all repo file of result rootfs. config_rootfs: ## install pkgs for result rootfs diff --git a/tests/iso2rootfs b/tests/iso2rootfs index 65a1935b7f49..06c8565110ab 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -393,11 +393,23 @@ install_pkgs_for_rootfs() fi } +enable_repos() +{ + echo "${config_rootfs}" | grep -qw 'enable_repos' || return 0 + + ls ${ROOTFS_DES_DIR}/etc/yum.repos.d/*.repo > /dev/null 2>&1 && { + sed -i 's/^enabled=0$/enabled=1/g' ${ROOTFS_DES_DIR}/etc/yum.repos.d/*.repo + } + + return 0 +} + config_rootfs() { config_dns_resolver disable_selinux disable_fstab + enable_repos install_pkgs_for_rootfs } -- 2.23.0

2 2

[PATCH v2 compass-ci 2/2] sbin/build-my-info: optimize
by Luan Shengde 03 Feb '21

03 Feb '21

optimize options: add option -t: generate new my_token add option -h: output help message add search my_info from ES and update my_info before store it. Signed-off-by: Luan Shengde <shdluan(a)163.com> --- sbin/build-my-info.rb | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/sbin/build-my-info.rb b/sbin/build-my-info.rb index fd75f51..dbe093d 100755 --- a/sbin/build-my-info.rb +++ b/sbin/build-my-info.rb @@ -8,26 +8,48 @@ require_relative '../lib/build_my_info_client' require 'optparse' option = { - my_name: `git config --global user.name`.chomp, - my_email: `git config --global user.email`.chomp, - lab: `awk '/^lab:\s/ {print $2; exit}' /etc/compass-ci/defaults/*.yaml`.chomp + 'my_email' => `git config --global user.email`.chomp, + 'my_name' => `git config --global user.name`.chomp, + 'lab' => `awk '/^lab:\s/ {print $2; exit}' /etc/compass-ci/defaults/*.yaml`.chomp } options = OptionParser.new do |opts| + opts.banner = "Usage: build-my-info [-e email] [-n name] [-l lab] [-t]\n" + + opts.separator '' + opts.separator 'options:' + opts.on('-e email', 'my_email') do |email| - option[:my_email] = email + option['my_email'] = email end opts.on('-n name', 'my_name') do |name| - option[:my_name] = name + option['my_name'] = name end opts.on('-l lab', 'lab') do |lab| - option[:lab] = lab + option['lab'] = lab + end + + opts.on('-t', 'my_token') do + option['my_token'] = %x(uuidgen).chomp + end + + opts.on_tail('-h', 'show this message') do + puts opts + exit end end options.parse! -build_my_info = BuildMyInfo.new(option[:my_email], option[:my_name], option[:lab]) -build_my_info.config_my_info +def build_my_info(option) + build_my_info = BuildMyInfo.new(option['my_email']) + info_es = build_my_info.search_my_info + info_es.update option + info_es['my_token'] = %x(uuidgen).chomp if info_es['my_token'].nil? + + build_my_info.config_my_info(info_es) +end + +build_my_info(option) -- 2.23.0

1 0

[PATCH v2 compass-ci 1/2] lib/build_my_info_client: optimize
by Luan Shengde 03 Feb '21

03 Feb '21

cancel modify my_info enable user invoke each method alone. add search method: my_info Signed-off-by: Luan Shengde <shdluan(a)163.com> --- lib/build_my_info_client.rb | 53 +++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 29 deletions(-) mode change 100644 => 100755 lib/build_my_info_client.rb diff --git a/lib/build_my_info_client.rb b/lib/build_my_info_client.rb old mode 100644 new mode 100755 index c946bec..6d35e97 --- a/lib/build_my_info_client.rb +++ b/lib/build_my_info_client.rb @@ -18,60 +18,55 @@ require_relative '../lib/es_client' # usage: # require_relative 'build_my_info_client' # -# build_my_info = BuildMyInfo.new(email, name, lab) -# build_my_info.config_my_info +# build_my_info = BuildMyInfo.new(my_info['email']) +# build_my_info.config_my_info(my_info) class BuildMyInfo - def initialize(my_email, my_name, lab, my_token = nil) - @lab = lab || 'nolab' - @my_token = my_token || %x(uuidgen).chomp - @my_info = { - 'my_email' => my_email, - 'my_name' => my_name, - 'my_token' => @my_token, - 'my_login_name' => nil, - 'my_commit_url' => nil, - 'my_ssh_pubkey' => [] - } + def initialize(my_email) + @my_email = my_email + @es = ESClient.new(index: 'accounts') end - def config_default_yaml + def search_my_info + @es.query_by_id(@my_email) || {} + end + + def store_account_info(my_info) + @es.put_source_by_id(@my_email, my_info) + end + + def config_default_yaml(my_info) default_yaml_dir = "#{ENV['HOME']}/.config/compass-ci/defaults" FileUtils.mkdir_p default_yaml_dir unless File.directory? default_yaml_dir default_yaml_file = "#{default_yaml_dir}/account.yaml" FileUtils.touch(default_yaml_file) unless File.exist? default_yaml_file default_yaml_info = YAML.load_file(default_yaml_file) || {} - default_yaml_info['my_email'] = @my_info['my_email'] - default_yaml_info['my_name'] = @my_info['my_name'] - default_yaml_info['lab'] = @lab + default_yaml_info['my_email'] = my_info['my_email'] + default_yaml_info['my_name'] = my_info['my_name'] + default_yaml_info['lab'] = my_info['lab'] File.open(default_yaml_file, 'w') do |f| f.puts default_yaml_info.to_yaml end end - def config_lab_yaml + def config_lab_yaml(my_info) lab_yaml_dir = "#{ENV['HOME']}/.config/compass-ci/include/lab" FileUtils.mkdir_p lab_yaml_dir unless File.directory? lab_yaml_dir - lab_yaml_file = "#{lab_yaml_dir}/#{(a)lab}.yaml" + lab_yaml_file = "#{lab_yaml_dir}/#{my_info['lab']}.yaml" FileUtils.touch(lab_yaml_file) unless File.exist? lab_yaml_file lab_yaml_info = YAML.load_file(lab_yaml_file) || {} - lab_yaml_info['my_token'] = @my_info['my_token'] + lab_yaml_info['my_token'] = my_info['my_token'] File.open(lab_yaml_file, 'w') do |f| f.puts lab_yaml_info.to_yaml end end - def store_account_info - es = ESClient.new(index: 'accounts') - es.put_source_by_id(@my_info['my_email'], @my_info) - end - - def config_my_info - config_default_yaml - config_lab_yaml - store_account_info + def config_my_info(my_info) + store_account_info(my_info) + config_default_yaml(my_info) + config_lab_yaml(my_info) end end -- 2.23.0

1 0

[PATCH v2 lkp-tests] tests/monitor-job: fix rm gem sources
by Wei Jihui 03 Feb '21

03 Feb '21

gem sources -c can not remove sources, use -r Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- tests/monitor-job | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/monitor-job b/tests/monitor-job index 5fd2d73c..0f495ae2 100755 --- a/tests/monitor-job +++ b/tests/monitor-job @@ -18,7 +18,7 @@ set_scheduler_config() install_gem_pkgs() { - gem sources -c -a https://gems.ruby-china.com/ + gem sources -r http://rubygems.org -a https://gems.ruby-china.com/ gem install activesupport git rest-client elasticsearch } -- 2.23.0

1 0

[PATCH lkp-tests] tests/monitor-job: fix rm gem sources
by Wei Jihui 03 Feb '21

03 Feb '21

gem sources -c can not remove sources, use -r Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- tests/monitor-job | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/monitor-job b/tests/monitor-job index 5fd2d73c..4a5d8562 100755 --- a/tests/monitor-job +++ b/tests/monitor-job @@ -18,7 +18,8 @@ set_scheduler_config() install_gem_pkgs() { - gem sources -c -a https://gems.ruby-china.com/ + gem sources -r http://rubygems.org + gem sources -a https://gems.ruby-china.com/ gem install activesupport git rest-client elasticsearch } -- 2.23.0

2 1

[PATCH compass-ci] delimiter: bisect run script catch the exceptions and exit -1
by Cao Xueliang 02 Feb '21

02 Feb '21

Git bisect tag the commit good/bad/skip according to the bisect run script exit code. Exit code 0 is good, 125 is skip, the others between 1 and 127 is bad. When the ruby script raise a exception exit code is 1, git bisect will tag the commit to bad, but we should abort the bisect process. So we catch the exceptions and exit -1 in bisect run script. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/delimiter/find-commit/bisect_run_script.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/delimiter/find-commit/bisect_run_script.rb b/src/delimiter/find-commit/bisect_run_script.rb index 4877d79..8cdf675 100755 --- a/src/delimiter/find-commit/bisect_run_script.rb +++ b/src/delimiter/find-commit/bisect_run_script.rb @@ -36,9 +36,13 @@ class GitBisectRun end end -job_id = ARGV[0] -error_id = ARGV[1] -work_dir = ARGV[2] - -run = GitBisectRun.new job_id, error_id, work_dir -run.git_bisect +begin + job_id = ARGV[0] + error_id = ARGV[1] + work_dir = ARGV[2] + + run = GitBisectRun.new job_id, error_id, work_dir + run.git_bisect +rescue + exit -1 +end -- 2.23.0

1 0

[PATCH v2 lkp-tests] stats: add stats script for dockerfile os migrating
by Bai Jing 02 Feb '21

02 Feb '21

[input] ^[[91mError: Unable to find a match: supervisor ^[[91m/bin/sh: tar: command not found [output] sh.command-not-found.tar: 1 yum.error.Unable-to-find-a-match.supervisor: 1 Signed-off-by: Bai Jing <799286817(a)qq.com> --- stats/openeuler_docker | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/stats/openeuler_docker b/stats/openeuler_docker index e31934573..95e2a272b 100755 --- a/stats/openeuler_docker +++ b/stats/openeuler_docker @@ -2,7 +2,12 @@ while (line = STDIN.gets) line.chomp! - next unless line =~ /build.fail/ - - puts line + case line + when /Error: Unable to find a match: (.+)/ + $1.split.each do |repo| + puts "yum.error.Unable-to-find-a-match.#{repo}: 1" + end + when /\/bin\/sh: (.+): command not found/ + puts "sh.command-not-found.#{$1}: 1" + end end -- 2.23.0

1 0