- Compass-ci - mailweb.openeuler.org

[PATCH v3 compass-ci] sbin/build-my-info.rb: modify method of inputting variables
by Hu Xuejiao 06 Jan '21

06 Jan '21

Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- sbin/build-my-info.rb | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/sbin/build-my-info.rb b/sbin/build-my-info.rb index 40193af..cd824c6 100755 --- a/sbin/build-my-info.rb +++ b/sbin/build-my-info.rb @@ -3,16 +3,26 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. # frozen_string_literal: true -require 'io/console' require_relative '../lib/es_client' require_relative '../lib/build_my_info_client' +require 'optparse' -print 'email: ' -my_email = $stdin.echo = gets.chomp -print 'name: ' -my_name = $stdin.echo = gets.chomp -print 'lab: ' -lab = $stdin.echo = gets.chomp +option = {} +options= OptionParser.new do |opts| + opts.on('-e email', 'my_email') do |email| + option[:email] = email + end -build_my_info = BuildMyInfo.new(my_email, my_name, lab) + opts.on('-n name', 'my_name') do |name| + option[:name] = name + end + + opts.on('-l lab', 'lab') do |lab| + option[:lab] = lab + end +end + +options.parse! + +build_my_info = BuildMyInfo.new(option[:my_email], option[:my_name], option[:lab]) build_my_info.config_my_info -- 2.23.0

1 0

[PATCH lkp-tests] installer/debian: fix the exit problem when source this file
by Yu Chuan 06 Jan '21

06 Jan '21

[Why] The purpose of adding the last four lines is to remove useless warn logs, but it exits at the end. This will cause the process which source this script exit. [Addition] Related commit id: 16cef539c517d0e6bd3495a1e3079214a8b4bd24 Signed-off-by: Yu Chuan <13186087857(a)163.com> --- distro/installer/debian | 4 ---- 1 file changed, 4 deletions(-) diff --git a/distro/installer/debian b/distro/installer/debian index 3148ee3b2c2a..35b3209bd747 100755 --- a/distro/installer/debian +++ b/distro/installer/debian @@ -6,7 +6,3 @@ dpkg --add-architecture i386 && apt-get update apt-get -o Dpkg::Options::="--force-confdef" \ -o Dpkg::Options::="--force-confold" \ -y install $* >/tmp/apt-get_info 2>&1 - -ret_value=$? -grep -v "dpkg: warning: files list file for package '.*' missing;" /tmp/apt-get_info -exit $ret_value -- 2.23.0

1 0

[PATCH compass-ci 2/3] providers/docker: change the dir name bin to sbin
by Xiao Shenwei 06 Jan '21

06 Jan '21

Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/docker/{ => sbin}/bin/entrypoint.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename providers/docker/{ => sbin}/bin/entrypoint.sh (100%) diff --git a/providers/docker/bin/entrypoint.sh b/providers/docker/sbin/bin/entrypoint.sh similarity index 100% rename from providers/docker/bin/entrypoint.sh rename to providers/docker/sbin/bin/entrypoint.sh -- 2.23.0

1 1

[PATCH compass-ci] addsoftware: clean the runtime dir after modifying nfsroot
by Xu Xijian 06 Jan '21

06 Jan '21

When install a software into a nfsroot, some unwanted files will be added into runtime dir, so rm them to keep nfsroot clean. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- container/add-software/run | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/container/add-software/run b/container/add-software/run index 62d4eff..60e5e07 100755 --- a/container/add-software/run +++ b/container/add-software/run @@ -40,7 +40,11 @@ install_cmds=( --rm -v "$rootdir":/mnt/root addsoftware:auto - yum install -y --skip-broken --installroot=/mnt/root $packages + bash -c " + yum install -y --skip-broken --installroot=/mnt/root $packages + cd /mnt/root + rm -rf srv/* opt/* mnt/* media/* home/* lost+found/* dev/* proc/* run/* sys/* + " ) echo "rsync rootfs from $basever to $newver..." -- 2.23.0

1 0

[PATCH compass-ci 3/3] providers/docker: copy rootfs/addon/root/* to container
by Xiao Shenwei 06 Jan '21

06 Jan '21

Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/docker/sbin/entrypoint.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 providers/docker/sbin/entrypoint.sh diff --git a/providers/docker/sbin/entrypoint.sh b/providers/docker/sbin/entrypoint.sh new file mode 100755 index 0000000..9848b4f --- /dev/null +++ b/providers/docker/sbin/entrypoint.sh @@ -0,0 +1,7 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +cp -r /lkp/lkp/src/rootfs/addon/root/. /root +cp -r /lkp/lkp/src/rootfs/addon/usr/* /usr +sh /lkp/lkp/src/rootfs/addon/etc/init.d/lkp-bootstrap -- 2.23.0

1 0

[PATCH compass-ci 1/3] providers/docker: change the file path of entrypoint.sh
by Xiao Shenwei 06 Jan '21

06 Jan '21

[why] /root/bin the dir may be used by user to stores own file Thanks, Shenwei --- providers/docker/run.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/providers/docker/run.sh b/providers/docker/run.sh index 62a1f9f..d39b6cf 100755 --- a/providers/docker/run.sh +++ b/providers/docker/run.sh @@ -23,17 +23,18 @@ cmd=( docker run --rm -m $memory + --hostname $host --tmpfs /tmp:rw,exec,nosuid,nodev -e CCI_SRC=/c/compass-ci -v ${load_path}/lkp:/lkp - -v ${DIR}/bin:/root/bin:ro + -v ${DIR}/sbin:/root/sbin:ro -v $CCI_SRC:/c/compass-ci:ro -v /srv/git:/srv/git:ro -v /srv/result:/srv/result:ro -v ${busybox_path}:/usr/local/bin/busybox --oom-score-adj="-1000" ${docker_image} - /root/bin/entrypoint.sh + /root/sbin/entrypoint.sh ) "${cmd[@]}" -- 2.23.0

1 0

[PATCH lkp-tests] lib/job.rb: fix check key
by Wei Jihui 06 Jan '21

06 Jan '21

first check key starts with "#!", then check key matchs /^\w.*\|.*\w$/ Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/job.rb b/lib/job.rb index 35e0ceee..8346db87 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -288,7 +288,6 @@ class Job def multi_args(hash) jobs_array = [] hash.each { |key, value| - next unless key =~ /^\w.*\|.*\w$/ next unless key.is_a?(String) if key.start_with?('#! ') @@ -296,6 +295,8 @@ class Job next end + next unless key =~ /^\w.*\|.*\w$/ + key_array = key.split('|').map(&:strip) [value].flatten.each do |v| next unless v =~ /^\w.*\|.*\w$/ -- 2.23.0

1 0

[PATCH compass-ci] git_mirror.rb: fix that project name start with capital letter can't match
by Li Yuanchao 06 Jan '21

06 Jan '21

Some repositories' name start with capital letter, but upstream-repos all start with lower case letter. So such repository can't match git_repo when use webhook container. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index ce1dc9e..bd55b33 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -333,7 +333,7 @@ class MirrorMain git_repo = "#{project}/#{fork_name}" return git_repo if check_git_repo(git_repo, webhook_url) - git_repo = "#{project[0]}/#{project}/#{project}" + git_repo = "#{project[0].downcase}/#{project}/#{project}" return git_repo if check_git_repo(git_repo, webhook_url) puts "webhook: #{webhook_url} is not found!" -- 2.23.0

1 0

[PATCH compass-ci] sparrow: make gem install system wide
by Wu Fengguang 06 Jan '21

06 Jan '21

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- sparrow/0-package/common | 2 +- sparrow/5-build/overcommit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 57ab701..4a9da60 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. -gem install git activesupport rest-client cucumber json faye-websocket elasticsearch +gem install --no-user-install git activesupport rest-client cucumber json faye-websocket elasticsearch grep -q '^lkp:' /etc/passwd || useradd -u 1090 lkp grep -q '^mailer:' /etc/passwd || useradd -u 1144 mailer diff --git a/sparrow/5-build/overcommit b/sparrow/5-build/overcommit index e8add6f..af02d84 100755 --- a/sparrow/5-build/overcommit +++ b/sparrow/5-build/overcommit @@ -10,4 +10,4 @@ cd overcommit oc_build_out=$(gem build overcommit.gemspec | grep "overcommit-.*\.gem") -gem install "$oc_build_out" +gem install --no-user-install "$oc_build_out" -- 2.23.0

1 0

[PATCH v2 compass-ci] git_mirror.rb: fix rubocop warning
by Li Yuanchao 06 Jan '21

06 Jan '21

git_mirror.rb:352:35: W: Lint/UnusedMethodArgument: Unused method argument - parent_project. If it's necessary, use _ or _parent_project as an argument name to indicate that it won't be used. def handle_submodule(submodule, parent_project) ^^^^^^^^^^^^^^ git_mirror.rb:358:7: W: Lint/NonLocalExitFromIterator: Non-local exit from iterator, without return value. next, break, Array#find, Array#any?, etc. is preferred. return unless git_repo ^^^^^^ Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 7f265d9..ce1dc9e 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -349,13 +349,13 @@ class MirrorMain end end - def handle_submodule(submodule, parent_project) + def handle_submodule(submodule) submodule.each_line do |line| next unless line.include?('url = ') url = line.split(' = ')[1].chomp git_repo = url.split('://')[1] if url.include?('://') - return unless git_repo + break unless git_repo @git_info[git_repo] = { 'url' => url, 'git_repo' => git_repo, 'is_submodule' => true } fork_stat_init(git_repo) -- 2.23.0

1 0