- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] result-webdav/nginx.conf: error 500 at the second request
by Cui Yili 17 Dec '20

17 Dec '20

[why] the table in the function split is used as a variable elsewhere. error: Attempt to call field 'insert' (a nil value) [how] table => dirs Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/result-webdav/nginx.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/container/result-webdav/nginx.conf b/container/result-webdav/nginx.conf index af27653..8b54314 100644 --- a/container/result-webdav/nginx.conf +++ b/container/result-webdav/nginx.conf @@ -61,13 +61,13 @@ http { ngx.exit(ngx.HTTP_FORBIDDEN) end - if string.find(res, ",") then - table = split(res,",") - for i = 1, #table do - if string.find(path, table[i]) then + if string.find(res, ",", 1, true) then + dirs = split(res, ",") + for i = 1, #dirs do + if string.find(path, dirs[i], 1, true) then return end - end + end else if string.find(path, res, 1, true) then return -- 2.23.0

2 1

[PATCH v1 compass-ci] delimiter: optimize delimiter utils function
by Cao Xueliang 17 Dec '20

17 Dec '20

1. Delete redundant bad job fields. 2. Add to make /tmp/lkp/result dir. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/delimiter/utils.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/delimiter/utils.rb b/src/delimiter/utils.rb index b60ada0..e87bbbe 100644 --- a/src/delimiter/utils.rb +++ b/src/delimiter/utils.rb @@ -108,8 +108,11 @@ module Utils job.delete('error_ids') job.delete('start_time') + job.delete('job_state') job.delete('end_time') job.delete('loadavg') + job.delete('stats') + job.delete('id') return job end @@ -123,6 +126,7 @@ module Utils end def create_bisect_log(git_dir) + FileUtils.mkdir_p TMP_RESULT_ROOT unless File.exist? TMP_RESULT_ROOT log_file = File.join(TMP_RESULT_ROOT, "bisect.log") log_content = parse_bisect_log(git_dir) File.open(log_file, 'w') do |f| -- 2.23.0

1 0

[PATCH compass-ci] delimiter: optimize delimiter utils function
by Cao Xueliang 17 Dec '20

17 Dec '20

1. Delete redundant bad job fields. 2. Add to make /tmp/lkp/result dir. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/delimiter/utils.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/delimiter/utils.rb b/src/delimiter/utils.rb index b60ada0..e87bbbe 100644 --- a/src/delimiter/utils.rb +++ b/src/delimiter/utils.rb @@ -108,8 +108,11 @@ module Utils job.delete('error_ids') job.delete('start_time') + job.delete('job_state') job.delete('end_time') job.delete('loadavg') + job.delete('stats') + job.delete('id') return job end @@ -123,6 +126,7 @@ module Utils end def create_bisect_log(git_dir) + FileUtils.mkdir_p TMP_RESULT_ROOT unless File.exist? TMP_RESULT_ROOT log_file = File.join(TMP_RESULT_ROOT, "bisect.log") log_content = parse_bisect_log(git_dir) File.open(log_file, 'w') do |f| -- 2.23.0

1 1

[PATCH v2 lkp-tests] tests: fix error when running host-info in vm
by Zhang Yu 17 Dec '20

17 Dec '20

Error: Could not open device at /dev/ipmi0 or /dev/ipmi/0 or /dev/ipmidev/0: No such file or directory Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- tests/host-info | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/host-info b/tests/host-info index 0ab8e6c97..d1d0df449 100755 --- a/tests/host-info +++ b/tests/host-info @@ -102,11 +102,9 @@ get_ipmi_ip() # 802.1q VLAN ID : Disabled # RMCP+ Cipher Suites : 0,1,2,3,17 # Cipher Suite Priv Max : XuuaXXXXXXXXXXX - is_virt && return - is_docker && return + [ -e /dev/ipmi0 ] || [ -e /dev/ipmi/0 ] || [ -e /dev/ipmidev/0 ] && return local ip=$(ipmitool lan print | awk 'NR==3{print $4}') [ -n "$ip" ] && echo "ipmi_ip: $ip" - } main() -- 2.23.0

2 2

[PATCH v1 compass-ci] delimiter: error id use inspect to avoid special characters
by Cao Xueliang 17 Dec '20

17 Dec '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/git_bisect.rb | 2 +- src/delimiter/delimiter.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/git_bisect.rb b/lib/git_bisect.rb index 97ad467..bc1e035 100644 --- a/lib/git_bisect.rb +++ b/lib/git_bisect.rb @@ -79,7 +79,7 @@ class GitBisect 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}` + result = `git -C #{@work_dir} bisect run #{BISECT_RUN_SCRIPT} #{@bad_job_id} #{(a)error_id.inspect} #{@work_dir}` end Utils.create_bisect_log(@work_dir) FileUtils.rm_r(@work_dir) if Dir.exist?(@work_dir) diff --git a/src/delimiter/delimiter.rb b/src/delimiter/delimiter.rb index c1922e2..bf36db3 100644 --- a/src/delimiter/delimiter.rb +++ b/src/delimiter/delimiter.rb @@ -25,7 +25,7 @@ class Delimiter next end - %x(#{LKP_SRC}/sbin/submit bad_job_id=#{task['job_id']} error_id=#{task['error_id']} bisect.yaml) + %x(#{LKP_SRC}/sbin/submit bad_job_id=#{task['job_id']} error_id=#{task['error_id'].inspect} bisect.yaml) rescue StandardError => e puts e sleep(60) -- 2.23.0

1 0

[PATCH compass-ci] delimiter: error id use inspect to avoid special characters
by Cao Xueliang 17 Dec '20

17 Dec '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/git_bisect.rb | 2 +- src/delimiter/delimiter.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/git_bisect.rb b/lib/git_bisect.rb index 97ad467..bc1e035 100644 --- a/lib/git_bisect.rb +++ b/lib/git_bisect.rb @@ -79,7 +79,7 @@ class GitBisect 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}` + result = `git -C #{@work_dir} bisect run #{BISECT_RUN_SCRIPT} #{@bad_job_id} #{(a)error_id.inspect} #{@work_dir}` end Utils.create_bisect_log(@work_dir) FileUtils.rm_r(@work_dir) if Dir.exist?(@work_dir) diff --git a/src/delimiter/delimiter.rb b/src/delimiter/delimiter.rb index c1922e2..cb2ed6c 100644 --- a/src/delimiter/delimiter.rb +++ b/src/delimiter/delimiter.rb @@ -25,7 +25,7 @@ class Delimiter next end - %x(#{LKP_SRC}/sbin/submit bad_job_id=#{task['job_id']} error_id=#{task['error_id']} bisect.yaml) + %x(#{LKP_SRC}/sbin/submit bad_job_id=#{task['job_id']} error_id=\'#{task['error_id']}\' bisect.yaml) rescue StandardError => e puts e sleep(60) -- 2.23.0

1 1

Re: [PATCH lkp-tests] daemon: add the local execution permission
by Bai Jing 17 Dec '20

17 Dec '20

title can be : add the execute permission Thanks, Baijing Reply-To: In-Reply-To: <20201217061232.1480336-1-1034502035(a)qq.com> On Thu, Dec 17, 2020 at 02:12:32PM +0800, Hu Xuejiao wrote: >Signed-off-by: Hu XueJiao <1034502035(a)qq.com> >--- > daemon/multi-docker | 2 +- > daemon/multi-qemu | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > >diff --git a/daemon/multi-docker b/daemon/multi-docker >index b39506b6..257645b8 100755 >--- a/daemon/multi-docker >+++ b/daemon/multi-docker >@@ -8,7 +8,7 @@ > > multi_docker() > { >- export CCI_SRC=/c/compass-ci >+ export CCI_SRC=${CCI_SRC:-"/c/compass-ci"} > local hostname=$tbox_group.$HOSTNAME > $CCI_SRC/providers/multi-docker -n $hostname -c $nr_container -q $queues > } >diff --git a/daemon/multi-qemu b/daemon/multi-qemu >index aa2348b4..55b96c8e 100755 >--- a/daemon/multi-qemu >+++ b/daemon/multi-qemu >@@ -10,7 +10,7 @@ > > multi_qemu() > { >- export CCI_SRC=/c/compass-ci >+ export CCI_SRC=${CCI_SRC:-"/c/compass-ci"} > local hostname=$tbox_group.$HOSTNAME > > cd "$CACHE_DIR" >-- >2.23.0 >

1 0

[PATCH v2 compass-ci] sbin/es-jobs-mapping.sh: update pp.sleep mapping
by Lu Weitao 17 Dec '20

17 Dec '20

[Why] bellow doc will be store to ES { ... "pp":{ "sleep": 3600 } } or { .. "pp": { "sleep": {"runtime": 3600} } } both type doc will cause mapper-parsing-exceptions Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- sbin/es-jobs-mapping.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbin/es-jobs-mapping.sh b/sbin/es-jobs-mapping.sh index 5cb9b9c..b43625e 100755 --- a/sbin/es-jobs-mapping.sh +++ b/sbin/es-jobs-mapping.sh @@ -79,6 +79,10 @@ else "dynamic": true, "properties": {} }, + "pp.sleep":{ + "type": "object", + "enabled": false + }, "suite": { "type": "keyword" }, -- 2.23.0

1 0

[PATCH compass-ci] sbin/es-jobs-mapping.sh: update
by Lu Weitao 17 Dec '20

17 Dec '20

[Why] bellow doc will be store to ES { ... "pp":{ "sleep": 3600 } } or { .. "pp": { "sleep": {"runtime": 3600} } } both type doc will cause mapper-parsing-exceptions Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- sbin/es-jobs-mapping.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbin/es-jobs-mapping.sh b/sbin/es-jobs-mapping.sh index 5cb9b9c..5713cbf 100755 --- a/sbin/es-jobs-mapping.sh +++ b/sbin/es-jobs-mapping.sh @@ -79,6 +79,10 @@ else "dynamic": true, "properties": {} }, + "pp.sleep":{ + "type": "object", + "enabled": false + }, "suite": { "type": "keyword" }, -- 2.23.0

3 4

[PATCH v2 lkp-tests] daemon: add the local execution permission
by Hu Xuejiao 17 Dec '20

17 Dec '20

Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- daemon/multi-docker | 2 +- daemon/multi-qemu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/multi-docker b/daemon/multi-docker index b39506b6..257645b8 100755 --- a/daemon/multi-docker +++ b/daemon/multi-docker @@ -8,7 +8,7 @@ multi_docker() { - export CCI_SRC=/c/compass-ci + export CCI_SRC=${CCI_SRC:-"/c/compass-ci"} local hostname=$tbox_group.$HOSTNAME $CCI_SRC/providers/multi-docker -n $hostname -c $nr_container -q $queues } diff --git a/daemon/multi-qemu b/daemon/multi-qemu index aa2348b4..55b96c8e 100755 --- a/daemon/multi-qemu +++ b/daemon/multi-qemu @@ -10,7 +10,7 @@ multi_qemu() { - export CCI_SRC=/c/compass-ci + export CCI_SRC=${CCI_SRC:-"/c/compass-ci"} local hostname=$tbox_group.$HOSTNAME cd "$CACHE_DIR" -- 2.23.0

1 0