- Compass-ci - mailweb.openeuler.org

[PATCH v3 lkp-tests] tests/analyze-suspend: fix spell error
by Wang Yong 08 Dec '20

08 Dec '20

mutli -> multi Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- tests/analyze-suspend | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/analyze-suspend b/tests/analyze-suspend index 59bb75c87..edeb0e3af 100755 --- a/tests/analyze-suspend +++ b/tests/analyze-suspend @@ -16,11 +16,11 @@ cmd=sleepgraph.py echo options: mode: $mode, runtime: $runtime, rtcwake: $rtcwake, multi: $multi, option: $option options="" -[ -n "$mode" ] || mode='freeze' -[ -n "$multi" ] || mutli=1 -[ -n "$runtime" ] || runtime=600 -[ -n "$rtcwake" ] || rtcwake=30 -[ -n "$idle_time" ] || idle_time=0 +[ -n "$mode" ] || mode='freeze' +[ -n "$multi" ] || multi=1 +[ -n "$runtime" ] || runtime=600 +[ -n "$rtcwake" ] || rtcwake=30 +[ -n "$idle_time" ] || idle_time=0 [[ "$mode" = "freeze" && $(which turbostat) ]] && option="$option -turbostat" -- 2.23.0

1 0

[PATCH v2 lkp-tests] tests/analyze-suspend: fix spell [error]
by Wang Yong 08 Dec '20

08 Dec '20

mutli -> multi Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- tests/analyze-suspend | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/analyze-suspend b/tests/analyze-suspend index 59bb75c87..edeb0e3af 100755 --- a/tests/analyze-suspend +++ b/tests/analyze-suspend @@ -16,11 +16,11 @@ cmd=sleepgraph.py echo options: mode: $mode, runtime: $runtime, rtcwake: $rtcwake, multi: $multi, option: $option options="" -[ -n "$mode" ] || mode='freeze' -[ -n "$multi" ] || mutli=1 -[ -n "$runtime" ] || runtime=600 -[ -n "$rtcwake" ] || rtcwake=30 -[ -n "$idle_time" ] || idle_time=0 +[ -n "$mode" ] || mode='freeze' +[ -n "$multi" ] || multi=1 +[ -n "$runtime" ] || runtime=600 +[ -n "$rtcwake" ] || rtcwake=30 +[ -n "$idle_time" ] || idle_time=0 [[ "$mode" = "freeze" && $(which turbostat) ]] && option="$option -turbostat" -- 2.23.0

1 1

[PATCH lkp-tests] tests/analyze-suspend: fix spell error
by Wang Yong 08 Dec '20

08 Dec '20

mutli -> multi Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- tests/analyze-suspend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/analyze-suspend b/tests/analyze-suspend index 59bb75c87..45f2b95b6 100755 --- a/tests/analyze-suspend +++ b/tests/analyze-suspend @@ -17,7 +17,7 @@ cmd=sleepgraph.py echo options: mode: $mode, runtime: $runtime, rtcwake: $rtcwake, multi: $multi, option: $option options="" [ -n "$mode" ] || mode='freeze' -[ -n "$multi" ] || mutli=1 +[ -n "$multi" ] || multi=1 [ -n "$runtime" ] || runtime=600 [ -n "$rtcwake" ] || rtcwake=30 [ -n "$idle_time" ] || idle_time=0 -- 2.23.0

2 2

[PATCH compass-ci] rsync-server/start: add the container starts automatically
by Cui Yili 08 Dec '20

08 Dec '20

Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/rsync-server/start | 1 + 1 file changed, 1 insertion(+) diff --git a/container/rsync-server/start b/container/rsync-server/start index b24605b..9560132 100755 --- a/container/rsync-server/start +++ b/container/rsync-server/start @@ -8,6 +8,7 @@ docker_rm rsync_server cmd=( docker run -id + --restart=always --name=rsync_server -v /srv/result/upload:/srv/result/upload -v /etc/localtime:/etc/localtime:ro -- 2.23.0

1 0

[PATCH lkp-tests 3/5] lib/env.sh: add env-variables takes precedence over shellrc
by Hu Xuejiao 08 Dec '20

08 Dec '20

When different shells are encountered, it takes precedence over shellrc(.bashrc, .zshrc) Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- lib/env.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/env.sh b/lib/env.sh index a8d3c0ff..78cfd6f5 100755 --- a/lib/env.sh +++ b/lib/env.sh @@ -121,9 +121,7 @@ is_system() shell_profile() { - if [ "${SHELL##*/}" == "bash" ]; then - echo $HOME/.${SHELL##*/}_profile - else - echo $HOME/.${SHELL##*/}rc - fi + local profile="$HOME/.${SHELL##*/}rc" + [ -f "$profile" ] || profile="$HOME/.${SHELL##*/}_profile" + echo $profile } -- 2.23.0

1 0

[PATCH lkp-tests 2/5] modify gem install permission
by Hu Xuejiao 08 Dec '20

08 Dec '20

[why] ERROR: While executing gem ... (Errno::EACCES) Permission denied @ rb_sysopen - /usr/local/lib/ruby/gems/2.7.0/gems/git-1.7.0/CHANGELOG.md Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- sbin/install-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/install-dependencies.sh b/sbin/install-dependencies.sh index 5673f7a7..7df3652f 100644 --- a/sbin/install-dependencies.sh +++ b/sbin/install-dependencies.sh @@ -18,7 +18,7 @@ openEuler|fedora|rhel|centos) else yum install -y --skip-broken ruby rubygems gcc gcc-c++ make ruby-devel git fi - gem install -f git activesupport rest-client + sudo gem install -f git activesupport rest-client ;; *) echo "$ID not support! please install dependencies manually." -- 2.23.0

1 0

[PATCH lkp-tests 1/5] modify install-dependencies.sh permission
by Hu Xuejiao 08 Dec '20

08 Dec '20

[why] Error: Running Homebrew as root is extremely dangerous and no longer supported. As Homebrew does not drop privileges on installation you would be giving all build scripts full access to your system. Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 907dba9e..0b2d09a2 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ install: mkdir -p $(TARGET_DIR_BIN) ln -sf $(shell pwd)/bin/lkp $(TARGET_DIR_BIN)/lkp bash sbin/set-env.sh - sudo bash sbin/install-dependencies.sh + bash sbin/install-dependencies.sh .PHONY: doc doc: -- 2.23.0

1 0

[PATCH lkp-tests] modify gem install permission
by Hu Xuejiao 08 Dec '20

08 Dec '20

[why] ERROR: While executing gem ... (Errno::EACCES) Permission denied @ rb_sysopen - /usr/local/lib/ruby/gems/2.7.0/gems/git-1.7.0/CHANGELOG.md Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- sbin/install-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/install-dependencies.sh b/sbin/install-dependencies.sh index 5673f7a7..7df3652f 100644 --- a/sbin/install-dependencies.sh +++ b/sbin/install-dependencies.sh @@ -18,7 +18,7 @@ openEuler|fedora|rhel|centos) else yum install -y --skip-broken ruby rubygems gcc gcc-c++ make ruby-devel git fi - gem install -f git activesupport rest-client + sudo gem install -f git activesupport rest-client ;; *) echo "$ID not support! please install dependencies manually." -- 2.23.0

2 1

[PATCH compass-ci] container: add the listener of the device in the network segment
by Bai Jing 08 Dec '20

08 Dec '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- container/conserver/conserver-head.cf | 1 + 1 file changed, 1 insertion(+) diff --git a/container/conserver/conserver-head.cf b/container/conserver/conserver-head.cf index 6648f88..721bf44 100644 --- a/container/conserver/conserver-head.cf +++ b/container/conserver/conserver-head.cf @@ -12,5 +12,6 @@ default * { access * { trusted 127.0.0.1; + trusted 172.168.0.0/16; } -- 2.23.0

1 0

[PATCH compass-ci] container/kibana: add logtrail plugin
by Wu Zhende 08 Dec '20

08 Dec '20

LogTrail is a plugin for Kibana to view, analyze, search, and tail log events from multiple hosts in realtime with DevOps friendly interface inspired by Papertrail. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/kibana/Dockerfile | 10 +++++++++ container/kibana/logtrail.json | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 container/kibana/logtrail.json diff --git a/container/kibana/Dockerfile b/container/kibana/Dockerfile index 970eb5a..60b889d 100644 --- a/container/kibana/Dockerfile +++ b/container/kibana/Dockerfile @@ -10,3 +10,13 @@ FROM ${BASE_IMAGE} MAINTAINER Wu Zhende <wuzhende666(a)163.com> RUN sed -i 's/server.host: "0"/server.host: "0.0.0.0"/' config/kibana.yml + +USER root +RUN yum -y install wget \ + && wget https://github.com/sivasamyk/logtrail/releases/download/v0.1.31/logtrail-7.… -O /logtrail-7.6.2-0.1.31.zip + +USER 1090 +RUN ./bin/kibana-plugin install file:///logtrail-7.6.2-0.1.31.zip \ + && rm -rf /tmp/logtrail-7.6.2-0.1.31.zip + +COPY --chown=1090:1090 logtrail.json /usr/share/kibana/plugins/logtrail/logtrail.json diff --git a/container/kibana/logtrail.json b/container/kibana/logtrail.json new file mode 100644 index 0000000..304a4b3 --- /dev/null +++ b/container/kibana/logtrail.json @@ -0,0 +1,41 @@ +{ + "version": 2, + "index_patterns": [{ + "es": { + "default_index": "scheduler-3016", + "allow_url_parameter": false, + "timezone": "CST" + }, + "tail_interval_in_seconds": 10, + "es_index_time_offset_in_seconds": 0, + "display_timezone": "CST", + "display_timestamp_format": "YYYY MMM DD HH:mm:ss", + "max_buckets": 500, + "nested_objects": false, + "default_time_range_in_days": 0, + "max_hosts": 100, + "max_events_to_keep_in_viewer": 5000, + "default_search": "", + "fields": { + "mapping": { + "timestamp": "time", + "display_timestamp" : "time", + "hostname": "container_name", + "program": "tags", + "message": "log" + }, + "message_format": "{{{log}}}", + "keyword_suffix": "keyword" + }, + "color_mapping": { + "field": "level", + "mapping": { + "ERROR": "#FF0000", + "WARN": "#FFEF96", + "DEBUG": "#B5E7A0", + "TRACE": "#CFE0E8", + "INFO": "#339999" + } + } + }] +} -- 2.23.0

1 0

[PATCH lkp-tests] modify install-dependencies.sh permission
by Hu Xuejiao 08 Dec '20

08 Dec '20

[why] Error: Running Homebrew as root is extremely dangerous and no longer supported. As Homebrew does not drop privileges on installation you would be giving all build scripts full access to your system. Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 907dba9e..0b2d09a2 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ install: mkdir -p $(TARGET_DIR_BIN) ln -sf $(shell pwd)/bin/lkp $(TARGET_DIR_BIN)/lkp bash sbin/set-env.sh - sudo bash sbin/install-dependencies.sh + bash sbin/install-dependencies.sh .PHONY: doc doc: -- 2.23.0

1 0

[PATCH compass-ci 2/2] lib/json_logger: fix time format
by Wu Zhende 08 Dec '20

08 Dec '20

[Why] Time requires a specific format to be resolved by ES to date type [Reference] https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-dat… Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/json_logger.cr | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/json_logger.cr b/src/lib/json_logger.cr index d136bdd..9596243 100644 --- a/src/lib/json_logger.cr +++ b/src/lib/json_logger.cr @@ -15,6 +15,7 @@ class JSONLogger < Logger Logger::Formatter.new do | severity, datetime, progname, msg, io| get_env_info(@env.as(HTTP::Server::Context)) if @env level_num = severity.to_i32 + datetime = datetime.to_s("%Y-%m-%dT%H:%M:%S") logger_hash = JSON.parse(%({"level_num": #{level_num}, "level": "#{severity}", "time": "#{datetime}" -- 2.23.0

1 0

[PATCH compass-ci 1/2] container/master-fluentd: fix time format
by Wu Zhende 08 Dec '20

08 Dec '20

[Why] Time requires a specific format to be resolved by ES to date type [Reference] https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-dat… Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/master-fluentd/docker-fluentd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/master-fluentd/docker-fluentd.conf b/container/master-fluentd/docker-fluentd.conf index 5de7901..b3daeb4 100644 --- a/container/master-fluentd/docker-fluentd.conf +++ b/container/master-fluentd/docker-fluentd.conf @@ -11,7 +11,7 @@ @type record_transformer enable_ruby <record> - time ${time.strftime('%Y-%m-%d %H:%M:%S%z')} + time ${time.strftime('%Y-%m-%dT%H:%M:%S')} </record> </filter> -- 2.23.0

1 0

[PATCH compass-ci] src/lib: fix job.cr
by Zhang Yu 08 Dec '20

08 Dec '20

1. fix ameba warning job.cr:428:32 [C] Layout/TrailingWhitespace: Trailing whitespace detected > temp_initrds = [] of String ^ 2. fix no need () for no parameter in Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- src/lib/job.cr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 196516f..7746889 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -333,7 +333,7 @@ class Job @hash.delete("my_uuid") end - private def get_initialized_keys() + private def get_initialized_keys initialized_keys = [] of String REQUIRED_KEYS.each do |key| @@ -425,7 +425,7 @@ class Job end private def get_initrds - temp_initrds = [] of String + temp_initrds = [] of String if "#{os_mount}" == "initramfs" temp_initrds.concat(initramfs_initrds()) -- 2.23.0

1 0

[PATCH v2 compass-ci] src/lib: add delete function in job.cr
by Zhang Yu 08 Dec '20

08 Dec '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- src/lib/job.cr | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index a4345e0..70eab23 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -136,6 +136,15 @@ class Job update(json.as_h) end + def delete(key : String) + initialized_keys = get_initialized_keys + if initialized_keys.includes?(key) + raise "Should not delete #{key}" + else + @hash.delete(key) + end + end + private def set_defaults append_init_field() set_user_lkp_src() @@ -324,7 +333,7 @@ class Job @hash.delete("my_uuid") end - private def initialized? + private def get_initialized_keys() initialized_keys = [] of String REQUIRED_KEYS.each do |key| @@ -350,7 +359,10 @@ class Job "kernel_uri", "kernel_params", "linux_vmlinuz_path"] + end + private def initialized? + initialized_keys = get_initialized_keys initialized_keys.each do |key| return false unless @hash.has_key?(key) end -- 2.23.0

2 2

[PATCH lkp-tests] setup/netdata: use netdata monitor system resources
by Xiao Shenwei 08 Dec '20

08 Dec '20

usage: suite: multi-qemu simplify-ci: netdata: netdata_master_host: netdata_master_port: netdata_uuid: Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- setup/netdata | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100755 setup/netdata diff --git a/setup/netdata b/setup/netdata new file mode 100755 index 00000000..b318dc7c --- /dev/null +++ b/setup/netdata @@ -0,0 +1,45 @@ +#!/bin/sh +# monitoring system resources +# depend on $LKP_SRC/setup/simplify-ci + +check_env() +{ + [ -d "/c/compass-ci" ] || { + echo "please setting the compass-ci environment" + return 1 + } +} + +check_variables() +{ + [[ -n "$netdata_master_host" && -n "$netdata_master_port" && -n "$netdata_uuid" ]] || { + echo "please check the following variables:" + echo "1. netdata_master_host" + echo "2. netdata_master_port" + echo "3. netdata_uuid" + return 1 + } +} + +modify_config_file() +{ + cd /c/compass-ci/container/netdata-slave/config + sed -i "s%destination =.*%destination = $netdata_master_host:$netdata_master_port%g" stream.conf + sed -i "s%api key =.*%api key = $netdata_uuid%g" stream.conf +} + +run_container() +{ + cd /c/compass-ci/container/netdata-slave + ./build && ./run +} + +main() +{ + check_env || return + check_variables || return + modify_config_file + run_container +} + +main -- 2.23.0

2 1

[PATCH compass-ci] container/mail-robot: my_uuid is per-lab account
by Wu Fengguang 08 Dec '20

08 Dec '20

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- container/mail-robot/lib/assign-account-email.rb | 3 +++ container/mail-robot/start | 1 + 2 files changed, 4 insertions(+) diff --git a/container/mail-robot/lib/assign-account-email.rb b/container/mail-robot/lib/assign-account-email.rb index 0c5f8d4..a88626c 100755 --- a/container/mail-robot/lib/assign-account-email.rb +++ b/container/mail-robot/lib/assign-account-email.rb @@ -24,6 +24,9 @@ def build_apply_account_email(my_info) cat >> ~/.config/compass-ci/defaults/account.yaml <<-EOF my_email: #{my_info['my_email']} my_name: #{my_info['my_name']} + EOF + mkdir -p ~/.config/compass-ci/include/lab + cat >> ~/.config/compass-ci/include/lab/#{ENV['lab']}.yaml <<-EOF my_uuid: #{my_info['my_uuid']} EOF diff --git a/container/mail-robot/start b/container/mail-robot/start index f8078b6..ad17c7a 100755 --- a/container/mail-robot/start +++ b/container/mail-robot/start @@ -16,6 +16,7 @@ names = Set.new %w[ SCHED_HTTPS_PORT ES_PORT MAILDIR + lab ] defaults = relevant_defaults(names) -- 2.23.0

2 3

[PATCH v2 lkp-tests] spec/submit_spec: submit spec without my info
by Wei Jihui 08 Dec '20

08 Dec '20

delete my-info like my_uuid, my_email, my_name Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- spec/submit_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/submit_spec.rb b/spec/submit_spec.rb index 8310d629..77b64a7a 100644 --- a/spec/submit_spec.rb +++ b/spec/submit_spec.rb @@ -3,7 +3,7 @@ require "#{LKP_SRC}/lib/yaml" def stable_yaml_file(yaml_file) job = load_yaml(yaml_file) - delete_job_key = %w(LKP_DEBUG_PREFIX lkp_initrd_user job_origin) + delete_job_key = %w(LKP_DEBUG_PREFIX lkp_initrd_user job_origin my_uuid my_email my_name) job.delete_if do |key, _| delete_job_key.include?(key) || key.to_s.start_with?('#! ') || -- 2.23.0

1 0

[PATCH compass-ci 2/2] send-internet-mail: update stored mails path
by Luan Shengde 08 Dec '20

08 Dec '20

use new mailbox for mails than has been sent. it will enable read separately with mutt [why] the old path will not support to read separately for mutt with -f [how] use a new mailbox to store the mails that have been sent Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/send-internet-mail/send-internet-mail.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/send-internet-mail/send-internet-mail.rb b/container/send-internet-mail/send-internet-mail.rb index 851904c..8fdaa0d 100755 --- a/container/send-internet-mail/send-internet-mail.rb +++ b/container/send-internet-mail/send-internet-mail.rb @@ -23,7 +23,7 @@ Mail.defaults { delivery_method :smtp, smtp } def store_email(mail) time_now = Time.new.strftime('%Y%m%d%H%M%S') file_name = [mail.to[0], time_now].join('_') - file_full_name = File.join(ENV['MAILDIR'], 'sent', file_name) + file_full_name = File.join(ENV['SENT_MAILDIR'], 'new', file_name) File.open(file_full_name, 'w') do |f| f.puts mail end -- 2.23.0

1 0

[PATCH compass-ci 1/2] send-internet-mail: update start
by Luan Shengde 08 Dec '20

08 Dec '20

use new mailbox for email than has been sent so we can use mutt to read the mails Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/send-internet-mail/start | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container/send-internet-mail/start b/container/send-internet-mail/start index d6e4e25..02c6ab6 100755 --- a/container/send-internet-mail/start +++ b/container/send-internet-mail/start @@ -12,13 +12,13 @@ names = Set.new %w[ ROBOT_EMAIL_ADDRESS ROBOT_EMAIL_PASSWORD SEND_MAIL_PORT - MAILDIR + SENT_MAILDIR ] defaults = relevant_defaults(names) defaults['CCI_SRC'] = '/c/compass-ci' -defaults['MAILDIR'] ||= '/srv/cci/Maildir/.compass-ci' +defaults['SENT_MAILDIR'] ||= '/srv/cci/Maildir/.sent' defaults['HOST_SERVER'] = ENV['HOSTNAME'] env = docker_env(defaults) @@ -30,7 +30,7 @@ cmd = %w[ -d ] + env + %W[ -p #{defaults['SEND_MAIL_PORT']}:#{defaults['SEND_MAIL_PORT']} - -v #{defaults['MAILDIR']}:#{defaults['MAILDIR']}:rw + -v #{defaults['SENT_MAILDIR']}:#{defaults['SENT_MAILDIR']}:rw -v #{ENV['CCI_SRC']}:#{defaults['CCI_SRC']} -v /etc/localtime:/etc/localtime:ro -w #{defaults['CCI_SRC']}/container/send-internet-mail -- 2.23.0

1 0

[PATCH lkp-tests 1/2] spec/submit_spec: submit spec without my info
by Wei Jihui 08 Dec '20

08 Dec '20

delete my-info like my_uuid,my_email,my_name Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- spec/submit_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/submit_spec.rb b/spec/submit_spec.rb index 8310d629..77b64a7a 100644 --- a/spec/submit_spec.rb +++ b/spec/submit_spec.rb @@ -3,7 +3,7 @@ require "#{LKP_SRC}/lib/yaml" def stable_yaml_file(yaml_file) job = load_yaml(yaml_file) - delete_job_key = %w(LKP_DEBUG_PREFIX lkp_initrd_user job_origin) + delete_job_key = %w(LKP_DEBUG_PREFIX lkp_initrd_user job_origin my_uuid my_email my_name) job.delete_if do |key, _| delete_job_key.include?(key) || key.to_s.start_with?('#! ') || -- 2.23.0

2 1

[PATCH lkp-tests 2/2] spec/submit_spec: format the spec result
by Wei Jihui 08 Dec '20

08 Dec '20

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- spec/submit/job_on_fail/job-3000.yaml | 10 +++++----- spec/submit/matrix/job-1-300-whetstone-double.yaml | 8 ++++---- spec/submit/matrix/job-3-300-shell1.yaml | 8 ++++---- spec/submit/merge_yaml/job-defaults.yaml | 10 +++++----- spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml | 6 +++--- .../submit/separate_yaml/job-10000-2-100000ss-add.yaml | 6 +++--- spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml | 6 +++--- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/spec/submit/job_on_fail/job-3000.yaml b/spec/submit/job_on_fail/job-3000.yaml index 3d7ad9b5..11d89b2b 100644 --- a/spec/submit/job_on_fail/job-3000.yaml +++ b/spec/submit/job_on_fail/job-3000.yaml @@ -2,7 +2,7 @@ suite: atomic on_fail: sleep: 3000 -atomic: +atomic: lab: spec_lab testbox: vm-2p8g--spec_submit tbox_group: vm-2p8g--spec_submit @@ -12,11 +12,11 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: sleep: 3000 - atomic: - cpufreq_governor: -monitors: + atomic: + cpufreq_governor: +monitors: diff --git a/spec/submit/matrix/job-1-300-whetstone-double.yaml b/spec/submit/matrix/job-1-300-whetstone-double.yaml index 9896bcef..78f79fa7 100644 --- a/spec/submit/matrix/job-1-300-whetstone-double.yaml +++ b/spec/submit/matrix/job-1-300-whetstone-double.yaml @@ -1,7 +1,7 @@ --- suite: unixbench runtime: 300 -unixbench: +unixbench: lab: spec_lab testbox: vm-2p8g--spec_submit nr_task: '1' @@ -13,7 +13,7 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: @@ -21,5 +21,5 @@ pp: runtime: 300 test: whetstone-double nr_task: '1' - cpufreq_governor: -monitors: + cpufreq_governor: +monitors: diff --git a/spec/submit/matrix/job-3-300-shell1.yaml b/spec/submit/matrix/job-3-300-shell1.yaml index 912d10ee..afe5a953 100644 --- a/spec/submit/matrix/job-3-300-shell1.yaml +++ b/spec/submit/matrix/job-3-300-shell1.yaml @@ -1,7 +1,7 @@ --- suite: unixbench runtime: 300 -unixbench: +unixbench: lab: spec_lab testbox: vm-2p8g--spec_submit nr_task: '3' @@ -13,7 +13,7 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: @@ -21,5 +21,5 @@ pp: runtime: 300 test: shell1 nr_task: '3' - cpufreq_governor: -monitors: + cpufreq_governor: +monitors: diff --git a/spec/submit/merge_yaml/job-defaults.yaml b/spec/submit/merge_yaml/job-defaults.yaml index 42b53c13..f72fd6ac 100644 --- a/spec/submit/merge_yaml/job-defaults.yaml +++ b/spec/submit/merge_yaml/job-defaults.yaml @@ -1,6 +1,6 @@ --- suite: atomic -atomic: +atomic: lab: spec_lab testbox: vm-2p8g--spec_submit tbox_group: vm-2p8g--spec_submit @@ -10,10 +10,10 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: - atomic: - cpufreq_governor: -monitors: + atomic: + cpufreq_governor: +monitors: diff --git a/spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml b/spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml index f3e2c553..a2355b50 100644 --- a/spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml +++ b/spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml @@ -14,7 +14,7 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: @@ -23,5 +23,5 @@ pp: samples: 100000ss freq: 1000 test: add - cpufreq_governor: -monitors: + cpufreq_governor: +monitors: diff --git a/spec/submit/separate_yaml/job-10000-2-100000ss-add.yaml b/spec/submit/separate_yaml/job-10000-2-100000ss-add.yaml index 63bac5cf..8a6317cb 100644 --- a/spec/submit/separate_yaml/job-10000-2-100000ss-add.yaml +++ b/spec/submit/separate_yaml/job-10000-2-100000ss-add.yaml @@ -14,7 +14,7 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: @@ -23,5 +23,5 @@ pp: samples: 100000ss freq: 10000 test: add - cpufreq_governor: -monitors: + cpufreq_governor: +monitors: diff --git a/spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml b/spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml index a802dc1b..15701ad0 100644 --- a/spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml +++ b/spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml @@ -14,7 +14,7 @@ nr_node: 1 nr_cpu: 2 memory: 8G arch: aarch64 -cpufreq_governor: +cpufreq_governor: need_kconfig: - CONFIG_KVM_GUEST=y pp: @@ -23,5 +23,5 @@ pp: samples: 6000ss freq: 20 test: cache - cpufreq_governor: -monitors: + cpufreq_governor: +monitors: -- 2.23.0

1 0

[PATCH v5 compass-ci] mail-robot: add check account exists for email
by Luan Shengde 08 Dec '20

08 Dec '20

avoid re-assign accounts for a single email address [why] the mail-robot may assign a new account if user send 'apply account' email with the same email address. and this is a big waste of account resource. [how] when receive request for applying an account, check whether the email already has already been assigned an account. assign a new one if there is none return the old one if there is already one and update info mail robot will update infos if the mail has been set new: - my_name - my_commit_url - my_ssh_pubkey Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/mail-robot/lib/apply-account.rb | 34 +++++++++++++++++------ 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/container/mail-robot/lib/apply-account.rb b/container/mail-robot/lib/apply-account.rb index bf40429..99da510 100755 --- a/container/mail-robot/lib/apply-account.rb +++ b/container/mail-robot/lib/apply-account.rb @@ -51,6 +51,8 @@ class ApplyAccount @send_mail_host = %x(/sbin/ip route | awk '/default/ {print $3}').chomp @send_mail_port = SEND_MAIL_PORT @mail_content = mail_content + @es_host = @send_mail_host + @es_port = ES_PORT @my_info = {} end @@ -61,9 +63,8 @@ class ApplyAccount # firstly get my_email before execute parse_mail_content is needed @my_info['my_email'] = @mail_content.from[0] parse_mail_content - acct_info = apply_my_account - - @my_info['my_login_name'] = acct_info['my_login_name'] + my_account_es = check_account_es + apply_my_account(my_account_es) store_account_info send_mail('') @@ -82,15 +83,30 @@ class ApplyAccount @my_info.update parsed_email_info end - def apply_my_account - my_uuid = %x(uuidgen).chomp - - @my_info['my_uuid'] = my_uuid + def apply_my_account(my_account_es) + apply_info = {} + if my_account_es + apply_info.update my_account_es + apply_info.update @my_info + @my_info.update apply_info + apply_info['is_update_account'] = true + else + my_uuid = %x(uuidgen).chomp + @my_info['my_uuid'] = my_uuid + apply_info.update @my_info + end + apply_new_account(apply_info, my_account_es) + end - apply_account = ApplyJumperAccount.new(@my_info) + def apply_new_account(apply_info, my_account_es) + apply_account = ApplyJumperAccount.new(apply_info) acct_info = apply_account.apply_jumper_account - return acct_info + @my_info['my_login_name'] = acct_info['my_login_name'] unless my_account_es + end + + def check_account_es + ESQuery.new(index: 'accounts').query_by_id(@my_info['my_email']) end def store_account_info -- 2.23.0

1 0

[PATCH lkp-tests] jobs: change the file permission
by Zhang Yu 08 Dec '20

08 Dec '20

The file permission should be consistent with the other file in this directory Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- jobs/mysql-server.yaml | 0 stats/crystal/sysbench-mysql.cr | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 jobs/mysql-server.yaml mode change 100755 => 100644 stats/crystal/sysbench-mysql.cr diff --git a/jobs/mysql-server.yaml b/jobs/mysql-server.yaml old mode 100755 new mode 100644 diff --git a/stats/crystal/sysbench-mysql.cr b/stats/crystal/sysbench-mysql.cr old mode 100755 new mode 100644 -- 2.23.0

1 0

[PATCH v3 lkp-tests] tests/build-pkg: fix upload in container
by Wang Yong 08 Dec '20

08 Dec '20

docker can not use mount operation, so now use curl to upload build-pkg cgz file Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- tests/build-pkg | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/build-pkg b/tests/build-pkg index b26798509..622bef1a3 100755 --- a/tests/build-pkg +++ b/tests/build-pkg @@ -18,6 +18,8 @@ ## See: https://wiki.archlinux.org/index.php/Makepkg . $LKP_SRC/lib/debug.sh +. $LKP_SRC/lib/env.sh +. $LKP_SRC/distro/common check_vars() { @@ -29,6 +31,13 @@ check_vars() [ -n "$os_mount" ] || die "os_mount is empty" } +mount_pkg_mnt() +{ + [ -n "$LKP_SERVER" ] && { + mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" + } +} + mount_dest() { # the same image is mounted to cifs and nfs, the generated cgz files @@ -39,9 +48,7 @@ mount_dest() PKG_MNT=/initrd/build-pkg mkdir -p "$PKG_MNT" - [ -n "$LKP_SERVER" ] && { - mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" - } + is_docker || mount_pkg_mnt } get_pkgfile() @@ -142,7 +149,11 @@ build_source_pkg() PACMAN=true BUILDDIR=$TMP CARCH=$os_arch PKGEXT=.cgz CGZDEST="$cgz_name" \ $LKP_SRC/sbin/makepkg -A --check --skippgpcheck --config $LKP_SRC/etc/makepkg.conf 2>&1 - [ "$?" == 0 ] && create_softlink + [ "$?" == 0 ] || exit 1 + create_softlink + + is_docker || exit 0 + upload_to_target_dir ${PKG_MNT}/${pack_to}/${pkgname} } check_vars -- 2.23.0

1 0

2025

2024

2023

2022

2021

2020

Compass-ci