December 2020 - 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

2025

2024

2023

2022

2021

2020

Compass-ci December 2020