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

[PATCH v3 compass-ci 2/2] scheduler: subqueue: change queue to queue/subqueue
by Ren Wen 11 Dec '20

11 Dec '20

Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/scheduler/close_job.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scheduler/close_job.cr b/src/scheduler/close_job.cr index d071d69..2c33ffd 100644 --- a/src/scheduler/close_job.cr +++ b/src/scheduler/close_job.cr @@ -14,7 +14,7 @@ class Sched end response = @task_queue.hand_over_task( - "sched/#{job.queue}", "extract_stats", job_id + "sched/#{job.queue}/#{job.subqueue}", "extract_stats", job_id ) if response[0] != 201 raise "#{response}" -- 2.23.0

1 0

[PATCH v3 compass-ci 1/2] scheduler: subqueue: submit user's job to subqueue
by Ren Wen 11 Dec '20

11 Dec '20

Every user has a subqueue, user's email by default. Queue will be "queue/subqueue" when submitting job. Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/job.cr | 6 ++++++ src/scheduler/submit_job.cr | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 7ded6d8..0083a7d 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -80,6 +80,7 @@ class Job testbox lab queue + subqueue initrd_pkg initrd_deps initrds_uri @@ -161,6 +162,7 @@ class Job set_lkp_server() set_sshr_info() set_queue() + set_subqueue() end private def set_kernel @@ -266,6 +268,10 @@ class Job end end + private def set_subqueue + self["subqueue"] = self["my_email"] + end + # if not assign tbox_group, set it to a match result from testbox # ?if job special testbox, should we just set tbox_group=textbox private def update_tbox_group_from_testbox diff --git a/src/scheduler/submit_job.cr b/src/scheduler/submit_job.cr index f93ad2b..3909cb7 100644 --- a/src/scheduler/submit_job.cr +++ b/src/scheduler/submit_job.cr @@ -107,7 +107,7 @@ class Sched # success: [{"job_id" => job_id, "message" => "", job_state => "submit"}] # failure: [{"job_id" => "0", "message" => err_msg, job_state => "submit"}] def submit_single_job(job) - queue = job.queue + queue = "#{job.queue}/#{job.subqueue}" # only single job will has "idle job" and "execute rate limiter" if job["idle_job"].empty? -- 2.23.0

1 0

Re: [PATCH v4 compass-ci] doc/job: add result_root.md
by Zhang Yu 11 Dec '20

11 Dec '20

>>+ result_root: /result/host-info/2020-12-09/vm-2p8g/openeuler-20.03-aarch64/crystal.166995 > > the example missing the field $pp_params. good Thanks, Zhangyu > >>-- >>2.23.0 >>

1 0

[PATCH compass-ci] src/scheduler: fix ameba warning
by Zhang Yu 11 Dec '20

11 Dec '20

Inspecting 1 file. create_job_cpio.cr:83:35 [C] Layout/TrailingWhitespace: Trailing whitespace detected > job_content.delete("job2sh") ^ Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- src/scheduler/create_job_cpio.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scheduler/create_job_cpio.cr b/src/scheduler/create_job_cpio.cr index cfa40ab..1101a0f 100644 --- a/src/scheduler/create_job_cpio.cr +++ b/src/scheduler/create_job_cpio.cr @@ -80,7 +80,7 @@ class Sched # put job2sh in an array if job_content.has_key?("job2sh") tmp_job_sh_content = job_content["job2sh"] - job_content.delete("job2sh") + job_content.delete("job2sh") job_sh_array = [] of JSON::Any tmp_job_sh_content.as_h.each do |_key, val| -- 2.23.0

1 0

[PATCH v4 compass-ci] doc/job: add result_root.md
by Zhang Yu 11 Dec '20

11 Dec '20

Add a document for introducing the result_root Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- doc/job/result_root.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/job/result_root.md diff --git a/doc/job/result_root.md b/doc/job/result_root.md new file mode 100644 index 0000000..c2b82c5 --- /dev/null +++ b/doc/job/result_root.md @@ -0,0 +1,10 @@ +# result_root + +Meaning: +- When a test job is executed, some result files will be generated and stored in the "result_root" + directory, you can check the result file in the web page or manually go to the "result_root" + directory for a check +- The default value of this field is: + result_root: /result/$suite/$submit_date/$tbox_group/$rootfs/$pp_params/$id + Here is an example of this field: + result_root: /result/host-info/2020-12-09/vm-2p8g/openeuler-20.03-aarch64/crystal.166995 -- 2.23.0

1 0

[PATCH v3 compass-ci] doc/job: add result_root.md
by Zhang Yu 11 Dec '20

11 Dec '20

Add a document for introducing the result_root Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- doc/job/result_root.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/job/result_root.md diff --git a/doc/job/result_root.md b/doc/job/result_root.md new file mode 100644 index 0000000..c3e0a01 --- /dev/null +++ b/doc/job/result_root.md @@ -0,0 +1,8 @@ +# result_root + +Meaning: +- When a test job is executed, some result file will generated and stored in the "result_root" + directory, you can check the result file in the web page or manually go to the "result_root" + directory for a check +- The default value of this field is: + result_root: "/result/#{suite}/#{submit_date}/#{tbox_group}/#{rootfs}"/#{pp_params}/#{id}" -- 2.23.0

2 2

[PATCH v2 compass-ci] container: add prompt message
by Bai Jing 11 Dec '20

11 Dec '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- container/conserver/generate_conserver.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/container/conserver/generate_conserver.rb b/container/conserver/generate_conserver.rb index 4e923c2..a0ee23b 100755 --- a/container/conserver/generate_conserver.rb +++ b/container/conserver/generate_conserver.rb @@ -12,9 +12,12 @@ def generate_conserver(lab) return unless File.exist?('conserver-head.cf') FileUtils.cp('conserver-head.cf', 'conserver.cf') - + host_dir = "#{CCI_REPOS}/lab-#{lab}/hosts/" - return unless Dir.exist?(host_dir) + unless Dir.exist?(host_dir) + puts "please check whether the #{host_dir} directory exists " + return + end Dir.each_child(host_dir) do |host| ipmi_ip = YAML.load_file("#{host_dir}#{host}")['ipmi_ip'] -- 2.23.0

1 0

[PATCH compass-ci] How to add a machine to compass-ci
by Zhang Dewan 10 Dec '20

10 Dec '20

Signed-off-by: Zhang Dewan <513619464(a)qq.com> How a new machine add to compass-ci Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- ...00\350\210\254\350\277\207\347\250\213.md" | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 "doc/manual/\346\267\273\345\212\240\346\234\272\345\231\250\345\210\260compass-ci\347\232\204\344\270\200\350\210\254\350\277\207\347\250\213.md" diff --git "a/doc/manual/\346\267\273\345\212\240\346\234\272\345\231\250\345\210\260compass-ci\347\232\204\344\270\200\350\210\254\350\277\207\347\250\213.md" "b/doc/manual/\346\267\273\345\212\240\346\234\272\345\231\250\345\210\260compass-ci\347\232\204\344\270\200\350\210\254\350\277\207\347\250\213.md" new file mode 100644 index 0000000..340ffea --- /dev/null +++ "b/doc/manual/\346\267\273\345\212\240\346\234\272\345\231\250\345\210\260compass-ci\347\232\204\344\270\200\350\210\254\350\277\207\347\250\213.md" @@ -0,0 +1,54 @@ + +��--�� + +## ��: +- ��compass-ci +- ��scheduler�� + +## �� +### 1. �� +��z9��redis-db. + +x.x.x.x:xxxx> `hgetall "sched/mac2host"` # ��redis, �� + +### 2. �� +��scheduler�� +`curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}"` +`curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host2queues?host=${hostname}&queues=${api_queues}"` + +��mac��hostname��api_queues + +#### 2.1 �� +##### 2.1.1 mac +��mac�� + +###### 2.1.1.1 ��mac��TaiShan�� +- ��bmc��--��--��--��--��--port1�� +- ��bios��Advanced--Network Device List�� +- ��bmc�� +`ipmitool -I lanplus -H $cur_ip -U $iBMC_user -P $iBMC_passwd raw 0x30 0x90 0x01 0x03 0x0${nic_idx} 0x00|awk '{print $5,$6,$7,$8,$9,$10}' |sed 's/\s/\-/g'` +- ��os�� +`ip link | grep "^2:" -A 1| grep link |awk '{print $2}` + +##### 2.1.2 hostname +��mac��hostname�� + +###### 2.1.2.1 ��hostname��Taishan�� +` taishan200-2280-${cpuNum}s${coreNum}p-${memSize:-256}g--${aN}` +> taishan200-2280 �� +> cpuNum cpu�� +> coreNum cpu�� +> memSize �� +> aN �� + +#### 2.1.3 api_queues +��hostname�� +��taishan200-2280-2s64p-256g--a100, ��api_queues��taishan200-2280-2s64p-256g + +## �� +### 1. �� +��pxe��scheduler�� + +### 2. ��PXE�� +- ��pxe�� +- �� -- 2.23.0

2 1

[PATCH lkp-tests] bisect: bisect test use top level key
by Cao Xueliang 10 Dec '20

10 Dec '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- jobs/bisect.yaml | 2 -- tests/bisect | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/jobs/bisect.yaml b/jobs/bisect.yaml index 8b0001df..5fab30bf 100644 --- a/jobs/bisect.yaml +++ b/jobs/bisect.yaml @@ -2,5 +2,3 @@ suite: bisect docker_image: delimiter:latest testbox: dc-1g--delimiter bisect: - job_id: - error_id: diff --git a/tests/bisect b/tests/bisect index ab280b95..33303296 100755 --- a/tests/bisect +++ b/tests/bisect @@ -1,13 +1,13 @@ #!/usr/bin/env ruby -# - job_id -# - error_id +# bad_job_id +# error_id # SPDX-License-Identifier: MulanPSL-2.0+ # frozen_string_literal: true require_relative "#{ENV['CCI_SRC']}/lib/git_bisect" require_relative "#{ENV['CCI_SRC']}/lib/mail_bisect_result" -task = {'job_id' => ENV['job_id'], 'error_id' => ENV['error_id']} +task = {'bad_job_id' => ENV['bad_job_id'], 'error_id' => ENV['error_id']} gb = GitBisect.new(task) result = gb.find_first_bad_commit -- 2.23.0

1 0

[PATCH compass-ci] container: add prompt message
by Bai Jing 10 Dec '20

10 Dec '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- container/conserver/generate_conserver.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/container/conserver/generate_conserver.rb b/container/conserver/generate_conserver.rb index 4e923c2..8914247 100755 --- a/container/conserver/generate_conserver.rb +++ b/container/conserver/generate_conserver.rb @@ -12,9 +12,12 @@ def generate_conserver(lab) return unless File.exist?('conserver-head.cf') FileUtils.cp('conserver-head.cf', 'conserver.cf') - + host_dir = "#{CCI_REPOS}/lab-#{lab}/hosts/" - return unless Dir.exist?(host_dir) + unless Dir.exist?(host_dir) do + puts "please check whether the #{host_dir} directory exists " + return + end Dir.each_child(host_dir) do |host| ipmi_ip = YAML.load_file("#{host_dir}#{host}")['ipmi_ip'] -- 2.23.0

1 0