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

[PATCH compass-ci] jobfile_operate.cr: reduce if nesting levels
by Xu Xijian 10 Nov '20

10 Nov '20

Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- src/scheduler/jobfile_operate.cr | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/scheduler/jobfile_operate.cr b/src/scheduler/jobfile_operate.cr index 4ec9f96..baab515 100644 --- a/src/scheduler/jobfile_operate.cr +++ b/src/scheduler/jobfile_operate.cr @@ -58,14 +58,14 @@ module Jobfile::Operate def self.parse_one(script_lines, key, val) return false if val.as_h? - if valid_shell_variable?(key) - value = if val.as_a? - shell_escape(val.as_a) - else - shell_escape(val.to_s) - end - script_lines << "\texport #{key}=" + value if value - end + return false unless valid_shell_variable?(key) + + value = if val.as_a? + shell_escape(val.as_a) + else + shell_escape(val.to_s) + end + script_lines << "\texport #{key}=" + value if value end def self.sh_export_top_env(job_content : Hash) -- 2.23.0

2 1

[PATCH v3 compass-ci 11/11] mail-robot: start file
by Luan Shengde 10 Nov '20

10 Nov '20

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/mail-robot/start | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 container/mail-robot/start diff --git a/container/mail-robot/start b/container/mail-robot/start new file mode 100755 index 0000000..3f9a1c6 --- /dev/null +++ b/container/mail-robot/start @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'set' +require_relative '../defconfig' + +docker_rm 'mail-robot' + +names = Set.new %w[ + JUMPER_HOST + JUMPER_PORT + SEND_MAIL_PORT +] + +defaults = relevant_defaults(names) + +env = docker_env(defaults) + +cmd = %w[ + docker run + --restart=always + --name=mail-robot + -d +] + env + %W[ + -v /c/upstream-repos:/c/upstream-repos:ro + -v /srv/cci/Maildir/.compass-ci:/srv/cci/Maildir/.compass-ci:rw + -v #{ENV['CCI_SRC']}:/c/compass-ci:rw + -w /c/compass-ci/container/mail-robot + mail-robot +] + +cmd += ['ruby', 'run-mail-robot.rb'] + +system(*cmd) -- 2.23.0

2 3

【Meeting Notice】compass-ci pkg-build 包构建相关交流 Time: 2020-11-10 18:30-20:30
by Meeting Book 10 Nov '20

10 Nov '20

1 0

【Meeting Notice】compass-ci 包构建相关 Time: 2020-11-10 18:30-20:30
by Meeting Book 10 Nov '20

10 Nov '20

1 0

compass-ci 包构建交流
by openEuler conference 10 Nov '20

10 Nov '20

1 0

[PATCH compass-ci 1/3] [multi-docker] obtain the memory,cpu from the hostname
by Xiao Shenwei 10 Nov '20

10 Nov '20

hostname before: dc-1g--$HOSTNAME now : dc-1g.$HOSTNAME Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/docker/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/docker/run.sh b/providers/docker/run.sh index 7234dfa..9edad62 100755 --- a/providers/docker/run.sh +++ b/providers/docker/run.sh @@ -13,7 +13,7 @@ if [[ $hostname =~ ^(.*)-[0-9]+$ ]]; then else tbox_group=$hostname fi -host=${tbox_group%%--*} +host=${tbox_group%.*} create_yaml_variables "$LKP_SRC/hosts/${host}" -- 2.23.0

2 2

[PATCH v3 compass-ci 03/11] mail-robot: check to assign account
by Luan Shengde 10 Nov '20

10 Nov '20

check to assign account invoke ParseApplyAccountEmail parse commit url parse pubkey invoke AssignJumperAccount generate uuid apply account store account info to es send email send success email send fail email Signed-off-by: Luan Shengde <shdluan(a)163.com> --- lib/assign-account.rb | 73 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100755 lib/assign-account.rb diff --git a/lib/assign-account.rb b/lib/assign-account.rb new file mode 100755 index 0000000..880de97 --- /dev/null +++ b/lib/assign-account.rb @@ -0,0 +1,73 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'json' +require 'mail' +require_relative 'es_client' + +# assign uuid/account +class AssignAccount + def initialize(mail_content) + @send_mail_host = %x(/sbin/ip route | awk '/default/ {print $3}').chomp + @send_mail_port = SEND_MAIL_PORT + @mail_content = mail_content + + @my_info = { + 'my_email' => mail_content.from[0], + 'my_name' => mail_content.From.unparsed_value.gsub(/ <[^<>]*>/, '') + } + end + + def send_account + my_commit_url, my_ssh_pubkey = parse_commit_url_pub_key + acct_info = apply_my_account(my_ssh_pubkey) + + @my_info['my_commit_url'] = my_commit_url + @my_info['my_login_name'] = acct_info['my_login_name'] + + store_account_info + send_mail('') + rescue StandardError => e + puts e.message + puts e.backtrace + + send_mail(e.message) + end + + def parse_commit_url_pub_key + parse_apply_account_email = ParseApplyAccountEmail.new(@mail_content) + + my_commit_url = parse_apply_account_email.parse_commit_url + my_ssh_pubkey = parse_apply_account_email.parse_pub_key + + return my_commit_url, my_ssh_pubkey + end + + def apply_my_account(my_ssh_pubkey) + my_uuid = %x(uuidgen).chomp + + @my_info['my_uuid'] = my_uuid + + apply_account = ApplyJumperAccount.new(@my_info, my_ssh_pubkey) + acct_info = apply_account.apply_jumper_account + + return acct_info + end + + def store_account_info + es = ESClient.new(index: 'accounts') + es.put_source_by_id(@my_info['my_email'], @my_info) + end + + def send_mail(message) + email_message = if message.empty? + build_apply_account_email(@my_info) + else + build_apply_account_fail_email(@my_info, message) + end + + %x(curl -XPOST "#{@send_mail_host}:#{@send_mail_port}/send_mail_text" -d "#{email_message}") + end +end -- 2.23.0

2 2

[PATCH v3 compass-ci 02/11] mail-robot: listen new email directory
by Luan Shengde 10 Nov '20

10 Nov '20

monitor mailbox for new email handle new email file check to apply account only if email's subject match 'apply account' Signed-off-by: Luan Shengde <shdluan(a)163.com> --- lib/mail-robot.rb | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 lib/mail-robot.rb diff --git a/lib/mail-robot.rb b/lib/mail-robot.rb new file mode 100755 index 0000000..168e64b --- /dev/null +++ b/lib/mail-robot.rb @@ -0,0 +1,44 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'json' +require 'yaml' +require 'listen' +require 'mail' +require 'fileutils' +# require_relative 'send-apply-account-email' +# require_relative 'send-uuid-email' +# require_relative 'send-error-email' +# require_relative 'apply-jumper-account' +# require_relative 'parse-apply-account-email' +# require_relative 'assign-account' + +# MAILDIR = '/srv/cci/Maildir/.compass-ci' + +def monitor_new_email(mail_inbox, mail_drafts) + listener = Listen.to(mail_inbox) do |_modified, added, _removed| + next if added.empty? + + added.each do |mail_file| + handle_new_email(mail_file, mail_drafts) + end + end + listener.start + sleep +end + +def handle_new_email(mail_file, mail_drafts) + mail_content = Mail.read(mail_file) + apply_account(mail_content) + + FileUtils.mv(mail_file, mail_drafts) +end + +def apply_account(mail_content) + return unless mail_content.subject == 'apply account' + + assign_uuid = AssignAccount.new(mail_content) + assign_uuid.send_account +end -- 2.23.0

2 4

[PATCH compass-ci] kernel_version.md: add default vmlinuz in Related files example
by Xu Xijian 10 Nov '20

10 Nov '20

[why] Add default vmlinuz in Related files example, it is a softlink. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- doc/job/kernel_version.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/job/kernel_version.md b/doc/job/kernel_version.md index f6a5f4d..23c132a 100644 --- a/doc/job/kernel_version.md +++ b/doc/job/kernel_version.md @@ -34,6 +34,7 @@ Related files: ├── modules-4.19.90-2003.cgz ├── modules.cgz -> modules-4.19.90-2003.cgz ├── vmlinuz-4.19.90-2003 +├── vmlinuz -> vmlinuz-4.19.90-2003 Usage example: - submit iperf.yaml testbox=vm-2p8g--$USER os=openeuler os_arch=aarch64 os_version=20.03 runtime=20 kernel_version=4.19.90-2003 -- 2.23.0

2 2

[PATCH lkp-tests] bin/lkp-setup-rootfs: fix mount error
by Li Ping 10 Nov '20

10 Nov '20

[problem]: submit -a cci-makepkg.yaml testbox=taishan200-2280-2s64p-256g--a42 cat /srv/result/cci-makepkg/taishan200-2280-2s64p-256g--a42/2020-11-05/z9.146070/output mount error(16): Device or resource busy Refer to the mount.cifs(8) manual page (e.g. man mount.cifs) Failed to run mount /lkp/lkp/src/lib/debug.sh:12: die /lkp/lkp/src/tests/cci-makepkg:37: main [why]: submit with the option '-a' will call the define_files function and add test-user change files to job's define_files. Then define_files_aoto_pack will be triggered. When submit -a cci-makepkg.yaml, $LKP_SRC/tests/cci-makepkg will run twice, which results in mounting twice and causes mount error. Signed-off-by: Li Ping <15396232681(a)163.com> --- bin/lkp-setup-rootfs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/lkp-setup-rootfs b/bin/lkp-setup-rootfs index 680027e6..83029f09 100755 --- a/bin/lkp-setup-rootfs +++ b/bin/lkp-setup-rootfs @@ -251,7 +251,9 @@ chmod_root_ssh while true; do set_tbox_wtmp 'running' . $job_script define_files - define_files_auto_pack $define_files + [ "$suite" != "cci-makepkg" ] && [ "$suite" != "cci-depends" ] && { + define_files_auto_pack $define_files + } if [ "$os_mount" != "initramfs" ]; then wget_install_cgz $initrd_deps wget_install_cgz $initrd_pkg -- 2.23.0

3 3

2024

2023

2022

2021

2020

Compass-ci November 2020