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

[PATCH v3 lkp-tests] hackbench/PKGBUILD: fix source and build function
by Zhang Yale 30 Oct '20

30 Oct '20

[Why] Old source "https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-1.8.tar.gz" is not available, and need build before package. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- pkg/hackbench/PKGBUILD | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkg/hackbench/PKGBUILD b/pkg/hackbench/PKGBUILD index 797a00e6..736e08fc 100644 --- a/pkg/hackbench/PKGBUILD +++ b/pkg/hackbench/PKGBUILD @@ -2,13 +2,19 @@ pkgname=hackbench pkgver=1.8 pkgrel=1 arch=('i386' 'x86_64') -url="https://www.kernel.org/pub/linux/utils/rt-tests" +url="https://github.com/lacombar/hackbench.git" license=('GPL') -source=("https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-${pkgver}.tar.gz") +source=("https://github.com/lacombar/hackbench.git") sha256sums=('SKIP') -package() { +build() +{ + cd "${srcdir}/${pkgname}/${pkgname}" + gcc -o hackbench hackbench.c -lpthread +} + +package() +{ mkdir -p "${pkgdir}/lkp/benchmarks/${pkgname}" - cd "$srcdir/rt-tests-${pkgver}" - make install DESTDIR="${pkgdir}/lkp/benchmarks/${pkgname}" + cp -rf "${srcdir}/${pkgname}/${pkgname}" "${pkgdir}/lkp/benchmarks/${pkgname}" } -- 2.23.0

2 2

[PATCH compass-ci] job: move code to kernel_params.cr
by Wu Fengguang 30 Oct '20

30 Oct '20

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- src/lib/job.cr | 31 +---------------------------- src/scheduler/kernel_params.cr | 36 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 30 deletions(-) create mode 100644 src/scheduler/kernel_params.cr diff --git a/src/lib/job.cr b/src/lib/job.cr index 7fbc414..0fd57e0 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -7,6 +7,7 @@ require "any_merge" require "scheduler/constants.cr" require "scheduler/jobfile_operate.cr" +require "scheduler/kernel_params.cr" struct JSON::Any def []=(key : String, value : String) @@ -297,10 +298,6 @@ class Job "#{JobHelper.service_path("#{SRV_OS}/#{os_dir}/vmlinuz")}" end - private def kernel_common_params - return "user=lkp job=/lkp/scheduled/job.yaml RESULT_ROOT=/result/job rootovl ip=dhcp ro" - end - private def common_initrds temp_initrds = [] of String @@ -369,32 +366,6 @@ class Job self["initrds_uri"] = uris end - private def set_kernel_append_root - os_real_path = JobHelper.service_path("#{SRV_OS}/#{os_dir}") - - fs2root = { - "nfs" => "root=#{OS_HTTP_HOST}:#{os_real_path} #{initrds_basename()}", - "cifs" => "root=cifs://#{OS_HTTP_HOST}#{os_real_path}" + - ",guest,ro,hard,vers=1.0,noacl,nouser_xattr #{initrds_basename()}", - "initramfs" => "rdinit=/sbin/init prompt_ramdisk=0 #{initrds_basename()}", - "container" => "", - } - - self["kernel_append_root"] = fs2root[os_mount] - end - - private def kernel_console - if os_arch == "x86_64" - return "console=ttyS0,115200 console=tty0" - else - return "" - end - end - - private def set_kernel_params - self["kernel_params"] = " #{kernel_common_params()} #{kernel_append_root} #{kernel_console()}" - end - private def set_user_lkp_src lkp_arch_cgz = "#{SRV_INITRD}/lkp/#{lkp_initrd_user}/lkp-#{os_arch}.cgz" raise "The #{lkp_arch_cgz} does not exist." unless File.exists?(lkp_arch_cgz) diff --git a/src/scheduler/kernel_params.cr b/src/scheduler/kernel_params.cr new file mode 100644 index 0000000..54438b5 --- /dev/null +++ b/src/scheduler/kernel_params.cr @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +class Job + + private def kernel_common_params + return "user=lkp job=/lkp/scheduled/job.yaml RESULT_ROOT=/result/job rootovl ip=dhcp ro" + end + + private def set_kernel_append_root + os_real_path = JobHelper.service_path("#{SRV_OS}/#{os_dir}") + + fs2root = { + "nfs" => "root=#{OS_HTTP_HOST}:#{os_real_path} #{initrds_basename()}", + "cifs" => "root=cifs://#{OS_HTTP_HOST}#{os_real_path}" + + ",guest,ro,hard,vers=1.0,noacl,nouser_xattr #{initrds_basename()}", + "initramfs" => "rdinit=/sbin/init prompt_ramdisk=0 #{initrds_basename()}", + "container" => "", + } + + self["kernel_append_root"] = fs2root[os_mount] + end + + private def kernel_console + if os_arch == "x86_64" + return "console=ttyS0,115200 console=tty0" + else + return "" + end + end + + private def set_kernel_params + self["kernel_params"] = " #{kernel_common_params()} #{kernel_append_root} #{kernel_console()}" + end + +end -- 2.23.0

1 0

[PATCH compass-ci] area: fix lib/compare_matrixes.rb bad variable name error
by Zhang Yuhang 30 Oct '20

30 Oct '20

[why] When execute "compare os=opensuler -d os_version --color json", raise NameError: undefined local variable or method `matrixes_titles'. Signed-off-by: Zhang Yuhang <zhangyuhang25(a)huawei.com> --- lib/compare_matrixes.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/compare_matrixes.rb b/lib/compare_matrixes.rb index 6c7d873..078028a 100644 --- a/lib/compare_matrixes.rb +++ b/lib/compare_matrixes.rb @@ -689,11 +689,11 @@ def get_field_str(field) end # Print -def get_theme(matrixes_values, matrixes_title, theme) +def get_theme(matrixes_values, matrixes_titles, theme) theme = theme.to_sym if theme.is_a?(String) if theme == :html - print_html_result(matrixes_values, matrixes_title, false) - print_html_result(matrixes_values, matrixes_title, true) + print_html_result(matrixes_values, matrixes_titles, false) + print_html_result(matrixes_values, matrixes_titles, true) return elsif theme == :json return print_json_result(matrixes_values, matrixes_titles) -- 2.23.0

2 1

[PATCH v2 compass-ci] auto_submit.yaml: os_version needs specific version number now
by Li Yuanchao 30 Oct '20

30 Oct '20

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- sbin/auto_submit.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/auto_submit.yaml b/sbin/auto_submit.yaml index 6d7dc2a..f741b79 100644 --- a/sbin/auto_submit.yaml +++ b/sbin/auto_submit.yaml @@ -1,8 +1,8 @@ AvxToNeon/AvxToNeon: -- testbox=vm-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml +- testbox=vm-2p8g os=centos os_version=7.6.1810 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml compass-ci/compass-ci: -- testbox=vm-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml -- testbox=vm-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml -- testbox=vm-2p8g os=debian os_version=sid os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-2p8g os=centos os_version=7.6.1810 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-2p8g os=debian os_version=sid os_mount=initramfs os_arch=aarch64 deploy-cci.yaml archlinux: -- testbox=vm-2p16g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml +- testbox=vm-2p16g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml -- 2.23.0

3 2

[PATCH v5 compass-ci] sparrow/0-package: fix: failed to download lockfile-create in x86_64
by Liu Yinsi 30 Oct '20

30 Oct '20

[why] when execute sparrow/4-docker/buildall in x86_64 machine error: lockfile-create: command not found because wget link and rpm only support aarch64 now [how] 1. use $(arch), support download lockfile-create command according to different system architecture. 2. delete redundant rpm files after download. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/os/openEuler | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index ba298c8..79af2b9 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -23,7 +23,8 @@ pkgs=( yum install -y --skip-broken "${pkgs[@]}" -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… +wget http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/releas… +wget http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/releas… -rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm +rpm -i lib64lockfile1-1.16-1-omv4002.$(arch).rpm lockfile-progs-0.1.18-5-omv4002.$(arch).rpm +rm -rf *.rpm -- 2.23.0

1 0

[PATCH compass-ci] auto_submit: delete commit date as it's redundant
by Li Yuanchao 30 Oct '20

30 Oct '20

bisect get commit date itself, commit date here is unnecessary Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- sbin/auto_submit | 2 -- 1 file changed, 2 deletions(-) diff --git a/sbin/auto_submit b/sbin/auto_submit index 21958d3..8845b13 100755 --- a/sbin/auto_submit +++ b/sbin/auto_submit @@ -31,12 +31,10 @@ class AutoSubmit def submit(newrefs_info, submit_argv) newrefs_info['new_refs']['heads'].each do |branch, commit_id| real_argvs = Array.new(submit_argv) - commit_date = `git -C /srv/git/#{newrefs_info['git_repo']}.git log --format=%ct -1 #{commit_id}` real_argvs.push("upstream_branch=#{branch.delete_prefix('refs/heads/')}") real_argvs.push("upstream_commit=#{commit_id}") tag = %x(git -C /srv/git/#{newrefs_info['git_repo']}.git tag --points-at #{commit_id}) real_argvs.push("upstream_tag=#{tag}") unless tag.empty? - real_argvs.push("commit_date=#{commit_date}") system(real_argvs.join(' ')) end -- 2.23.0

3 2

[PATCH v3 compass-ci] sparrow/0-package: fix: failed to download lockfile-create in x86_64
by Liu Yinsi 30 Oct '20

30 Oct '20

[what] when execute sparrow/4-docker/buildall in x86_64 machine [error] lockfile-create: command not found [how] use arch=$(arch), support download lockfile-create command in aarch64 and x86_64. [why] weget link and rpm not support ${arch}, must use arch=$(arch) Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/os/openEuler | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index ba298c8..31d795d 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -23,7 +23,8 @@ pkgs=( yum install -y --skip-broken "${pkgs[@]}" -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… +arch=$(arch) +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… -rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm +rpm -i lib64lockfile1-1.16-1-omv4002.${arch}.rpm lockfile-progs-0.1.18-5-omv4002.${arch}.rpm -- 2.23.0

5 7

Re: [PATCH v2 compass-ci] parrow/0-package: fix lockfile-create download failed in x86_64
by Liu Yinsi 30 Oct '20

30 Oct '20

>>+wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… > >Why not use $(arch) directly? good Thanks, Yinsi > >>-rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm >>+rpm -i lib64lockfile1-1.16-1-omv4002.${arch}.rpm lockfile-progs-0.1.18-5-omv4002.${arch}.rpm > >Thanks, >Zhangyu

1 0

[PATCH v2 compass-ci] parrow/0-package: fix lockfile-create download failed in x86_64
by Liu Yinsi 30 Oct '20

30 Oct '20

[how] use arch=$(arch), support download lockfile-create command in aarch64 and x86_64. [why] weget link and rpm not support ${arch}, must use arch=$(arch) Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/os/openEuler | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index ba298c8..31d795d 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -23,7 +23,8 @@ pkgs=( yum install -y --skip-broken "${pkgs[@]}" -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… +arch=$(arch) +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… -rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm +rpm -i lib64lockfile1-1.16-1-omv4002.${arch}.rpm lockfile-progs-0.1.18-5-omv4002.${arch}.rpm -- 2.23.0

3 3

[PATCH v4 compass-ci] sparrow/0-package: fix: failed to download lockfile-create in x86_64
by Liu Yinsi 30 Oct '20

30 Oct '20

[what] when execute sparrow/4-docker/buildall in x86_64 machine [error] lockfile-create: command not found [how] 1. wget link and rpm not support ${arch}, must use arch=$(arch) to support download lockfile-create command in aarch64 and x86_64. 2. delete rpm file after download. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/os/openEuler | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index ba298c8..ea4b29a 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -23,7 +23,9 @@ pkgs=( yum install -y --skip-broken "${pkgs[@]}" -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… +arch=$(arch) +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… -rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm +rpm -i lib64lockfile1-1.16-1-omv4002.${arch}.rpm lockfile-progs-0.1.18-5-omv4002.${arch}.rpm +rm -rf *.rpm -- 2.23.0

2 1