- Compass-ci - mailweb.openeuler.org

[PATCH lkp-tests] fix(tests/*): change mount argument from nfs to cifs
by Wang Yong 15 Oct '20

15 Oct '20

change mount argument from nfs to cifs Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- tests/cci-depends | 2 +- tests/cci-makepkg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cci-depends b/tests/cci-depends index a3c14290..36923ea4 100755 --- a/tests/cci-depends +++ b/tests/cci-depends @@ -28,7 +28,7 @@ pack_arch=$os_arch . $LKP_SRC/distro/$DISTRO -mount $LKP_SERVER:$DEPS_MNT $DEPS_MNT || die "Failed to run mount" +mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr //$LKP_SERVER$DEPS_MNT $DEPS_MNT || die "Failed to run mount" umask 002 diff --git a/tests/cci-makepkg b/tests/cci-makepkg index 2ad53216..9d508262 100755 --- a/tests/cci-makepkg +++ b/tests/cci-makepkg @@ -34,7 +34,7 @@ pack_to=${os_mount}/${os}/${os_arch}/${os_version} cd $LKP_SRC/pkg/$benchmark || die "pkg is empty" [ -n "$LKP_SERVER" ] && { - mount $LKP_SERVER:$PKG_MNT $PKG_MNT || die "Failed to run mount" + mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" } get_pkg_info() -- 2.23.0

3 4

[PATCH v3 compass-ci 2/2] container/assign-account: answerback-email.rb
by Luan Shengde 15 Oct '20

15 Oct '20

user email_addr,pub_key as parameter for answerback-email tool Usage: ./answerback-email.rb email_addr [pub_key] add pub_key if needed Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/assign-account/answerback-email.rb | 80 ++++++-------------- 1 file changed, 22 insertions(+), 58 deletions(-) diff --git a/container/assign-account/answerback-email.rb b/container/assign-account/answerback-email.rb index b5283ba..7ee4e3c 100755 --- a/container/assign-account/answerback-email.rb +++ b/container/assign-account/answerback-email.rb @@ -34,34 +34,40 @@ the returned data for account_info like: "jumper_ip" => "10.10.10.10", "jumper_port" => "10000" } + +Usage: ruby answerback-email.rb email_addr pub_key + =end require 'json' require 'mail' require 'set' -require_relative '../defconfig.rb' +require_relative '../defconfig' names = Set.new %w[ - JUMPER_IP + JUMPER_HOST JUMPER_PORT CRYSTAL_INTRANET SEND_MAIL_PORT ] +# xx --email xxx --login --ssh-pubkey xxx --raw-email email-file +# samba mount +# ssh logshn (huawei, ) (install pubkey / send password) + defaults = relevant_defaults(names) -JUMPER_IP = defaults['JUMPER_IP'] +JUMPER_HOST = defaults['JUMPER_HOST'] JUMPER_PORT = defaults['JUMPER_PORT'] CRYSTAL_INTRANET = defaults['CRYSTAL_INTRANET'] SEND_MAIL_PORT = defaults['SEND_MAIL_PORT'] -def build_message(email, message_id, infos) +def build_message(email, infos) message = <<~EMAIL_MESSAGE To: #{email} - Message-ID: #{message_id} Subject: jumper account is ready - Dear #{email} + Dear #{email.split('@')[0]} Thank you for joining us. You can use the following command to login the jumper server: @@ -79,67 +85,25 @@ def build_message(email, message_id, infos) return message end -def email_addr(mail_content) - msg = 'not an applying account email' - - raise msg unless mail_content.subject =~ /apply ssh account/i - - email = mail_content.from.join(',') - - return email -end - -# def check_email_available(mail_content, email) -# oos_list = File.read('/c/upstream-repos/repo_list').split(/\n/) -# url = mail_content.body.decoded.split(/\n/).find { |line| line =~ /https?:\/\// } -# base_url = url.split('/')[0,5].join('/') -# message = 'The url is not in upstream repo_list' -# -# raise message unless oos_list.include? base_url -# -# url_fdback = %x(curl #{url}) -# email_index = url_fdback.index email -# -# message = 'No commit info found from the url for the email' -# raise message unless email_index -# end - -def email_message_id(mail_content) - message_id = mail_content.message_id - return message_id -end - -def pub_key_value(mail_content) - pub_key = mail_content.body.decoded.split(/\n/).find { |line| line =~ /ssh-rsa/ } - return pub_key -end - def account_info(pub_key) - account_info_str = %x(curl -XGET '#{JUMPER_IP}:#{JUMPER_PORT}/assign_account' -d "pub_key: #{pub_key}") + account_info_str = if pub_key.nil? + %x(curl -XGET '#{JUMPER_HOST}:#{JUMPER_PORT}/assign_account') + else + %x(curl -XGET '#{JUMPER_HOST}:#{JUMPER_PORT}/assign_account' -d "pub_key: #{pub_key}") + end account_info = JSON.parse account_info_str return account_info end -def send_account(mail_content) - email = email_addr(mail_content) - message_id = email_message_id(mail_content) - # check_email_available(mail_content, email) - - pub_key = pub_key_value(mail_content) +def send_account(email, pub_key) acct_info = account_info(pub_key) - message = build_message(email, message_id, acct_info) + message = build_message(email, acct_info) %x(curl -XPOST '#{CRYSTAL_INTRANET}:#{SEND_MAIL_PORT}/send_mail_text' -d "#{message}") end -def read_mail_content(mail_file) - mail_content = Mail.read(mail_file) - - return mail_content -end - -mail_file = ARGV[0] -mail_content = read_mail_content(mail_file) -send_account(mail_content) +email = ARGV[0] +pub_key = ARGV[1] || nil +send_account(email, pub_key) -- 2.23.0

2 2

[PATCH compass-ci] git_mirror: fix: move Signal.trap to main loop
by Li Yuanchao 15 Oct '20

15 Oct '20

to make it always effective in z9 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 4ab5e32..779b488 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -89,7 +89,6 @@ class MirrorMain connection.start channel = connection.create_channel @message_queue = channel.queue('new_refs') - Signal.trap(:SIGCHLD, 'SIG_IGN') end def fork_stat_init(stat_key) @@ -187,6 +186,7 @@ class MirrorMain loop do push_git_queue handle_feedback + Signal.trap(:SIGCHLD, 'SIG_IGN') end end end -- 2.23.0

1 0

[PATCH v3 compass-ci 1/2] container/assign-account: get_account_info.rb fix bugs
by Luan Shengde 15 Oct '20

15 Oct '20

fix bugs: unexpected errors if there is no pub_key /usr/share/ruby/json/common.rb:156:in `parse': 765: unexpected token at 'NoMethodError: undefined method `[]' for nil:NilClass (JSON::ParserError) /usr/local/bin/get_account_info.rb:96:in `setup_jumper_account_info' /usr/local/bin/assign-account.rb:24:in `block in <main>' Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/assign-account/get_account_info.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/container/assign-account/get_account_info.rb b/container/assign-account/get_account_info.rb index 6c211a4..2f93d5b 100755 --- a/container/assign-account/get_account_info.rb +++ b/container/assign-account/get_account_info.rb @@ -33,7 +33,7 @@ setup_jumper_account_info build_account_name read_jumper_info setup_authorized_key - + the returned data for setup_jumper_account_info like: { "account" => "guest", @@ -93,15 +93,15 @@ class AccountStorage def setup_jumper_account_info account_info = read_account_info jumper_info = read_jumper_info - pub_key = @data['pub_key'] + pub_key = @data['pub_key'] unless @data.nil? jumper_ip = jumper_info[0].chomp jumper_port = jumper_info[1].chomp account = account_info[0] - passwd = if pub_key - 'Use pub_key to login' - else + passwd = if pub_key.nil? account_info[1] + else + 'Use pub_key to login' end jumper_account_info = { 'account' => account, -- 2.23.0

2 2

[PATCH compass-ci] rename image name which load from local repository
by Xiao Shenwei 15 Oct '20

15 Oct '20

docker-pull dc-centos:7 the image name is 172.168.xxx.2:5001/dc-centos:7 when you need run a container, should use this image name: 172.168.xxx.2:5001/dc-centos:7 eg: docker run -it 172.168.xxx.2:5001/dc-centos:7 sh for $CCI_SRC/providers/docker/docker.rb: the image_name is based on job.yaml like dc-centos:7, so tag the image to dc-centos:7 Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- sbin/docker-pull | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sbin/docker-pull b/sbin/docker-pull index 61ead7e..5972913 100755 --- a/sbin/docker-pull +++ b/sbin/docker-pull @@ -14,7 +14,9 @@ image_name=$1 local_repository() { echo "pull image from local repository" - docker pull $DOCKER_REGISTRY_HOST:$DOCKER_REGISTRY_PORT/$image_name + docker pull $DOCKER_REGISTRY_HOST:$DOCKER_REGISTRY_PORT/$image_name && { + docker tag $DOCKER_REGISTRY_HOST:$DOCKER_REGISTRY_PORT/$image_name $image_name + } } docker_hub() -- 2.23.0

1 0

[PATCH lkp-tests] lib/job.rb: donot add nil value to pp
by Wei Jihui 15 Oct '20

15 Oct '20

if program_name is nil, then donot add it to pp Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/job.rb b/lib/job.rb index f91686b5..8a6d68a5 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -574,6 +574,8 @@ class Job end options_hash = @referenced_programs[p_n] program_name = hash_key_re_string(h, p_n, @job['pp'].keys) + next if program_name.nil? + @job["pp"][program_name] = Hash.new() options_array = options_hash.keys options_array.each do |option| -- 2.23.0

2 2

[PATCH compass-ci] job.cr: make modules.cgz independent in initramfs
by Xu Xijian 15 Oct '20

15 Oct '20

Depart modules.cgz from initramfs' cgz to enable optional kernel. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- src/lib/job.cr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/job.cr b/src/lib/job.cr index 32aa662..64a4301 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -303,6 +303,8 @@ class Job "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/current")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{os_dir}/run-ipconfig.cgz")}" + temp_initrds << "#{INITRD_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{SRV_INITRD}/modules/modules.cgz")}" temp_initrds.concat(initrd_deps.split(/ /)) unless initrd_deps.empty? temp_initrds.concat(initrd_pkg.split(/ /)) unless initrd_pkg.empty? -- 2.23.0

3 3

[PATCH lkp-tests] lib/job.rb: define files find untracked-files at new directory
by Wei Jihui 15 Oct '20

15 Oct '20

git status just find $LKP_SRC/pkg/$program/ this new directory git status -u will find all files under $LKP_SRC/pkg/$program/* Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/job.rb b/lib/job.rb index f91686b5..0f4cb710 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -586,7 +586,7 @@ class Job # find all create or update files from LKP_SRC directory def find_git_change_files() git_files_list = Array.new() - git_status = %x(cd #{LKP_SRC} && git status --porcelain=1) + git_status = %x(cd #{LKP_SRC} && git status --porcelain=1 -u) git_status_line = git_status.split("\n") git_status_line.each do |line| git_file = line.split[-1] -- 2.23.0

1 0

[PATCH v6 lkp-tests] lib: add forward_port.sh
by Zhang Yale 15 Oct '20

15 Oct '20

Provide a login port for user, determine whether to send the ssh_port message based on the uuid. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- lib/forward_port.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 lib/forward_port.sh diff --git a/lib/forward_port.sh b/lib/forward_port.sh new file mode 100755 index 00000000..fa45953b --- /dev/null +++ b/lib/forward_port.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# uuid +# sshr_port_len +# sshr_port_base + +. $LKP_SRC/lib/http.sh + +sshr_ip=$LKP_SERVER +sshr_port=5050 +[ -n "$sshr_port_len" ] || sshr_port_len=2000 +[ -n "$sshr_port_base" ] || sshr_port_base=50000 + +get_port() +{ + [ -n "$uuid" ] || return + for i in $(seq 1 10) + do + port=$(($(date +%s%N)%"$sshr_port_len"+"$sshr_port_base")) + ssh -o StrictHostKeyChecking=no -o ExitOnForwardFailure=yes -o TCPKeepAlive=yes \ + -Nf -R $port:localhost:22 sshr@"$sshr_ip" -p "$sshr_port" &>/dev/null + [ $? -eq 0 ] || continue + echo "$port" + break + done +} -- 2.23.0

2 4

[PATCH lkp-tests] fix(lkp-bootstrap.servce):$GOCACHE is not defined with jobs that use go-lang
by Zhou Shengrui 15 Oct '20

15 Oct '20

The lkp-bootstrap.service runs before login, and it's environment variables is not completely full.The jobs run with go-lang can't get $GOCACHE and $HOME, will prompt errors like below: build cache is required, but could not be located: GOCACHE is not defined and neither $XDG_CACHE_HOME nor $HOME are defined make: *** [Makefile:34: runc] Error 1 ==> ERROR: A failure occurred in build(). Aborting... Signed-off-by: Zhou Shengrui <zhoushengrui(a)qq.com> --- rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service b/rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service index 50320140..92e7e5ee 100644 --- a/rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service +++ b/rootfs/addon/usr/lib/systemd/system/lkp-bootstrap.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking -ExecStart=/etc/init.d/lkp-bootstrap +ExecStart=su -c /etc/init.d/lkp-bootstrap IgnoreSIGPIPE=no KillMode=none TasksMax=infinity -- 2.23.0

3 2