- Compass-ci - mailweb.openeuler.org

[PATCH lkp-tests] pkg/turbostat: changed turbostat's source url
by Zhang Yale 07 Jan '21

07 Jan '21

turbostat can not be found in x86_64 Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- pkg/turbostat/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/turbostat/PKGBUILD b/pkg/turbostat/PKGBUILD index d7e536c7..24adcffe 100644 --- a/pkg/turbostat/PKGBUILD +++ b/pkg/turbostat/PKGBUILD @@ -4,7 +4,7 @@ pkgrel=1 url='https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' arch=('i386' 'x86_64') license=('GPL') -source=('https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git') +source=("git://$GIT_SERVER/l/linux/linux.git") md5sums=('SKIP') build() -- 2.23.0

2 2

[PATCH lkp-tests] pkg/api-avx2neon: fix x86 version build
by Wang Yong 07 Jan '21

07 Jan '21

Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- pkg/api-avx2neon/PKGBUILD | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/api-avx2neon/PKGBUILD b/pkg/api-avx2neon/PKGBUILD index fac047add..30967beb7 100644 --- a/pkg/api-avx2neon/PKGBUILD +++ b/pkg/api-avx2neon/PKGBUILD @@ -1,3 +1,5 @@ +# add pkg_arch: x86_64 to build x86 version +# ref: Makefile pkgname=api-avx2neon pkgver=1 pkgrel=1 @@ -9,7 +11,12 @@ md5sums=('SKIP') build() { cd "$srcdir/AvxToNeon/tests" - make ARCH=$(arch) + + if [ "${pkg_arch}" == "aarch64" ]; then + make + elif [ "${pkg_arch}" == "x86_64" ]; then + make ARCH=x86 + fi } package() { -- 2.23.0

1 0

[PATCH compass-ci] git_mirror.rb: fix that delete unused variable
by Li Yuanchao 06 Jan '21

06 Jan '21

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index bd55b33..b153978 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -374,6 +374,6 @@ class MirrorMain submodule = %x(git -C #{mirror_dir} show HEAD:.gitmodules 2>/dev/null) return if submodule.empty? - handle_submodule(submodule, File.basename(git_repo)) + handle_submodule(submodule) end end -- 2.23.0

1 0

[PATCH lkp-tests] tests/build-pkg: fix the name of *.cgz
by Liu Shaofei 06 Jan '21

06 Jan '21

[why] the name of *.cgz packages append the field of 'pkgrel'. The example is as follow: /srv/initrd/build-pkg/nfs/openeuler/aarch64/20.03-SP1/log4cpp/1.1.3-2.cgz Signed-off-by: Liu Shaofei <370072077(a)qq.com> --- tests/build-pkg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/build-pkg b/tests/build-pkg index 436d43840..98341e7ac 100755 --- a/tests/build-pkg +++ b/tests/build-pkg @@ -95,11 +95,11 @@ create_cgz_name() pkg_args="-A --check --skippgpcheck" [ -n "$git_tag" ] && { - cgz_name="${cgz_path}/${git_tag}.cgz" + cgz_name="${cgz_path}/${git_tag}-${pkgrel}.cgz" } [ -n "$pkg_ver" ] && { - cgz_name="${cgz_path}/${pkg_ver}.cgz" + cgz_name="${cgz_path}/${pkg_ver}-${pkgrel}.cgz" pkg_args="${pkg_args} --skipchecksums --skipinteg" } } -- 2.23.0

1 1

[PATCH v2 lkp-tests 2/2] tests/build-pkg: fix the name of *.cgz
by Liu Shaofei 06 Jan '21

06 Jan '21

[why] the name of *.cgz packages append the field of 'pkgrel'. The example is as follow: /srv/initrd/build-pkg/nfs/openeuler/aarch64/20.03-SP1/log4cpp/1.1.3-2.cgz Signed-off-by: Liu Shaofei <370072077(a)qq.com> --- tests/build-pkg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/build-pkg b/tests/build-pkg index 436d43840..98341e7ac 100755 --- a/tests/build-pkg +++ b/tests/build-pkg @@ -95,11 +95,11 @@ create_cgz_name() pkg_args="-A --check --skippgpcheck" [ -n "$git_tag" ] && { - cgz_name="${cgz_path}/${git_tag}.cgz" + cgz_name="${cgz_path}/${git_tag}-${pkgrel}.cgz" } [ -n "$pkg_ver" ] && { - cgz_name="${cgz_path}/${pkg_ver}.cgz" + cgz_name="${cgz_path}/${pkg_ver}-${pkgrel}.cgz" pkg_args="${pkg_args} --skipchecksums --skipinteg" } } -- 2.23.0

1 0

[PATCH v2 lkp-tests 1/2] tests/cci-makepkg: remove useless variable
by Liu Shaofei 06 Jan '21

06 Jan '21

Signed-off-by: Liu Shaofei <370072077(a)qq.com> --- tests/cci-makepkg | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/cci-makepkg b/tests/cci-makepkg index d48e8495e..e737955b9 100755 --- a/tests/cci-makepkg +++ b/tests/cci-makepkg @@ -108,7 +108,6 @@ distro_install_depends ${benchmark}-dev build_depends_pkg -i $benchmark $TMP sync_dest="$PKG_MNT/$pack_to" -date=$(date +"%Y%m%d") pkgver=$(get_pkg_info pkgver) pkgrel=$(get_pkg_info pkgrel) bm_name=$(check_shared_pkg) -- 2.23.0

1 0

[PATCH lkp-tests] tests/build-pkg: remove useless variable
by Liu Shaofei 06 Jan '21

06 Jan '21

Signed-off-by: Liu Shaofei <370072077(a)qq.com> --- tests/cci-makepkg | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/cci-makepkg b/tests/cci-makepkg index d48e8495e..e737955b9 100755 --- a/tests/cci-makepkg +++ b/tests/cci-makepkg @@ -108,7 +108,6 @@ distro_install_depends ${benchmark}-dev build_depends_pkg -i $benchmark $TMP sync_dest="$PKG_MNT/$pack_to" -date=$(date +"%Y%m%d") pkgver=$(get_pkg_info pkgver) pkgrel=$(get_pkg_info pkgrel) bm_name=$(check_shared_pkg) -- 2.23.0

1 1

[PATCH lkp-tests 2/2] jobs: add jobs/fault_reproduction.yaml
by Wei Jihui 06 Jan '21

06 Jan '21

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- jobs/fault_reproduction.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 jobs/fault_reproduction.yaml diff --git a/jobs/fault_reproduction.yaml b/jobs/fault_reproduction.yaml new file mode 100644 index 00000000..46a1e042 --- /dev/null +++ b/jobs/fault_reproduction.yaml @@ -0,0 +1,14 @@ +ssh_pub_key: + <%= + begin + File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp + rescue + nil + end + %> +sshd: +sleep: 6h + +on_fail: + sshd: + sleep: 6h -- 2.23.0

1 0

[PATCH compass-ci] feat: scheduler: add new boot way
by Ren Wen 06 Jan '21

06 Jan '21

A new way to find job, requested by: curl -X GET 'http://<host>:<port>/boot.libvirt/mac/<mac_value>' Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/scheduler/find_job_boot.cr | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/scheduler/find_job_boot.cr b/src/scheduler/find_job_boot.cr index b2f0802..f6981e7 100644 --- a/src/scheduler/find_job_boot.cr +++ b/src/scheduler/find_job_boot.cr @@ -7,7 +7,7 @@ class Sched boot_type = @env.params.url["boot_type"] case boot_type - when "ipxe" + when "ipxe", "libvirt" host = @redis.hash_get("sched/mac2host", normalize_mac(value)) when "grub" host = @redis.hash_get("sched/mac2host", normalize_mac(value)) @@ -135,6 +135,29 @@ class Sched return response.to_json end + private def get_boot_libvirt(job : Job) + response = {} of String => String | Nil | Array(String) | Hash(String, String) + + response["job_id"] = job.id + response["kernel_uri"] = job.kernel_uri.lchop("kernel ") + + initrds_uri = job["initrds_uri"]? + initrds_uri = initrds_uri.as_a.map(&.as_s.lchop("initrd ")) if initrds_uri + response["initrds_uri"] = initrds_uri + + kernel_params = job["kernel_params"]? + kernel_params = kernel_params.as_a.map(&.to_s).reject(&.starts_with?("initrd=")).join(" ") if kernel_params + response["kernel_params"] = kernel_params + + response["result_root"] = job.result_root + response["LKP_SERVER"] = "#{job["LKP_SERVER"]?}" + + # Not implement now + response["templates"] = {} of String => String + + return response.to_json + end + private def get_boot_grub(job : Job) initrd_lkp_cgz = "lkp-#{job.os_arch}.cgz" @@ -176,6 +199,8 @@ class Sched case boot_type when "ipxe" return job ? get_boot_ipxe(job) : ipxe_msg("No job now") + when "libvirt" + return job ? get_boot_libvirt(job) : {"info" => "No job now"}.to_json when "grub" return job ? get_boot_grub(job) : grub_msg("No job now") when "container" -- 2.23.0

1 1

[PATCH lkp-tests] lib/detect-system.sh: add system arch riscv64
by Liu Yinsi 06 Jan '21

06 Jan '21

[why] when run job in riscv64 qemu, _system_arch=unknown, it cause qemu quit, so add it. test: /srv/result/iperf/2021-01-06/vm-8p64g/debian-sid-riscv64/tcp-30/z9.281254 Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- lib/detect-system.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/detect-system.sh b/lib/detect-system.sh index 90006c8f0..1b344b4f0 100755 --- a/lib/detect-system.sh +++ b/lib/detect-system.sh @@ -31,6 +31,8 @@ parse_executable_arch() _system_arch=aarch64;; *ARM) _system_arch=arm;; + *RISC-V) + _system_arch=riscv64;; *) _system_arch=unknown return 1;; -- 2.23.0

1 0