- Compass-ci - mailweb.openeuler.org

[PATCH lkp-tests] tests/build-pkg: support squid download remote files
by Liu Shaofei 08 Dec '20

08 Dec '20

When building software in PKGBUILD file, download upstream files often times out. We need to cache these files by squid server.The example is as follow: https://invisible-mirror.net/archives/conflict/conflict-20150705.tgz => http://invisible-mirror.net/archives/conflict/conflict-20150705.tgz Signed-off-by: Liu Shaofei <liushaofei5(a)huawei.com> --- tests/build-pkg | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/build-pkg b/tests/build-pkg index e4eca747..c1b0513e 100755 --- a/tests/build-pkg +++ b/tests/build-pkg @@ -106,8 +106,12 @@ replace_source() for url in ${source[@]} do echo "$url" | egrep 'git\+|\.git$' && { - url="\"${repo_dir}git://${LKP_SERVER}/${upstream_repo}#commit=${upstream_commit}\"" + [ -n "$repo_dir" ] && { + url="\"${repo_dir}git://${LKP_SERVER}/${upstream_repo}#commit=${upstream_commit}\"" + } } + url=$(echo "$url" | sed 's|https:\/\/|http:\/\/|g') + echo "$url" >> $1 done echo ")" >> $1 @@ -126,8 +130,7 @@ build_source_pkg() repo_dir="${repo_dir%.git*}::" fi } - - replace_source "PKGBUILD.src" + replace_source PKGBUILD.src [ -n "$PKGBUILD_TAG" ] && replace_source "PKGBUILD-$PKGBUILD_TAG" -- 2.23.0

2 1

[PATCH lkp-tests] tests/cci-makepkg: centos7 update gcc in container
by Lin Jiaxin 08 Dec '20

08 Dec '20

Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- tests/cci-makepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cci-makepkg b/tests/cci-makepkg index a7a990a5..7c6c9808 100755 --- a/tests/cci-makepkg +++ b/tests/cci-makepkg @@ -98,7 +98,7 @@ centos_update_gcc() { grep -sqF "CentOS Linux release 7" /etc/centos-release || return - [ "$os_mount" = "initramfs" ] && { + [ "$os_mount" = "initramfs" -o is_docker ] && { yum install -y centos-release-scl-rh yum install -y "devtoolset-8-gcc*" } -- 2.23.0

2 1

[PATCH compass-ci] lib/error_messages.rb: refactor the array structure
by Lin Jiaxin 08 Dec '20

08 Dec '20

before: #<Set: {"src/ssl_sock.c:1454:104: warning: unused parameter ‘al’ [-Wunused-parameter]\n int ssl_sock_sctl_add_cbk(SSL *ssl, unsigned ext_type, const unsigned char **out, size_t *outlen, int *al, void *add_arg)\n ^~\n"}> after: src/ssl_sock.c:1454:104: warning: unused parameter ‘al’ [-Wunused-parameter] int ssl_sock_sctl_add_cbk(SSL *ssl, unsigned ext_type, const unsigned char **out, size_t *outlen, int *al, void *add_arg) ^~ Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- lib/error_messages.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/error_messages.rb b/lib/error_messages.rb index 3a74d29..5bbc329 100644 --- a/lib/error_messages.rb +++ b/lib/error_messages.rb @@ -43,9 +43,9 @@ class ErrorMessages def obtain_error_messages_by_errorid(errorid) error_messages_by_errorid = [] error_messages = obtain_error_messages - error_messages.each do | k, v | - if ("build-pkg." + build_pkg_error_id(k)) == errorid - error_messages_by_errorid << v + error_messages.each do |k, v| + if ('build-pkg.' + build_pkg_error_id(k)) == errorid + error_messages_by_errorid += v.to_a end end error_messages_by_errorid -- 2.23.0

2 1

[PATCH compass-ci] lib/es_query.rb: index error during query
by Cui Yili 08 Dec '20

08 Dec '20

Signed-off-by: cuiyili <2268260388(a)qq.com> --- lib/es_query.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/es_query.rb b/lib/es_query.rb index 3827ea8..c1342c5 100644 --- a/lib/es_query.rb +++ b/lib/es_query.rb @@ -31,7 +31,7 @@ class ESQuery } }, size: size } - @client.search index: 'jobs*', body: query + @client.search index: @index << '*', body: query end def traverse_field(size) -- 2.23.0

3 2

[PATCH compass-ci] container/kibana: support non-local ES
by Wu Zhende 08 Dec '20

08 Dec '20

The original startup mode supports only the local ES, but the ES may be deployed on other hosts. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/kibana/start | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/container/kibana/start b/container/kibana/start index 6a504fb..dbb3c56 100755 --- a/container/kibana/start +++ b/container/kibana/start @@ -3,17 +3,27 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. # frozen_string_literal: true +require 'set' require_relative '../defconfig.rb' -docker_rm "kibana" +names = Set.new %w[ + LOGGING_ES_HOST + LOGGING_ES_PORT +] + +defaults = relevant_defaults(names) +LOGGING_ES_HOST = defaults['LOGGING_ES_HOST'] || '172.17.0.1' +LOGGING_ES_PORT = defaults['LOGGING_ES_PORT'] || '9202' + +docker_rm 'kibana' -cmd = %w[ +cmd = %W[ docker run --restart=always --name kibana -v /etc/localtime:/etc/localtime:ro -d - --link logging-es:elasticsearch + -e ELASTICSEARCH_HOSTS=http://#{LOGGING_ES_HOST}:#{LOGGING_ES_PORT} -p 11309:5601 kibana:7.6.2 ] -- 2.23.0

2 1

[PATCH compass-ci] lib/git_bisect.rb: add bad_commit field
by Cao Xueliang 08 Dec '20

08 Dec '20

1. The bad_commit will be set to upstream_commit. 2. The bad_commit may be set to the other commit which is earlier than upstream_commit when we find a good commit. 3. Use the bad_commit and good_commit to bisect. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/git_bisect.rb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/git_bisect.rb b/lib/git_bisect.rb index e2c5636..7543646 100644 --- a/lib/git_bisect.rb +++ b/lib/git_bisect.rb @@ -23,6 +23,7 @@ class GitBisect set_build_pkg_dir set_upstream set_work_dir + set_bad_commit set_good_commit start_bisect @@ -60,6 +61,10 @@ class GitBisect raise "checkout repo: #{@upstream_repo} to commit: #{@upstream_commit} failed!" unless @work_dir end + def set_bad_commit + @bad_commit = @upstream_commit + end + def set_good_commit @good_commit = find_good_commit raise 'can not find a good commit' unless @good_commit @@ -68,10 +73,10 @@ class GitBisect # run git bisect start use upstream_commit and good_commit # run bisect script get the bisect info def start_bisect - puts "bad_commit: #{@upstream_commit}" + puts "bad_commit: #{@bad_commit}" puts "good_commit: #{@good_commit}" - result = `git -C #{@work_dir} bisect start #{@upstream_commit} #{@good_commit}` + result = `git -C #{@work_dir} bisect start #{@bad_commit} #{@good_commit}` temp = result.split(/\n/) if temp[0].include? 'Bisecting' result = `git -C #{@work_dir} bisect run #{BISECT_RUN_SCRIPT} #{@bad_job_id} "#{@error_id}" #{@work_dir}` @@ -116,6 +121,12 @@ class GitBisect commits.each do |commit| commit_status = get_commit_status_by_job(commit) next unless commit_status + + if commit_status == 'bad' + @bad_commit = commit + next + end + return commit if commit_status == 'good' end -- 2.23.0

1 0

[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