- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] container/crystal-shards: fix executing command: shards version got exit 1
by Cao Xueliang 16 Apr '21

16 Apr '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/crystal-shards/shard.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/container/crystal-shards/shard.yml b/container/crystal-shards/shard.yml index 3466bc5..b9662af 100644 --- a/container/crystal-shards/shard.yml +++ b/container/crystal-shards/shard.yml @@ -35,3 +35,4 @@ dependencies: branch: master amqp-client: github: cloudamqp/amqp-client.cr + version: 1.0.0 -- 2.23.0

1 0

[PATCH compass-ci 2/2] lib/sched.cr: add tbox_group to testbox
by Wu Zhende 16 Apr '21

16 Apr '21

It can be used to display statistics on a certain type of machine. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/sched.cr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 1359f95..7a9e4d8 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -174,10 +174,12 @@ class Sched job["job_state"] = "boot" state = "booting" job_id = job["id"] + tbox_group = job["tbox_group"] else deadline = nil job_id = "" state = "requesting" + tbox_group = JobHelper.match_tbox_group(testbox.to_s) end type = get_type(testbox) @@ -189,7 +191,8 @@ class Sched "deadline" => deadline, "queues" => queues, "type" => type, - "name" => testbox + "name" => testbox, + "tbox_group" => tbox_group } @redis.update_wtmp(testbox.to_s, hash) -- 2.23.0

1 0

[PATCH compass-ci 1/2] lib/job.cr: fix tbox_group generation rule
by Wu Zhende 16 Apr '21

16 Apr '21

[Why] The tbox generated by this method is different from the tbox generated by the lkp submit method. testbox: dc-8g.wuzhende-3455481 this method get: dc-8g.wuzhende lkp mothed get: dc-8g Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/job.cr | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index b6bb730..200ba2b 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -26,11 +26,7 @@ end module JobHelper def self.match_tbox_group(testbox : String) - tbox_group = testbox - if testbox =~ /(.*)-\d+$/ - tbox_group = $1 - end - return tbox_group + testbox.split(/\.|--/)[0] end def self.service_path(path) -- 2.23.0

1 0

[PATCH compass-ci] container/dracut-initrd: set pre-mount service to be wanted by kernel param local
by Xu Xijian 15 Apr '21

15 Apr '21

The local mount is dealt in dracut-pre-mount stage in dracut, however sometime this stage is skipped. So add "ConditionKernelCommandLine=|local" to make sure kernel param local can trigger dracut-pre-mount service. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- container/dracut-initrd/bin/setup-dracut.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/container/dracut-initrd/bin/setup-dracut.sh b/container/dracut-initrd/bin/setup-dracut.sh index a57d681..f149556 100755 --- a/container/dracut-initrd/bin/setup-dracut.sh +++ b/container/dracut-initrd/bin/setup-dracut.sh @@ -20,6 +20,9 @@ sed -i "/install() {/a\ inst /usr/bin/awk" /usr/lib/dracut/modules.d/40networ tools_00bash="/sbin/e2fsck /sbin/mke2fs /usr/bin/basename /sbin/lvm /sbin/reboot" sed -i "/install() {/a\ inst $tools_00bash" /usr/lib/dracut/modules.d/00bash/module-setup.sh -pre_mount_file="/usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-mount.sh" +dracut_systemd_dir="/usr/lib/dracut/modules.d/98dracut-systemd" +pre_mount_service="${dracut_systemd_dir}/dracut-pre-mount.service" +sed -i "/Description/aConditionKernelCommandLine=|local" "$pre_mount_service" +pre_mount_file="${dracut_systemd_dir}/dracut-pre-mount.sh" [ "$(sed -n '$p' $pre_mount_file)" = "exit 0" ] && sed -i '$d' "$pre_mount_file" cat set-local-sysroot.sh >> "$pre_mount_file" -- 2.23.0

1 0

help star
by Wu Fengguang 15 Apr '21

15 Apr '21

Wei Jihui is our help star, thanks Wei Jihui! baijing@crystal ~/todo/bin% ./help-star 5.9 Wei Jihui 4.8 Liu Shaofei 3.1 Xu Xijian 2.8 Yu Chuan 2.7 Zhang Dewan 2.3 Wang Yong 2.0 Wu Fengguang 1.8 Cao Xueliang 1.8 Luan Shengde 1.7 Liu Yinsi 1.3 Wu Zhende 0.0 Bai Jing 0.0 Du Kaitian 0.0 Lu Weitao 0.0 Zhang Yale 0.0 Cui Yili 0.0 Wang Chenglong 0.0 Li Yuanchao 0.0 Lin Jiaxin 0.0 Li Ping

1 0

review star
by Wu Fengguang 15 Apr '21

15 Apr '21

: wqUser-Agent: Mutt/1.10.1 (2018-07-13) User-Agent: Mutt/1.10.1 (2018-07-13) Cao Xueliang is our review star, thanks Cao Xueliang! baijing@crystal ~/todo/bin% ./review-star Review email records in the last 7 days total review paragraph point people 75 4 4 15 Cao Xueliang 15 4 10 12 Yu Chuan 21 5 5 8 Wei Jihui 24 6 11 6 Liu Shaofei 11 7 16 4 Luan Shengde 3 1 3 3 Xu Xijian 13 3 3 1 Lin Jiaxin 4 3 6 1 Li Yuanchao 12 1 1 1 Bai Jing 9 0 0 0 Wu Zhende 14 0 0 0 Cui Yili 9 1 8 0 Wang Yong 3 0 0 0 Li Ping 10 2 3 0 Lu Weitao 5 0 0 0 Wu Fengguang 21 0 0 0 Liu Yinsi 11 0 0 0 Wang Chenglong

1 0

git count
by Wu Fengguang 15 Apr '21

15 Apr '21

Cao Xueliang is our code star, thanks Cao Xueliang! baijing@crystal ~/todo/bin% ./git-count 13 Cao Xueliang 7 Wu Zhende 6 Liu Shaofei 6 Lu Weitao 6 Liu Yinsi 4 Wei Jihui 3 Bai Jing 2 Xu Xijian 2 Cui Yili 2 Wang Yong 2 Li Yuanchao 2 Lin Jiaxin 1 Yu Chuan 1 Wang Chenglong 1 Luan Shengde 0 Du Kaitian 0 Wu Fengguang 0 Zhang Yale 0 Zhang Dewan 0 Li Ping

1 0

[PATCH lkp-tests] setup cluster for multi server(3 or more)
by Luan Shengde 15 Apr '21

15 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- cluster/cs-s1-a122-c2 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 cluster/cs-s1-a122-c2 diff --git a/cluster/cs-s1-a122-c2 b/cluster/cs-s1-a122-c2 new file mode 100644 index 000000000..a69179eab --- /dev/null +++ b/cluster/cs-s1-a122-c2 @@ -0,0 +1,14 @@ +switch: Switch-P12 +ip0: 1 +nodes: + taishan200-2280-2s64p-256g--a122: + roles: [ node1 ] + macs: [ "44:a1:91:9d:d8:25" ] + + taishan200-2280-2s64p-256g--a123: + roles: [ node2 ] + macs: [ "44:a1:91:9d:f5:4a" ] + + taishan200-2280-2s64p-256g--a125: + roles: [ node3 ] + macs: [ "44:67:47:85:f4:65" ] -- 2.23.0

1 0

[PATCH lkp-tests] tests/build-pkg: matching url is not printed in function replace_source
by Lin Jiaxin 15 Apr '21

15 Apr '21

Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- tests/build-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/build-pkg b/tests/build-pkg index 350d8fdf..b399fdc3 100755 --- a/tests/build-pkg +++ b/tests/build-pkg @@ -122,7 +122,7 @@ replace_source() echo "source=(" > $1 for url in ${source[@]} do - echo "$url" | egrep 'git\+|\.git$' && { + echo "$url" | egrep 'git\+|\.git$' > /dev/null && { [ -n "$repo_dir" ] && { url="${repo_dir}git://${LKP_SERVER}/${upstream_dir}/${upstream_repo}#commit=${upstream_commit}" [ -n "$git_tag" ] && { -- 2.23.0

1 0

[PATCH v2 lkp-tests] jobs/rpmbuild-pkg.yaml: remove upstream_repo
by Lin Jiaxin 15 Apr '21

15 Apr '21

Assigning a null value to upstream_repo is meaningless. And when use "submit upstream_repo=xxx rpmbuild-pkg.yaml" will make upstream_repo be null. Unless we put "upstream_repo=xxx" behind. Or declare it in yaml. [example] linjiaxin@crystal ~%/home/linjiaxin/lkp-tests/sbin/submit upstream_repo="a/azk/azk" upstream_url=https://github.com/azukiapp/azk pkgbuild_repo=archlinux/aur-a/azk-git testbox=dc-16g os=openeuler os_version=20.03-LTS os_mount=container os_arch=aarch64 docker_image=openeuler:20.03-LTS repo_name=aur rpmbuild-pkg.yaml upstream_branch=master upstream_commit=e72adb039e4dd64fd6ed81d82fd597c1d4efdf14 upstream_dir=upstream submit_id=d18fabcd-6302-464c-aa99-3ed9e610704b submit /home/linjiaxin/lkp-tests/jobs/rpmbuild-pkg.yaml, got job id=crystal.1594407 linjiaxin@crystal ~% es-find id=crystal.1594407 | grep upstream_repo "upstream_repo": null, Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- jobs/rpmbuild-pkg.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/jobs/rpmbuild-pkg.yaml b/jobs/rpmbuild-pkg.yaml index a70590af..5860ba02 100644 --- a/jobs/rpmbuild-pkg.yaml +++ b/jobs/rpmbuild-pkg.yaml @@ -1,5 +1,4 @@ suite: rpmbuild-pkg category: functional -upstream_repo: rpmbuild-pkg: -- 2.23.0

2 2