September 2020 - Compass-ci - mailweb.openeuler.org

[PATCH lkp-tests 2/2] hosts: add vm-aarch64-*
by Wu Fengguang 30 Sep '20

30 Sep '20

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- hosts/vm-aarch64-1p1g | 6 ++++++ hosts/vm-aarch64-2p1g | 6 ++++++ hosts/vm-aarch64-2p4g | 6 ++++++ hosts/vm-aarch64-2p8g | 6 ++++++ hosts/vm-pxe-aarch64-1p1g | 6 ++++++ hosts/vm-pxe-aarch64-2p1g | 6 ++++++ hosts/vm-pxe-aarch64-2p4g | 6 ++++++ hosts/vm-pxe-aarch64-2p8g | 6 ++++++ 8 files changed, 48 insertions(+) create mode 100644 hosts/vm-aarch64-1p1g create mode 100644 hosts/vm-aarch64-2p1g create mode 100644 hosts/vm-aarch64-2p4g create mode 100644 hosts/vm-aarch64-2p8g create mode 100644 hosts/vm-pxe-aarch64-1p1g create mode 100644 hosts/vm-pxe-aarch64-2p1g create mode 100644 hosts/vm-pxe-aarch64-2p4g create mode 100644 hosts/vm-pxe-aarch64-2p8g diff --git a/hosts/vm-aarch64-1p1g b/hosts/vm-aarch64-1p1g new file mode 100644 index 00000000..b7a53601 --- /dev/null +++ b/hosts/vm-aarch64-1p1g @@ -0,0 +1,6 @@ +provider: qemu +template: kvm +arch: aarch64 +nr_node: 1 +nr_cpu: 1 +memory: 1G diff --git a/hosts/vm-aarch64-2p1g b/hosts/vm-aarch64-2p1g new file mode 100644 index 00000000..08d0c25c --- /dev/null +++ b/hosts/vm-aarch64-2p1g @@ -0,0 +1,6 @@ +provider: qemu +template: kvm +arch: aarch64 +nr_node: 1 +nr_cpu: 2 +memory: 1G diff --git a/hosts/vm-aarch64-2p4g b/hosts/vm-aarch64-2p4g new file mode 100644 index 00000000..d57774b9 --- /dev/null +++ b/hosts/vm-aarch64-2p4g @@ -0,0 +1,6 @@ +provider: qemu +template: kvm +arch: aarch64 +nr_node: 1 +nr_cpu: 2 +memory: 4G diff --git a/hosts/vm-aarch64-2p8g b/hosts/vm-aarch64-2p8g new file mode 100644 index 00000000..40fe2716 --- /dev/null +++ b/hosts/vm-aarch64-2p8g @@ -0,0 +1,6 @@ +provider: qemu +template: kvm +arch: aarch64 +nr_node: 1 +nr_cpu: 2 +memory: 8G diff --git a/hosts/vm-pxe-aarch64-1p1g b/hosts/vm-pxe-aarch64-1p1g new file mode 100644 index 00000000..554e8fb1 --- /dev/null +++ b/hosts/vm-pxe-aarch64-1p1g @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +arch: aarch64 +nr_node: 1 +nr_cpu: 1 +memory: 1G diff --git a/hosts/vm-pxe-aarch64-2p1g b/hosts/vm-pxe-aarch64-2p1g new file mode 100644 index 00000000..27b8438b --- /dev/null +++ b/hosts/vm-pxe-aarch64-2p1g @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +arch: aarch64 +nr_node: 1 +nr_cpu: 2 +memory: 1G diff --git a/hosts/vm-pxe-aarch64-2p4g b/hosts/vm-pxe-aarch64-2p4g new file mode 100644 index 00000000..c31dd953 --- /dev/null +++ b/hosts/vm-pxe-aarch64-2p4g @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +arch: aarch64 +nr_node: 1 +nr_cpu: 2 +memory: 4G diff --git a/hosts/vm-pxe-aarch64-2p8g b/hosts/vm-pxe-aarch64-2p8g new file mode 100644 index 00000000..3687d460 --- /dev/null +++ b/hosts/vm-pxe-aarch64-2p8g @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +arch: aarch64 +nr_node: 1 +nr_cpu: 2 +memory: 8G -- 2.23.0

1 1

[PATCH lkp-tests 1/2] hosts: rename dc-* to dc-aarch64-*
by Wu Fengguang 30 Sep '20

30 Sep '20

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- hosts/{dc-1g => dc-aarch64-1g} | 0 hosts/{dc-2g => dc-aarch64-2g} | 0 hosts/{dc-4g => dc-aarch64-4g} | 0 hosts/{dc-8g => dc-aarch64-8g} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename hosts/{dc-1g => dc-aarch64-1g} (100%) rename hosts/{dc-2g => dc-aarch64-2g} (100%) rename hosts/{dc-4g => dc-aarch64-4g} (100%) rename hosts/{dc-8g => dc-aarch64-8g} (100%) diff --git a/hosts/dc-1g b/hosts/dc-aarch64-1g similarity index 100% rename from hosts/dc-1g rename to hosts/dc-aarch64-1g diff --git a/hosts/dc-2g b/hosts/dc-aarch64-2g similarity index 100% rename from hosts/dc-2g rename to hosts/dc-aarch64-2g diff --git a/hosts/dc-4g b/hosts/dc-aarch64-4g similarity index 100% rename from hosts/dc-4g rename to hosts/dc-aarch64-4g diff --git a/hosts/dc-8g b/hosts/dc-aarch64-8g similarity index 100% rename from hosts/dc-8g rename to hosts/dc-aarch64-8g -- 2.23.0

1 0

[PATCH v4 compass-ci] container: consider the situation that GITCACHE_HOST is undefined
by Hu Xuejiao 30 Sep '20

30 Sep '20

- "[ -n $GITCACHE_HOST ] && ... " if $GITCACHE_HOST is none, process will exit 1 - "[ -z $GITCACHE_HOST ] || ... " if $GITCACHE_HOST is none, process will keep executing. Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- container/crystal-shards/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/crystal-shards/Dockerfile b/container/crystal-shards/Dockerfile index 0c5713c..bdc5b66 100644 --- a/container/crystal-shards/Dockerfile +++ b/container/crystal-shards/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER chief <taxcom(a)tom.com> ARG GITCACHE_HOST ARG GITCACHE_PORT -RUN [ -n "$GITCACHE_HOST" ] && echo -e "[url \"http://$GITCACHE_HOST:${GITCACHE_PORT:-5000}/\"]\n\tinsteadOf = https://" >> /etc/gitconfig +RUN [ -z "$GITCACHE_HOST" ] || echo -e "[url \"http://$GITCACHE_HOST:${GITCACHE_PORT:-5000}/\"]\n\tinsteadOf = https://" >> /etc/gitconfig copy shard.yml /usr/share/crystal/app/shard.yml -- 2.23.0

1 0

[PATCH v2 lkp-tests] sshd: send emails to provide login services for users
by Zhang Yale 30 Sep '20

30 Sep '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- daemon/sshd | 61 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 20 deletions(-) diff --git a/daemon/sshd b/daemon/sshd index 98f31d77..f921a7e5 100755 --- a/daemon/sshd +++ b/daemon/sshd @@ -1,6 +1,10 @@ #!/bin/sh # pub_key # email +# uuid + +. $LKP_SRC/lib/transfer_port.sh +. $LKP_SRC/lib/http.sh run_ssh() { @@ -11,40 +15,57 @@ run_ssh() systemctl start sshd } -compose_email() +data_success() { - deadline=$(date -d "+$runtime seconds" +"%Y-%m-%d %H:%M:%S") data="To: $email -Subject: [NOTIFY compass-ci] $testbox ready to ssh +Subject: [NOTIFY Compass-ci] $testbox ready to use -Dear $email: - Thanks for your participation in Kunpeng and software ecosystem! - According to your application, $testbox has been provisioned. - The datails are as follows: +Dear $user_name: + Thanks for your participation in software ecosystem! + According to your application, $testbox has been provisioned. + The datails are as follows: - Login: - ssh root@$PUB_IP - Due time: - $deadline + login: ssh root(a)api.compass-ci.openeuler.org -p $port + Due time: $deadline - HW: - nr_cpu: $nr_cpu - memory: $memory - testbox: $testbox - OS: - $os $os_version $os_arch +Regards +Compass-ci +" +} + +data_failure() +{ + data="To: $email +Subject: [NOTIFY Compass-ci] Applying $testbox failed + +Dear $user_name: + Sorry to inform you that your application failed. + You may need to wait for a while and then thy again. Regards -compass-ci +Compass-ci " } +compose_email() +{ + deadline=$(date -d "+$runtime seconds" +"%Y-%m-%d %H:%M:%S") + if [ -n "$port" ]; then + data_success + else + data_failure + fi +} + run_email() { - [ -n "$email" ] || return 0 + [ -n "$email" ] && [ -n "$uuid" ] || return 0 + user_name=$(echo "$email" | awk -F '@' '{print $1}') compose_email - curl -XPOST "$MAIL_HOST:$MAIL_PORT/send_mail_text" -d "$data" + curl -XPOST "${MAIL_HOST:-$LKP_SERVER}:${MAIL_PORT:-11312}/send_mail_text" -d "$data" } run_ssh +port=$(get_port) +report_ssh_port $port run_email -- 2.23.0

1 0

[PATCH v2 compass-ci] container/srv-http forbid access parent directory of job result_root
by Lu Weitao 30 Sep '20

30 Sep '20

by forbid access level 1, 2, 4 directory of /srv/result Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- container/srv-http/root/etc/nginx/conf.d/default.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/container/srv-http/root/etc/nginx/conf.d/default.conf b/container/srv-http/root/etc/nginx/conf.d/default.conf index 53833eb..2bf55b6 100644 --- a/container/srv-http/root/etc/nginx/conf.d/default.conf +++ b/container/srv-http/root/etc/nginx/conf.d/default.conf @@ -19,4 +19,8 @@ server { add_header Content-Type text/plain; } } + + location ~* ^/result/(([^/]+)?/?|[^/]+/[^/]+/[^/]+/?)$ { + deny all; + } } -- 2.23.0

1 0

[PATCH v2 compass-ci] fix: sched: submit idle jobs
by Ren Wen 30 Sep '20

30 Sep '20

1) submit all idles jobs once use '*' -> submit each idle job once until all done. 2) add two fields into job if job's filename is 'multi-qemu.yaml'. 3) add field 'idle_job' for idle jobs, value is always 'true'. Two extra fields are used for: monitoring logs of virtual machines started by physical machine. Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 15f5c9e..984c7db 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -467,10 +467,20 @@ class Sched end def auto_submit_idle_job(tbox_group) - full_path_patterns = "#{ENV["CCI_REPOS"]}/lab-#{ENV["lab"]}/allot/idle/#{tbox_group}/*.yaml" - Jobfile::Operate.auto_submit_job( - full_path_patterns, - "testbox: #{tbox_group}") if Dir.glob(full_path_patterns).size > 0 + idle_job_path = "#{ENV["CCI_REPOS"]}/lab-#{ENV["lab"]}/allot/idle/#{tbox_group}/" + + if Dir.exists?(idle_job_path) + jobs = Dir[idle_job_path + "*.yaml"] + + jobs.each do |job| + extra_job_fields = ["idle_job=true"] + if Path[job].basename == "multi-qemu.yaml" + extra_job_fields += ["FLUENTD_SERVER_HOST=#{ENV["FLUENTD_SERVER_HOST"]}", + "FLUENTD_SERVER_PORT=#{ENV["FLUENTD_SERVER_PORT"]}"] + end + Jobfile::Operate.auto_submit_job(job, "testbox: #{tbox_group}", extra_job_fields) + end + end end private def add_kernel_console_param(arch_tmp) @@ -520,7 +530,7 @@ class Sched "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{job.os_dir}/vmlinuz")}" else response += "kernel #{os_http_prefix}" + - "#{JobHelper.service_path("#{SRV_OS}/#{job.os_dir}/vmlinuz")}" + "#{JobHelper.service_path("#{SRV_OS}/#{job.os_dir}/vmlinuz")}" end response += " user=lkp" response += " job=/lkp/scheduled/job.yaml RESULT_ROOT=/result/job rootovl ip=dhcp ro" -- 2.23.0

3 7

[PATCH v3 compass-ci] src/extract-stats deal with potential exceptions
by Lu Weitao 30 Sep '20

30 Sep '20

background: extract-stats process is at risk of be interrupted, due to other dependent services(task-queue, es_client) may not working properly solution: 1. use begin ... rescue to handle potential exceptions - when ES and task-queue not working properly, sleep 10s and visit again - when "result_root" does not exist, skip and remove task from task-queue 2. refactor for consume_sched_queue() of stats_worker.cr Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- src/extract-stats/stats_worker.cr | 60 ++++++++++++++++++------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/src/extract-stats/stats_worker.cr b/src/extract-stats/stats_worker.cr index fcba6af..2af07d4 100644 --- a/src/extract-stats/stats_worker.cr +++ b/src/extract-stats/stats_worker.cr @@ -18,40 +18,50 @@ class StatsWorker def consume_sched_queue(queue_path : String) loop do begin - response = @tq.consume_task(queue_path) + job_id = get_job_id(queue_path) + if job_id # will consume the job by post-processing + job = @es.get_job_content(job_id) + result_root = job["result_root"]? + result_post_processing(job_id, result_root.to_s, queue_path) + @tq.delete_task(queue_path + "/in_process", "#{job_id}") + end rescue e STDERR.puts e.message - # incase of many error message when task-queue is busy + # incase of many error message when task-queue, ES does not work sleep(10) - next end + end + end - if response[0] == 200 - job_id = JSON.parse(response[1].to_json)["id"] - job = @es.get_job_content(job_id.to_s) - result_root = job["result_root"] - begin - # extract stats.json - system "#{ENV["CCI_SRC"]}/sbin/result2stats #{result_root}" - # storage stats to job in es - store_stats_es(result_root.to_s, job_id.to_s) if result_root - # send mail to submitter for job results - system "#{ENV["CCI_SRC"]}/sbin/mail-job #{job_id}" - rescue e - STDERR.puts e.message - next - end - - @tq.delete_task(queue_path + "/in_process", "#{job_id}") - else - sleep(60) - end + # get job_id from task-queue + def get_job_id(queue_path : String) + response = @tq.consume_task(queue_path) + if response[0] == 200 + JSON.parse(response[1].to_json)["id"].to_s + else + # will sleep 60s if no task in task-queue + sleep(60) + nil end end - def store_stats_es(result_root : String, job_id : String) + def result_post_processing(job_id : String, result_root : String, queue_path : String) + return nil unless result_root && File.exists?(result_root) + + # extract stats.json + system "#{ENV["CCI_SRC"]}/sbin/result2stats #{result_root}" + # storage stats to job in es + store_stats_es(result_root, job_id, queue_path) + # send mail to submitter for job results + system "#{ENV["CCI_SRC"]}/sbin/mail-job #{job_id}" + end + + def store_stats_es(result_root : String, job_id : String, queue_path : String) stats_path = "#{result_root}/stats.json" - raise "#{stats_path} file not exists." unless File.exists?(stats_path) + unless File.exists?(stats_path) + @tq.delete_task(queue_path + "/in_process", "#{job_id}") + raise "#{stats_path} file not exists." + end stats = File.open(stats_path) do |file| JSON.parse(file) -- 2.23.0

1 0

[PATCH compass-ci] container: crystal-shards: fix build error
by Liu Yinsi 30 Sep '20

30 Sep '20

build crystal-shards depends gitcache, When build crystal-shards, error message as follows: Step 8/12 : RUN shards ---> Running in be90213caa48 Resolving dependencies Fetching https://github.com/kemalcr/kemal.git Failed to clone https://github.com/kemalcr/kemal.git The command '/bin/sh -c shards' returned a non-zero code: 1 Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- container/crystal-shards/build-depends | 1 + 1 file changed, 1 insertion(+) diff --git a/container/crystal-shards/build-depends b/container/crystal-shards/build-depends index 6627b6f..6eed7ec 100755 --- a/container/crystal-shards/build-depends +++ b/container/crystal-shards/build-depends @@ -1 +1,2 @@ crystal-base +gitcache -- 2.23.0

1 0

[PATCH compass-ci] sparrow/install-tiny: fix process exit
by Liu Yinsi 30 Sep '20

30 Sep '20

-e will cause process exit when return code is not 0, only use when debugging. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/install-tiny | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sparrow/install-tiny b/sparrow/install-tiny index 1c0b5d2..a291549 100755 --- a/sparrow/install-tiny +++ b/sparrow/install-tiny @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. # For your reference only. -- 2.23.0

1 0

[PATCH compass-ci] fix: sched: add idle job to idle queue
by Ren Wen 30 Sep '20

30 Sep '20

Add idle job to idle queue, then idle machine find job in idle queue. For example: when idle job under "allot/idle/vm-hi1620-2p8g", queue should be: "queues/sched/vm-hi1620-2p8g/idle" Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 309df04..47a2e54 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -266,7 +266,7 @@ class Sched }] unless tbox_group # only single job will has "idle job" and "execute rate limiter" - if %<job["job_origin"]>.includes?("allot/idle/") + unless job["idle_job"].empty? tbox_group = "#{tbox_group}/idle" else tbox_group += "#{job.get_uuid_tag}" -- 2.23.0

1 0