- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] container: change the log storage path on the host machine
by Bai Jing 09 Dec '20

09 Dec '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- container/conserver/start | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/conserver/start b/container/conserver/start index 58b2242..ae44291 100755 --- a/container/conserver/start +++ b/container/conserver/start @@ -25,7 +25,7 @@ cmd=( -e "IPMI_PASSWORD=${passwd}" --name conserver_server -v /etc/localtime:/etc/localtime:ro - -v /srv/cci/serial/logs/:/var/consoles/ + -v /srv/cci/serial/logs/:/srv/cci/serial/logs/ -p 782:782 conserver_server ) -- 2.23.0

3 4

[PATCH v2 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

1 0

[PATCH lkp-tests 5/5] sbin/install-dependencies.sh: modify the way to add Ruby env-variables
by Hu Xuejiao 08 Dec '20

08 Dec '20

Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- sbin/install-dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/install-dependencies.sh b/sbin/install-dependencies.sh index 7df3652f..0ea852c7 100644 --- a/sbin/install-dependencies.sh +++ b/sbin/install-dependencies.sh @@ -1,6 +1,7 @@ #!/bin/bash . lib/env.sh +. lin/set-env.sh # choose install function base on # DISTRIBUTION @@ -30,8 +31,7 @@ esac mac_dep() { brew install ruby - echo "export PATH=/usr/local/opt/ruby/bin:$PATH" >> $(shell_profile) - source $(shell_profile) + submit_env "export PATH=/usr/local/opt/ruby/bin:$PATH" gem install git activesupport rest-client } -- 2.23.0

2 1

[PATCH lkp-tests] daemon/sshd: remove $testbox and format adjustment
by Zhang Yale 08 Dec '20

08 Dec '20

Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- daemon/sshd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/daemon/sshd b/daemon/sshd index c7d7b60c..3764b19e 100755 --- a/daemon/sshd +++ b/daemon/sshd @@ -27,8 +27,9 @@ data_success() Subject: [NOTIFY Compass-ci] $testbox ready to use Dear $my_username: + Thanks for your participation in software ecosystem! - According to your application, $testbox has been provisioned. + According to your application, the machine has been provisioned. The datails are as follows: Login: @@ -53,6 +54,7 @@ data_failure() Subject: [NOTIFY Compass-ci] Applying $testbox failed Dear $my_username: + Sorry to inform you that your application failed. You may need to wait a moment, or check whether your pub_key exists. -- 2.23.0

1 0

[PATCH lkp-tests] Automatic compilation and configure the variables
by Hu Xuejiao 08 Dec '20

08 Dec '20

[why] Source shell_file based on different shells. Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- install.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 install.sh diff --git a/install.sh b/install.sh new file mode 100644 index 00000000..fb3f2e18 --- /dev/null +++ b/install.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +. lib/env.sh + +make +source $(shell_profile) -- 2.23.0

2 1

[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