- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci 1/6] fetch-mail: config file for fetchmail
by Luan Shengde 15 Dec '20

15 Dec '20

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/fetch-mail/fetchmailrc.template | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 container/fetch-mail/fetchmailrc.template diff --git a/container/fetch-mail/fetchmailrc.template b/container/fetch-mail/fetchmailrc.template new file mode 100644 index 0000000..8c7e82b --- /dev/null +++ b/container/fetch-mail/fetchmailrc.template @@ -0,0 +1,5 @@ +poll imap.qq.com with proto IMAP +username "FETCH_MAIL_ADDRESS" +password "FETCH_MAIL_AUTH_CODE" +mda "/usr/bin/procmail -f %F -d %T" +nokeep -- 2.23.0

1 0

[PATCH lkp-tests] lib/env.sh: modify the file that writes the variable
by Hu Xuejiao 15 Dec '20

15 Dec '20

Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- lib/env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/env.sh b/lib/env.sh index 78cfd6f5..8ac42a83 100755 --- a/lib/env.sh +++ b/lib/env.sh @@ -122,6 +122,6 @@ is_system() shell_profile() { local profile="$HOME/.${SHELL##*/}rc" - [ -f "$profile" ] || profile="$HOME/.${SHELL##*/}_profile" + [ -f "$profile" ] || touch $profile echo $profile } -- 2.23.0

2 1

[PATCH lkp-tests] distro/depends: add initramfs-common
by Zhang Yu 15 Dec '20

15 Dec '20

When run job with initramfs, some dependency packages are reuired Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- distro/depends/initramfs-common | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 distro/depends/initramfs-common diff --git a/distro/depends/initramfs-common b/distro/depends/initramfs-common new file mode 100644 index 000000000..15336b55a --- /dev/null +++ b/distro/depends/initramfs-common @@ -0,0 +1,2 @@ +time +perf -- 2.23.0

1 0

[PATCH compass-ci 1/2] sbin/build-my-info.rb: building my_info from configuration files
by Liu Yinsi 15 Dec '20

15 Dec '20

before: users build info by input my_name, my_email, my_uuid, then write into ES and yaml file. after: no need users to input, get defaults administrator account info from configuration files /etc/compass-ci/account/*.yaml, then write into ES. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sbin/build-my-info.rb | 54 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/sbin/build-my-info.rb b/sbin/build-my-info.rb index 73f7390..bb6e8d3 100755 --- a/sbin/build-my-info.rb +++ b/sbin/build-my-info.rb @@ -3,48 +3,46 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. # frozen_string_literal: true +require 'set' require 'json' require 'fileutils' require 'io/console' require_relative '../lib/es_client' - -print 'email: ' -my_email = $stdin.echo = gets.chomp -print 'name: ' -my_name = $stdin.echo = gets.chomp -my_uuid = %x(uuidgen).chomp - +require_relative '../container/defconfig' + +names = Set.new %w[ + my_email + my_name + my_uuid +] + +defaults = relevant_defaults(names) +my_email = defaults['my_email'] +my_name = defaults['my_name'] +my_uuid = defaults['my_uuid'] my_info = { 'my_email' => my_email, 'my_name' => my_name, - 'my_uuid' => my_uuid + 'my_uuid' => my_uuid, + 'my_login_name' => '', + 'my_commit_url' => '', + 'my_ssh_pubkey' => [] } -def store_account_info(my_info) - es = ESClient.new(index: 'accounts') - es.put_source_by_id(my_info['my_email'], my_info) +def es + ESClient.new(index: 'accounts') end -def config_default_yaml(my_info) - yaml_dir = "#{ENV['HOME']}/.config/compass-ci/defaults" - FileUtils.mkdir_p yaml_dir unless File.directory? yaml_dir - yaml_file = "#{yaml_dir}/account.yaml" - FileUtils.touch(yaml_file) unless File.exist? yaml_file - - yaml_info = YAML.load_file(yaml_file) || {} - yaml_info.update my_info +def store_account_info(my_info) + return if check_account_exist(my_info['my_email']) - File.open(yaml_file, 'w') do |f| - f.puts yaml_info.to_yaml - end + es.put_source_by_id(my_info['my_email'], my_info) end -def complete_my_info(my_info) - my_info['my_login_name'] = '' - my_info['my_commit_url'] = '' - my_info['my_ssh_pubkey'] = [] +def check_account_exist(email) + return true if es.query_by_id(email) + + return false end -config_default_yaml(my_info) -complete_my_info(my_info) store_account_info(my_info) -- 2.23.0

2 2

[PATCH v2 lkp-tests 2/2] lib/job.rb: fix duplicate default field
by Wei Jihui 15 Dec '20

15 Dec '20

input: /etc/commpass-ci/default/crystal.yaml lab: lab1 ~/.config/.compass-ci/default/*.yaml lab: lab2 original output: #! /etc/commpass-ci/default/crystal.yaml lab: lab2 #! ~/.config/.compass-ci/default/*.yaml now output: #! /etc/commpass-ci/default/crystal.yaml #! ~/.config/.compass-ci/default/*.yaml lab: lab2 Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/job.rb b/lib/job.rb index 9eac4001..781a24a4 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -405,6 +405,7 @@ class Job return false end if defaults.is_a?(Hash) && !defaults.empty? + @defaults.delete_if { |key, _| defaults.keys.include?(key) } @defaults[source_file_symkey(file)] = nil revise_hash(@defaults, defaults, true) @defaults.merge!(@overrides) -- 2.23.0

2 1

[PATCH compass-ci] container/defconfig.rb: fix rubocop warning
by Liu Yinsi 15 Dec '20

15 Dec '20

W: Lint/UselessAssignment: Useless assignment to variable - kb. Use _ or _kb as a variable name to indicate that it won't be used. File.readlines('/proc/meminfo').map { |s| k, v, kb = s.split; { k.chomp(':') => v } } ^^ C: Style/Semicolon: Do not use semicolons to terminate expressions. File.readlines('/proc/meminfo').map { |s| k, v, kb = s.split; { k.chomp(':') => v } } ^ Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- container/defconfig.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container/defconfig.rb b/container/defconfig.rb index 482dbc8..d1e2af0 100755 --- a/container/defconfig.rb +++ b/container/defconfig.rb @@ -35,11 +35,11 @@ def docker_rm(container) end def meminfo_hash - File.readlines('/proc/meminfo').map { |s| k, v, kb = s.split; { k.chomp(':') => v } } + YAML.load_file('/proc/meminfo') end def get_available_memory - memtotal = meminfo_hash[0]['MemTotal'].to_f / 1048576 + memtotal = meminfo_hash['MemTotal'].to_f / 1048576 # set container available memory size, minimum size is 1024m, maximum size is 30720m, # take the middle value according to the system memory size. -- 2.23.0

1 0

[PATCH lkp-tests] install missing dependent packages in x86_64
by Hu Xuejiao 15 Dec '20

15 Dec '20

[Error] /usr/lib/ld: cannot find -lc Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install.sh b/install.sh index 4bcc1afb..c01d56f6 100644 --- a/install.sh +++ b/install.sh @@ -2,6 +2,8 @@ . lib/env.sh +has_cmd yum && yum install -y glibc-static + make source $(shell_profile) -- 2.23.0

1 0

[PATCH v2 compass-ci] docker-rootfs/setup-image: set the system time zone
by Wang Chenglong 15 Dec '20

15 Dec '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/docker-rootfs/setup-image | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/container/docker-rootfs/setup-image b/container/docker-rootfs/setup-image index 8e2e88a..787a42c 100755 --- a/container/docker-rootfs/setup-image +++ b/container/docker-rootfs/setup-image @@ -13,6 +13,11 @@ remove_file() rm -rf /.dockerenv } +set_localtime() +{ + ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +} + setup_login() { [ -n "$ROOT_PASSWD" ] || return @@ -32,5 +37,6 @@ pack_cgz() install_packages remove_file +set_localtime setup_login pack_cgz -- 2.23.0

1 0

Re: [PATCH compass-ci] sched: replace access_key to upload_dirs
by Ren Wen 15 Dec '20

15 Dec '20

>- private def set_access_key >- self["access_key"] = "#{Random::Secure.hex(10)}-#{id}" >- self["access_key_file"] = File.join("/srv/", "#{result_root}", ".#{access_key}") >+ def set_upload_dirs >+ if @hash["cci-makepkg"]? >+ package_dir = ",/initrd/pkg" >+ elsif @hash["cci-depends"]? >+ package_dir = ",/initrd/deps" >+ elsif @hash["build-pkg"]? >+ package_dir = ",/initrd/build-pkg" >+ else >+ package_dir = "" >+ end The value of 'package_dir' doesn't need ',', Use: "#{result_root},#{package_dir}" instead. Thanks, RenWen >+ >+ self["upload_dirs"] = "#{result_root}#{package_dir}" > end > > private def set_result_service >diff --git a/src/scheduler/close_job.cr b/src/scheduler/close_job.cr >index 579c2c0..d8f80d7 100644 >--- a/src/scheduler/close_job.cr >+++ b/src/scheduler/close_job.cr >@@ -8,8 +8,6 @@ class Sched > > job = @redis.get_job(job_id) > >- delete_access_key_file(job) if job >- > response = @es.set_job_content(job) > if response["_id"] == nil > # es update fail, raise exception >@@ -27,8 +25,4 @@ class Sched > > @log.info(%({"job_id": "#{job_id}", "job_state": "complete"})) > end >- >- def delete_access_key_file(job : Job) >- File.delete(job.access_key_file) if File.exists?(job.access_key_file) >- end > end >diff --git a/src/scheduler/find_job_boot.cr b/src/scheduler/find_job_boot.cr >index 5a11523..6623a5e 100644 >--- a/src/scheduler/find_job_boot.cr >+++ b/src/scheduler/find_job_boot.cr >@@ -141,10 +141,6 @@ class Sched > return response > end > >- def touch_access_key_file(job : Job) >- FileUtils.touch(job.access_key_file) >- end >- > private def get_boot_ipxe(job : Job) > response = "#!ipxe\n\n" > response += Array(String).from_json(job.initrds_uri).join("\n") + "\n" >@@ -155,8 +151,12 @@ class Sched > return response > end > >+ def set_id2upload_dirs(job) >+ @redis.hash_set("sched/id2upload_dirs", job.id, job.upload_dirs) >+ end >+ > def boot_content(job : Job | Nil, boot_type : String) >- touch_access_key_file(job) if job >+ set_id2upload_dirs(job) if job > > case boot_type > when "ipxe" >-- >2.23.0 >

2 1

[PATCH v2 lkp-tests] sbin/submit: fix -m when submit job failed
by Wu Zhende 15 Dec '20

15 Dec '20

[Why] When use "submit -m", if submit job failed, the monitor is still run. [Error] submit iperf.yaml failed, got job_id=0, error: Failed to verify the account. Please check your configuration query=>{"job_id":[]} connect to ws://localhost:11310/filter Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- sbin/submit | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/submit b/sbin/submit index 6766e704a..05b3e86dd 100755 --- a/sbin/submit +++ b/sbin/submit @@ -162,6 +162,7 @@ ARGV.each do |jobfile| job_ids << msg['job_id'].to_s puts("submit #{jobfile}, got job_id=#{msg['job_id']}") else + opt_monitor = false puts("submit #{jobfile} failed, got job_id=#{msg['job_id']}, error: #{msg['message']}") end end -- 2.23.0

1 0