- Compass-ci - mailweb.openeuler.org

git count
by Wu Fengguang 18 Dec '20

18 Dec '20

Shengde is our code star again, thanks Shengde! wfg@crystal ~/todo% bin/git-count 14 Luan Shengde 13 Cao Xueliang 12 Wu Fengguang 10 Liu Yinsi 10 Sun Yukui 10 Wu Zhende 8 Ren Wen 7 Zhang Yu 7 Li Yuanchao 6 Cui Yili 6 Wang Chenglong 6 Lu Kaiyi 5 Liu Shaofei 5 Lu Weitao 5 Wei Jihui 5 Yu Chuan 5 Wang Yong 4 Hu Xuejiao 3 Bai Jing 3 Xu Xijian 3 Zhang Yale 3 Lin Jiaxin 3 Li Ping 2 Xiao Shenwei 0 Tong Qunfeng 0 Du Kaitian 0 Zhang Dewan

1 0

review star
by Wu Fengguang 18 Dec '20

18 Dec '20

Xueliang is our review star, thanks Xueliang! wfg@crystal ~/todo% bin/review-star Review email records in the last 7 days total review paragraph point people 121 21 24 24 Cao Xueliang 48 30 57 20 Wu Fengguang 74 16 23 15 Wei Jihui 69 7 20 10 Luan Shengde 40 13 11 7 Liu Shaofei 42 14 20 7 Liu Yinsi 29 4 13 5 Yu Chuan 8 2 6 4 Xu Xijian 36 8 7 4 Lu Kaiyi 26 4 5 4 Xiao Shenwei 36 6 4 3 Zhang Yu 22 6 7 3 Lin Jiaxin 13 4 12 2 Sun Yukui 21 5 12 2 Ren Wen 14 4 2 2 Cui Yili 6 2 1 1 Bai Jing 18 3 2 1 Hu Xuejiao 30 4 4 1 Wang Chenglong 38 1 1 1 Wu Zhende 7 2 0 0 Zhang Yale 15 3 4 0 Li Ping 9 0 0 0 Li Yuanchao 6 2 2 0 Zhang Dewan 10 0 0 0 Wang Yong 25 2 4 0 Lu Weitao

1 0

[PATCH compass-ci] lib/es_query: add query filed from index
by Lu Weitao 18 Dec '20

18 Dec '20

[Why] We need only get specific field instead of entire document. it's like SQL: SELECT DISTINCT column FROM table Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/es_query.rb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/es_query.rb b/lib/es_query.rb index 3bea624..86c078f 100644 --- a/lib/es_query.rb +++ b/lib/es_query.rb @@ -61,6 +61,30 @@ class ESQuery return result[0]['_source'] end + + # select doc_field from index + # input: + # eg: suite (@index: jobs) + # output: + # [ + # {"key"=>"build-pkg", "doc_count"=>90841}, + # {"key"=>"cci-depends", "doc_count"=>4636}, + # {"key"=>"cci-makepkg", "doc_count"=>3647}, + # ... + # ] + def query_specific_fields(field) + query = { + aggs: { + "all_#{field}" => { + terms: { field: field, size: 1000 } + } + }, + size: 0 + } + result = @client.search index: @index + '*', body: query + + result ['aggregations']["all_#{field}"]['buckets'] + end end # Range Query Example: -- 2.23.0

1 1

[PATCH compass-ci] mail-robot/assign-account-email: add config for lab
by Wei Jihui 18 Dec '20

18 Dec '20

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- container/mail-robot/lib/assign-account-email.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/container/mail-robot/lib/assign-account-email.rb b/container/mail-robot/lib/assign-account-email.rb index 834e96f..77ed4e8 100755 --- a/container/mail-robot/lib/assign-account-email.rb +++ b/container/mail-robot/lib/assign-account-email.rb @@ -24,6 +24,7 @@ def build_apply_account_email(my_info) cat >> ~/.config/compass-ci/defaults/account.yaml <<-EOF my_email: #{my_info['my_email']} my_name: #{my_info['my_name']} + lab: #{ENV['lab']} EOF mkdir -p ~/.config/compass-ci/include/lab cat >> ~/.config/compass-ci/include/lab/#{ENV['lab']}.yaml <<-EOF -- 2.23.0

1 0

[PATCH v2 lkp-tests 2/2] distro/adaptation: add sshd mapping
by Wang Yong 18 Dec '20

18 Dec '20

add sshd mapping in different OS Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- distro/adaptation/archlinux | 2 ++ distro/adaptation/centos | 1 + distro/adaptation/fedora | 1 + distro/adaptation/kylin | 2 ++ distro/adaptation/openeuler | 2 ++ distro/adaptation/opensuse | 1 + distro/adaptation/oracle | 1 + 7 files changed, 10 insertions(+) diff --git a/distro/adaptation/archlinux b/distro/adaptation/archlinux index 53474d6c4..89163cf41 100644 --- a/distro/adaptation/archlinux +++ b/distro/adaptation/archlinux @@ -70,3 +70,5 @@ xutils-dev: imake xz-utils: xz libtirpc: libtirpc1 initramfs-tools: +openssh-server: openssh +openssh-client: openssh diff --git a/distro/adaptation/centos b/distro/adaptation/centos index e7fabf36d..2cfe3877c 100644 --- a/distro/adaptation/centos +++ b/distro/adaptation/centos @@ -334,3 +334,4 @@ junit4: junit liboath-dev: liboath-devel lsb-release: redhat-lsb linux-base: +openssh-client: openssh-clients diff --git a/distro/adaptation/fedora b/distro/adaptation/fedora index 38b7e9dc4..6686bc8c2 100644 --- a/distro/adaptation/fedora +++ b/distro/adaptation/fedora @@ -162,3 +162,4 @@ network-manager: NetworkManager javahelper: junit4: junit linux-base: +openssh-client: openssh-clients diff --git a/distro/adaptation/kylin b/distro/adaptation/kylin index f143fde96..e9286effd 100644 --- a/distro/adaptation/kylin +++ b/distro/adaptation/kylin @@ -147,3 +147,5 @@ lsb-release: openjdk: java-1.8.0-openjdk ruby-full: ruby ruby-devel linux-base: +openssh-server: openssh +openssh-client: openssh diff --git a/distro/adaptation/openeuler b/distro/adaptation/openeuler index e72f34fd2..09120489b 100644 --- a/distro/adaptation/openeuler +++ b/distro/adaptation/openeuler @@ -293,3 +293,5 @@ lsb-release: openjdk: java-1.8.0-openjdk ruby-full: ruby ruby-devel rubygem-rdoc linux-base: +openssh-server: openssh +openssh-client: openssh diff --git a/distro/adaptation/opensuse b/distro/adaptation/opensuse index 868d06b0d..f061c0894 100644 --- a/distro/adaptation/opensuse +++ b/distro/adaptation/opensuse @@ -13,3 +13,4 @@ libtirpc: libtirpc3 # Go get it yourself: https://github.com/schacon/ruby-git # We have no package for it yet ruby-git: +openssh-client: openssh-clients diff --git a/distro/adaptation/oracle b/distro/adaptation/oracle index af8415ec3..522b3d869 100644 --- a/distro/adaptation/oracle +++ b/distro/adaptation/oracle @@ -135,3 +135,4 @@ initramfs-tools: init-system-helpers: javahelper: linux-base: +openssh-client: openssh-clients -- 2.23.0

1 0

[PATCH v2 lkp-tests 1/2] distro/depends: add sshd depends file
by Wang Yong 18 Dec '20

18 Dec '20

add depends file for sshd Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- distro/depends/sshd | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 distro/depends/sshd diff --git a/distro/depends/sshd b/distro/depends/sshd new file mode 100644 index 000000000..85ba955ae --- /dev/null +++ b/distro/depends/sshd @@ -0,0 +1,2 @@ +openssh-server +openssh-client -- 2.23.0

1 0

[PATCH compass-ci] lib/job.cr: fix error for submit remote job
by Wu Zhende 18 Dec '20

18 Dec '20

[Error] submit iperf.yaml failed, got job_id=0, error: Missing uuid for remote job [How] Don't need to check uuid for remote job now. All jobs use my_token Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/job.cr | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index e7b9faf..dc43cbf 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -185,18 +185,6 @@ class Job # handle by me, then keep connect to me self["LKP_SERVER"] = SCHED_HOST self["LKP_CGI_PORT"] = SCHED_PORT.to_s - - # need further uuid check (validate? exist? no need?) - if self["SCHED_HOST"] != SCHED_HOST # remote submited job - # ?further fix to 127.0.0.1 (from remote ssh port forwarding) - # ?even set self["SCHED_HOST"] and self["SCHED_PORT"] - - if self["uuid"] == "" - puts "Job's SCHED_HOST is #{self["SCHED_HOST"]}, " + - "current scheduler IP is: #{SCHED_HOST}" - raise "Missing uuid for remote job" - end - end end private def set_sshr_info -- 2.23.0

1 0

[PATCH compass-ci] lib/job.cr: add reference url
by Wu Zhende 18 Dec '20

18 Dec '20

submit iperf.yaml testbox=vm-2p8g submit iperf.yaml failed, got job_id=0, error: Missing required job key: 'my_token'. Please refer to https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/manual/apply-acco… Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/job.cr | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index e7b9faf..e046072 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -325,7 +325,11 @@ class Job private def check_required_keys REQUIRED_KEYS.each do |key| if !@hash[key]? - raise "Missing required job key: '#{key}'" + error_msg = "Missing required job key: '#{key}'." + if ["my_email", "my_name", "my_token"].includes?(key) + error_msg += "\nPlease refer to https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/manual/apply-acco…" + end + raise error_msg end end end -- 2.23.0

1 0

[PATCH compass-ci] container/initrd-http: support "/srv/cci/" dir download
by Cao Xueliang 18 Dec '20

18 Dec '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/initrd-http/root/etc/nginx/conf.d/default.conf | 4 ++++ container/initrd-http/start | 1 + 2 files changed, 5 insertions(+) diff --git a/container/initrd-http/root/etc/nginx/conf.d/default.conf b/container/initrd-http/root/etc/nginx/conf.d/default.conf index f2834c7..18813a2 100644 --- a/container/initrd-http/root/etc/nginx/conf.d/default.conf +++ b/container/initrd-http/root/etc/nginx/conf.d/default.conf @@ -13,4 +13,8 @@ server { location /initrd { autoindex on; } + + location /cci { + autoindex on; + } } diff --git a/container/initrd-http/start b/container/initrd-http/start index ed5d443..8341050 100755 --- a/container/initrd-http/start +++ b/container/initrd-http/start @@ -14,6 +14,7 @@ cmd=( --name initrd-http -p ${INITRD_HTTP_PORT:-8800}:80 -v /srv/initrd:/usr/share/nginx/html/initrd:ro + -v /srv/cci:/usr/share/nginx/html/cci:ro -v /etc/localtime:/etc/localtime:ro -d initrd-http -- 2.23.0

1 0

[PATCH v2 compass-ci] doc: and runtime field in borrow-machine.en.md and borrow-machine.zh.md
by Zhang Yale 18 Dec '20

18 Dec '20

User can specify the sleep time in "runtime" field. Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- doc/manual/borrow-machine.en.md | 11 ++++++----- doc/manual/borrow-machine.zh.md | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/doc/manual/borrow-machine.en.md b/doc/manual/borrow-machine.en.md index b9c2bc4..0277984 100644 --- a/doc/manual/borrow-machine.en.md +++ b/doc/manual/borrow-machine.en.md @@ -202,7 +202,8 @@ Ensure that you have performed the following operations according to the [apply- hi684@account-vm ~/lkp-tests/jobs% cat borrow-1h.yaml suite: borrow testcase: borrow - + + runtime: 1h ssh_pub_key: <%= begin File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp @@ -212,10 +213,10 @@ Ensure that you have performed the following operations according to the [apply- %> sshd: # sleep at the bottom - sleep: 1h - hi684@account-vm ~/lkp-tests/jobs% grep sleep: borrow-1h.yaml - sleep: 1h - # Use the VIM editor to change the value of the sleep field. + sleep: + hi684@account-vm ~/lkp-tests/jobs% grep runtime: borrow-1h.yaml + runtime: 1h + # Use the VIM editor to change the value of the runtime field. hi684@account-vm ~/lkp-tests/jobs% vim borrow-1h.yaml # After changing the value, submit the request again. hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=vm-2p8g borrow-1h.yaml diff --git a/doc/manual/borrow-machine.zh.md b/doc/manual/borrow-machine.zh.md index 06d4db6..5bc951d 100644 --- a/doc/manual/borrow-machine.zh.md +++ b/doc/manual/borrow-machine.zh.md @@ -206,7 +206,8 @@ hi684@account-vm ~/lkp-tests/jobs% cat borrow-1h.yaml suite: borrow testcase: borrow - + + runtime: 1h ssh_pub_key: <%= begin File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp @@ -216,10 +217,10 @@ %> sshd: # sleep at the bottom - sleep: 1h - hi684@account-vm ~/lkp-tests/jobs% grep sleep: borrow-1h.yaml - sleep: 1h - # ��vim��sleep�� + runtime: 1h + hi684@account-vm ~/lkp-tests/jobs% grep runtime: borrow-1h.yaml + runtime: 1h + # ��vim��runtime�� hi684@account-vm ~/lkp-tests/jobs% vim borrow-1h.yaml # ��submit�� hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=vm-2p8g borrow-1h.yaml -- 2.23.0

1 0