- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] fix(os-cifs): solve the problem that os-rw dir cannot be written
by Yu Chuan 09 Oct '20

09 Oct '20

1. The writability of the os-rw dir should be controlled by smb.conf. So modify the mount param of /srv/os volume from ro to rw; 2. Because smb.conf only uses the /srv/os dir. So delete the useless volume: /srv/os-rw. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- container/os-cifs/start | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/container/os-cifs/start b/container/os-cifs/start index 6688e271ec3c..cd33e207c709 100755 --- a/container/os-cifs/start +++ b/container/os-cifs/start @@ -13,9 +13,8 @@ docker_rm samba cmd=( docker run -dt -p 445:445 - -v /srv/os:/srv/os:ro + -v /srv/os:/srv/os -v /etc/localtime:/etc/localtime:ro - -v /srv/os:/srv/os-rw -v /srv/initrd:/srv/initrd -v /srv/result:/srv/result --name samba -- 2.23.0

1 0

[PATCH v2 lkp-tests] spec: change vm-hi1620-2p8g to vm-2p8g
by Zhang Yu 09 Oct '20

09 Oct '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- spec/submit/ftq/ftq-1000-2-100000ss-add.yaml | 4 ++-- spec/submit/ftq/ftq-10000-2-100000ss-add.yaml | 4 ++-- spec/submit/ftq/ftq-20-2-6000ss-cache.yaml | 4 ++-- ...4-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml | 4 ++-- spec/submit_spec.rb | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml b/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml index 76e23ca1..7522fb96 100644 --- a/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml +++ b/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml @@ -7,8 +7,8 @@ samples: 100000ss ftq: test: add freq: 1000 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-2p8g--spec_submit +tbox_group: vm-2p8g--spec_submit provider: qemu template: kvm nr_cpu: 2 diff --git a/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml b/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml index d3f4cdc9..ff941dfb 100644 --- a/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml +++ b/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml @@ -7,8 +7,8 @@ samples: 100000ss ftq: test: add freq: 10000 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-2p8g--spec_submit +tbox_group: vm-2p8g--spec_submit provider: qemu template: kvm nr_cpu: 2 diff --git a/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml b/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml index a87e7da0..3fad02dd 100644 --- a/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml +++ b/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml @@ -7,8 +7,8 @@ samples: 6000ss ftq: test: cache freq: 20 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-2p8g--spec_submit +tbox_group: vm-2p8g--spec_submit provider: qemu template: kvm nr_cpu: 2 diff --git a/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml b/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml index 0ba2fb60..5b3cb6ec 100644 --- a/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml +++ b/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml @@ -25,8 +25,8 @@ if role client: requests: 68000000 n_pipeline: 3 key_len: 68000000 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-2p8g--spec_submit +tbox_group: vm-2p8g--spec_submit node_roles: server client provider: qemu template: kvm diff --git a/spec/submit_spec.rb b/spec/submit_spec.rb index 2b3b5de3..69bd58af 100644 --- a/spec/submit_spec.rb +++ b/spec/submit_spec.rb @@ -29,7 +29,7 @@ describe 'submit job spec' do "#{LKP_SRC}/sbin/submit", '-o', output_dir, '-s', 'lab: spec_lab', - '-s', 'testbox: vm-hi1620-2p8g--spec_submit', + '-s', 'testbox: vm-2p8g--spec_submit', yaml_file ] system(*submit_cmd) -- 2.23.0

1 0

[PATCH lkp-tests] fix wget_busybox to check busybox command
by Xiao Shenwei 09 Oct '20

09 Oct '20

wget command may link to busybox, if not http_client_cmd=busybox wget Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- lib/wget_busybox.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/wget_busybox.sh b/lib/wget_busybox.sh index bca92606..751b01c3 100755 --- a/lib/wget_busybox.sh +++ b/lib/wget_busybox.sh @@ -2,8 +2,13 @@ setup_wget_busybox() { - wget=$(cmd_path wget) - http_client_cmd="$wget -q" + if has_cmd wget; then + http_client_cmd=$(cmd_path wget) + http_client_cmd="$http_client_cmd -q" && return + fi + + busybox=$(cmd_path busybox) || return + http_client_cmd="$busybox wget -q" } [ -n "$http_client_cmd" ] || setup_wget_busybox || return -- 2.23.0

2 2

[PATCH lkp-tests] spec: change hi1620 to aarch64
by Zhang Yu 09 Oct '20

09 Oct '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- spec/submit/ftq/ftq-1000-2-100000ss-add.yaml | 4 ++-- spec/submit/ftq/ftq-10000-2-100000ss-add.yaml | 4 ++-- spec/submit/ftq/ftq-20-2-6000ss-cache.yaml | 4 ++-- ...4-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml | 4 ++-- spec/submit_spec.rb | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml b/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml index 76e23ca1..2cdc28e8 100644 --- a/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml +++ b/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml @@ -7,8 +7,8 @@ samples: 100000ss ftq: test: add freq: 1000 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-aarch64-2p8g--spec_submit +tbox_group: vm-aarch64-2p8g--spec_submit provider: qemu template: kvm nr_cpu: 2 diff --git a/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml b/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml index d3f4cdc9..310c9787 100644 --- a/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml +++ b/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml @@ -7,8 +7,8 @@ samples: 100000ss ftq: test: add freq: 10000 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-aarch64-2p8g--spec_submit +tbox_group: vm-aarch64-2p8g--spec_submit provider: qemu template: kvm nr_cpu: 2 diff --git a/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml b/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml index a87e7da0..30ebb14a 100644 --- a/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml +++ b/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml @@ -7,8 +7,8 @@ samples: 6000ss ftq: test: cache freq: 20 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-aarch64-2p8g--spec_submit +tbox_group: vm-aarch64-2p8g--spec_submit provider: qemu template: kvm nr_cpu: 2 diff --git a/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml b/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml index 0ba2fb60..3f70a593 100644 --- a/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml +++ b/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml @@ -25,8 +25,8 @@ if role client: requests: 68000000 n_pipeline: 3 key_len: 68000000 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-aarch64-2p8g--spec_submit +tbox_group: vm-aarch64-2p8g--spec_submit node_roles: server client provider: qemu template: kvm diff --git a/spec/submit_spec.rb b/spec/submit_spec.rb index 2b3b5de3..4473a638 100644 --- a/spec/submit_spec.rb +++ b/spec/submit_spec.rb @@ -29,7 +29,7 @@ describe 'submit job spec' do "#{LKP_SRC}/sbin/submit", '-o', output_dir, '-s', 'lab: spec_lab', - '-s', 'testbox: vm-hi1620-2p8g--spec_submit', + '-s', 'testbox: vm-aarch64-2p8g--spec_submit', yaml_file ] system(*submit_cmd) -- 2.23.0

2 3

[PATCH lab-z9] hosts: add generic vm-*
by Wu Fengguang 09 Oct '20

09 Oct '20

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- hosts/vm-1p1g | 5 +++++ hosts/vm-1p1g-pxe | 5 +++++ hosts/vm-2p1g | 5 +++++ hosts/vm-2p1g-pxe | 5 +++++ hosts/vm-2p4g | 5 +++++ hosts/vm-2p4g-pxe | 5 +++++ hosts/vm-2p8g | 5 +++++ hosts/vm-2p8g-pxe | 5 +++++ 8 files changed, 40 insertions(+) create mode 100644 hosts/vm-1p1g create mode 100644 hosts/vm-1p1g-pxe create mode 100644 hosts/vm-2p1g create mode 100644 hosts/vm-2p1g-pxe create mode 100644 hosts/vm-2p4g create mode 100644 hosts/vm-2p4g-pxe create mode 100644 hosts/vm-2p8g create mode 100644 hosts/vm-2p8g-pxe diff --git a/hosts/vm-1p1g b/hosts/vm-1p1g new file mode 100644 index 0000000..c64cc36 --- /dev/null +++ b/hosts/vm-1p1g @@ -0,0 +1,5 @@ +provider: qemu +template: kvm +nr_node: 1 +nr_cpu: 1 +memory: 1G diff --git a/hosts/vm-1p1g-pxe b/hosts/vm-1p1g-pxe new file mode 100644 index 0000000..233f639 --- /dev/null +++ b/hosts/vm-1p1g-pxe @@ -0,0 +1,5 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 1 +memory: 1G diff --git a/hosts/vm-2p1g b/hosts/vm-2p1g new file mode 100644 index 0000000..c781033 --- /dev/null +++ b/hosts/vm-2p1g @@ -0,0 +1,5 @@ +provider: qemu +template: kvm +nr_node: 1 +nr_cpu: 2 +memory: 1G diff --git a/hosts/vm-2p1g-pxe b/hosts/vm-2p1g-pxe new file mode 100644 index 0000000..6129d20 --- /dev/null +++ b/hosts/vm-2p1g-pxe @@ -0,0 +1,5 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 1G diff --git a/hosts/vm-2p4g b/hosts/vm-2p4g new file mode 100644 index 0000000..7e9570d --- /dev/null +++ b/hosts/vm-2p4g @@ -0,0 +1,5 @@ +provider: qemu +template: kvm +nr_node: 1 +nr_cpu: 2 +memory: 4G diff --git a/hosts/vm-2p4g-pxe b/hosts/vm-2p4g-pxe new file mode 100644 index 0000000..8ba4e58 --- /dev/null +++ b/hosts/vm-2p4g-pxe @@ -0,0 +1,5 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 4G diff --git a/hosts/vm-2p8g b/hosts/vm-2p8g new file mode 100644 index 0000000..e5d5f84 --- /dev/null +++ b/hosts/vm-2p8g @@ -0,0 +1,5 @@ +provider: qemu +template: kvm +nr_node: 1 +nr_cpu: 2 +memory: 8G diff --git a/hosts/vm-2p8g-pxe b/hosts/vm-2p8g-pxe new file mode 100644 index 0000000..ae83d6f --- /dev/null +++ b/hosts/vm-2p8g-pxe @@ -0,0 +1,5 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 8G -- 2.23.0

1 0

[PATCH lkp-tests 2/2] hosts: remove arch from dc-*
by Wu Fengguang 09 Oct '20

09 Oct '20

HW machines should define "arch" in their hosts files, while for VM and docker boxes, "arch" should typically inherit from the host machine. Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- hosts/dc-1g | 1 - hosts/dc-2g | 1 - hosts/dc-4g | 1 - hosts/dc-8g | 1 - 4 files changed, 4 deletions(-) diff --git a/hosts/dc-1g b/hosts/dc-1g index afeba498..ec1e59b9 100644 --- a/hosts/dc-1g +++ b/hosts/dc-1g @@ -1,2 +1 @@ -arch: aarch64 memory: 1g diff --git a/hosts/dc-2g b/hosts/dc-2g index 6956411b..b9509a2c 100644 --- a/hosts/dc-2g +++ b/hosts/dc-2g @@ -1,2 +1 @@ -arch: aarch64 memory: 2g diff --git a/hosts/dc-4g b/hosts/dc-4g index 1407332f..52e0636d 100644 --- a/hosts/dc-4g +++ b/hosts/dc-4g @@ -1,2 +1 @@ -arch: aarch64 memory: 4g diff --git a/hosts/dc-8g b/hosts/dc-8g index ec61c1d4..333d6250 100644 --- a/hosts/dc-8g +++ b/hosts/dc-8g @@ -1,2 +1 @@ -arch: aarch64 memory: 8g -- 2.23.0

1 0

[PATCH lkp-tests 1/2] hosts: add general vm-*
by Wu Fengguang 09 Oct '20

09 Oct '20

These are VM boxes that don't include HW model or arch in file name or content. Which should be more flexible for matrix combination in general. This means - on job submit, users should provide 'arch' field - multi-qemu should define 'arch' field by default based on host arch - the scheduler should manage queues matching VM/docker testbox's arch Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- hosts/vm-1p1g | 5 +++++ hosts/vm-1p1g-pxe | 5 +++++ hosts/vm-2p1g | 5 +++++ hosts/vm-2p1g-pxe | 5 +++++ hosts/vm-2p4g | 5 +++++ hosts/vm-2p4g-pxe | 5 +++++ hosts/vm-2p8g | 5 +++++ hosts/vm-2p8g-pxe | 5 +++++ 8 files changed, 40 insertions(+) create mode 100644 hosts/vm-1p1g create mode 100644 hosts/vm-1p1g-pxe create mode 100644 hosts/vm-2p1g create mode 100644 hosts/vm-2p1g-pxe create mode 100644 hosts/vm-2p4g create mode 100644 hosts/vm-2p4g-pxe create mode 100644 hosts/vm-2p8g create mode 100644 hosts/vm-2p8g-pxe diff --git a/hosts/vm-1p1g b/hosts/vm-1p1g new file mode 100644 index 00000000..c64cc360 --- /dev/null +++ b/hosts/vm-1p1g @@ -0,0 +1,5 @@ +provider: qemu +template: kvm +nr_node: 1 +nr_cpu: 1 +memory: 1G diff --git a/hosts/vm-1p1g-pxe b/hosts/vm-1p1g-pxe new file mode 100644 index 00000000..233f6393 --- /dev/null +++ b/hosts/vm-1p1g-pxe @@ -0,0 +1,5 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 1 +memory: 1G diff --git a/hosts/vm-2p1g b/hosts/vm-2p1g new file mode 100644 index 00000000..c7810336 --- /dev/null +++ b/hosts/vm-2p1g @@ -0,0 +1,5 @@ +provider: qemu +template: kvm +nr_node: 1 +nr_cpu: 2 +memory: 1G diff --git a/hosts/vm-2p1g-pxe b/hosts/vm-2p1g-pxe new file mode 100644 index 00000000..6129d20e --- /dev/null +++ b/hosts/vm-2p1g-pxe @@ -0,0 +1,5 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 1G diff --git a/hosts/vm-2p4g b/hosts/vm-2p4g new file mode 100644 index 00000000..7e9570da --- /dev/null +++ b/hosts/vm-2p4g @@ -0,0 +1,5 @@ +provider: qemu +template: kvm +nr_node: 1 +nr_cpu: 2 +memory: 4G diff --git a/hosts/vm-2p4g-pxe b/hosts/vm-2p4g-pxe new file mode 100644 index 00000000..8ba4e58a --- /dev/null +++ b/hosts/vm-2p4g-pxe @@ -0,0 +1,5 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 4G diff --git a/hosts/vm-2p8g b/hosts/vm-2p8g new file mode 100644 index 00000000..e5d5f846 --- /dev/null +++ b/hosts/vm-2p8g @@ -0,0 +1,5 @@ +provider: qemu +template: kvm +nr_node: 1 +nr_cpu: 2 +memory: 8G diff --git a/hosts/vm-2p8g-pxe b/hosts/vm-2p8g-pxe new file mode 100644 index 00000000..ae83d6f0 --- /dev/null +++ b/hosts/vm-2p8g-pxe @@ -0,0 +1,5 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 8G -- 2.23.0

1 0

[PATCH v4 compass-ci 7/7] container/mail-robot: mail-robot.md
by Luan Shengde 09 Oct '20

09 Oct '20

guidance file for mail-robot Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- doc/mail-robot.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 doc/mail-robot.md diff --git a/doc/mail-robot.md b/doc/mail-robot.md new file mode 100644 index 0000000..5c42866 --- /dev/null +++ b/doc/mail-robot.md @@ -0,0 +1,38 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ + +# email monitor robot + +## purpose + +monitor received mails + check if the mail is for applying uuid/account + +## steps overview + +1. monitor mailbox dir + - check for new email file + +2. check email + - check email subject + - return if unmatched subject + - call answerback-email + - check email available + - check base_url for the oss_url in upstream-repos list + if not, it will raise "url not in upstream-repos list" error + - check if the email has commit for the url + if not, it will raise "no commit found" error + - check pub_key + - check if there is a pub_key in the email + if not, it will raise 'no pub_key' error + - apply ssh account + - apply account uuid + - write account info to es + - send uuid to user + - mv mail file to drafts + +3. continue the monitor + - after 1 and 2, continue to monitor the mailbox + +4. see the log + - use the following command to get the logs + docker logs -f --tail=100 fluentd |grep mail-robot -- 2.23.0

2 1

[PATCH v4 compass-ci 4/7] container/mail-robot: Dockerfile
by Luan Shengde 09 Oct '20

09 Oct '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/mail-robot/Dockerfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 container/mail-robot/Dockerfile diff --git a/container/mail-robot/Dockerfile b/container/mail-robot/Dockerfile new file mode 100644 index 0000000..87c04e7 --- /dev/null +++ b/container/mail-robot/Dockerfile @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ + +FROM debian +MAINTAINER luanshd0525(a)163.com +ENV DEBIAN_FRONTEND noninteractive + +COPY conf/sources.list* /etc/apt/ + +RUN apt-get update && \ + apt-get install -y uuid-runtime curl ruby-listen ruby-json ruby-mail && \ + gem install fileutils elasticsearch activesupport && \ + ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ + echo 'Asia/Shanghai' > /etc/timezone +COPY mail-robot.rb /usr/local/bin/ +COPY answerback-email.rb /usr/local/bin/ +WORKDIR /usr/local/bin/ -- 2.23.0

2 1

[PATCH v4 compass-ci 3/7] container/mail-robot: build file
by Luan Shengde 09 Oct '20

09 Oct '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/mail-robot/build | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 container/mail-robot/build diff --git a/container/mail-robot/build b/container/mail-robot/build new file mode 100755 index 0000000..79af1de --- /dev/null +++ b/container/mail-robot/build @@ -0,0 +1,5 @@ +#!/bin/sh +# SPDX-License-Identifier: MulanPSL-2.0+ + +docker build -t mail-robot:latest . + -- 2.23.0

2 1