- Compass-ci - mailweb.openeuler.org

[PATCH v6 compass-ci 1/3] addsoftware/run: change the example os version
by Xu Xijian 31 Oct '20

31 Oct '20

[why] As the old os version centos/aarch64/76 is not exist, change the version number 76 in given example. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- container/add-software/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container/add-software/run b/container/add-software/run index 99490ee..f4c6833 100755 --- a/container/add-software/run +++ b/container/add-software/run @@ -5,8 +5,8 @@ [ -L "$1/vmlinuz" -a -n "$2" ] || { cat << 'EOF' Example usage: - 1> ./run /os/centos/aarch64/76 pack1 pack2 ... - 2> ./run /os/centos/aarch64/76 $(show-depends-packages centos) + 1> ./run /os/centos/aarch64/7.6.1810 pack1 pack2 ... + 2> ./run /os/centos/aarch64/7.6.1810 $(show-depends-packages centos) centos is an adaption file contain packages mapping from debian to centos, the whole path is '$LKP_SRC/distro/adaptation/centos'. EOF -- 2.23.0

1 0

[PATCH v5 compass-ci 2/2] job.cr: add a key "kernel_version" for initramfs
by Xu Xijian 31 Oct '20

31 Oct '20

When run job with initramfs, there is a default combination of kernel, modules and headers, and I add a key "kernel_version" to make it optional. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- src/lib/job.cr | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 0fd57e0..8bf7a65 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -87,6 +87,10 @@ class Job kernel_append_root kernel_params docker_image + kernel_version + vmlinuz_path + modules_path + headers_path ) macro method_missing(call) @@ -135,6 +139,7 @@ class Job set_result_service() set_os_mount() set_depends_initrd() + set_kernel_version() set_initrds_uri() set_kernel_uri() set_kernel_append_root() @@ -293,9 +298,22 @@ class Job return true end + private def set_kernel_version + boot_dir = "#{SRV_OS}/#{os_dir}/boot" + if self["kernel_version"]? + self["vmlinuz_path"] = "#{boot_dir}/vmlinuz-#{kernel_version}" + self["modules_path"] = "#{boot_dir}/modules-#{kernel_version}.cgz" + self["headers_path"] = "#{boot_dir}/headers-#{kernel_version}.cgz" + else + self["vmlinuz_path"] = "#{boot_dir}/vmlinuz" + self["modules_path"] = "#{boot_dir}/modules.cgz" + self["headers_path"] = "#{boot_dir}/headers.cgz" + end + end + private def set_kernel_uri self["kernel_uri"] = "kernel #{OS_HTTP_PREFIX}" + - "#{JobHelper.service_path("#{SRV_OS}/#{os_dir}/vmlinuz")}" + "#{JobHelper.service_path("#{vmlinuz_path}")}" end private def common_initrds @@ -316,6 +334,10 @@ class Job "#{JobHelper.service_path("#{osimage_dir}/current")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{osimage_dir}/run-ipconfig.cgz")}" + temp_initrds << "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{modules_path}")}" + temp_initrds << "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{headers_path}")}" temp_initrds.concat(initrd_deps.split(/ /)) unless initrd_deps.empty? temp_initrds.concat(initrd_pkg.split(/ /)) unless initrd_pkg.empty? -- 2.23.0

1 0

[PATCH v5 compass-ci 1/2] addsoftware/run: change the example os version
by Xu Xijian 31 Oct '20

31 Oct '20

[why] As the old os version centos/aarch64/76 is not exist, change the version number 76 in given example. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- container/add-software/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container/add-software/run b/container/add-software/run index 99490ee..f4c6833 100755 --- a/container/add-software/run +++ b/container/add-software/run @@ -5,8 +5,8 @@ [ -L "$1/vmlinuz" -a -n "$2" ] || { cat << 'EOF' Example usage: - 1> ./run /os/centos/aarch64/76 pack1 pack2 ... - 2> ./run /os/centos/aarch64/76 $(show-depends-packages centos) + 1> ./run /os/centos/aarch64/7.6.1810 pack1 pack2 ... + 2> ./run /os/centos/aarch64/7.6.1810 $(show-depends-packages centos) centos is an adaption file contain packages mapping from debian to centos, the whole path is '$LKP_SRC/distro/adaptation/centos'. EOF -- 2.23.0

1 0

[PATCH v4 compass-ci 2/2] job.cr: add a key "kernel_version" for initramfs
by Xu Xijian 31 Oct '20

31 Oct '20

When run job with initramfs, there is a default combination of kernel, modules and headers, and I add a key "kernel_version" to make it optional. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- src/lib/job.cr | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 0fd57e0..2656635 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -87,6 +87,10 @@ class Job kernel_append_root kernel_params docker_image + kernel_version + vmlinuz_path + modules_path + headers_path ) macro method_missing(call) @@ -135,6 +139,7 @@ class Job set_result_service() set_os_mount() set_depends_initrd() + set_kernel_version() set_initrds_uri() set_kernel_uri() set_kernel_append_root() @@ -293,9 +298,22 @@ class Job return true end + private def set_kernel_version + boot_dir = "#{SRV_OS}/#{os_dir}/boot" + if self["kernel_version"]? + self["vmlinuz_path"] = "#{boot_dir}/vmlinuz-#{kernel_version}" + self["modules_path"] = "#{boot_dir}/modules-#{kernel_version}.cgz" + self["headers_path"] = "#{boot_dir}/headers-#{kernel_version}.cgz" + else + self["vmlinuz_path"] = "#{boot_dir}/vmlinuz" + self["modules_path"] = "#{boot_dir}/modules.cgz" + self["headers_path"] = "#{boot_dir}/headers.cgz" + end + end + private def set_kernel_uri self["kernel_uri"] = "kernel #{OS_HTTP_PREFIX}" + - "#{JobHelper.service_path("#{SRV_OS}/#{os_dir}/vmlinuz")}" + "#{JobHelper.service_path("#{vmlinuz_path}")}" end private def common_initrds @@ -312,10 +330,15 @@ class Job temp_initrds = [] of String osimage_dir = "#{SRV_INITRD}/osimage/#{os_dir}" + boot_dir = "#{SRV_OS}/#{os_dir}/boot" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{osimage_dir}/current")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{osimage_dir}/run-ipconfig.cgz")}" + temp_initrds << "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{modules_path}")}" + temp_initrds << "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{headers_path}")}" temp_initrds.concat(initrd_deps.split(/ /)) unless initrd_deps.empty? temp_initrds.concat(initrd_pkg.split(/ /)) unless initrd_pkg.empty? -- 2.23.0

1 0

[PATCH v4 compass-ci 1/2] addsoftware/run: change the example os version
by Xu Xijian 31 Oct '20

31 Oct '20

[why] As the old os version centos/aarch64/76 is not exist, change the version number 76 in given example. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- container/add-software/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container/add-software/run b/container/add-software/run index 99490ee..f4c6833 100755 --- a/container/add-software/run +++ b/container/add-software/run @@ -5,8 +5,8 @@ [ -L "$1/vmlinuz" -a -n "$2" ] || { cat << 'EOF' Example usage: - 1> ./run /os/centos/aarch64/76 pack1 pack2 ... - 2> ./run /os/centos/aarch64/76 $(show-depends-packages centos) + 1> ./run /os/centos/aarch64/7.6.1810 pack1 pack2 ... + 2> ./run /os/centos/aarch64/7.6.1810 $(show-depends-packages centos) centos is an adaption file contain packages mapping from debian to centos, the whole path is '$LKP_SRC/distro/adaptation/centos'. EOF -- 2.23.0

1 0

[PATCH lkp-tests] jobs: rename hackbench-20.yaml and fix datasize to loops.
by Zhang Yale 31 Oct '20

31 Oct '20

[Why] hackbench-git is an old version required by the customer. The hackbench-git usage: hackbench [-pipe] <num groups> [process|thread] [loops] It's different from hackbench-1.8 version. The hackbench-1.8 usage: hackbench [-p|--pipe] [-s|--datasize <bytes>] [-l|--loops <num loops>] [-g|groups <num groups] [-f|--fds ,num fds>] [-T|--threads] [-P|--process] [--help] So add hackbench-git.yaml for users. Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- jobs/{hackbench-20.yaml => hackbench-git.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jobs/{hackbench-20.yaml => hackbench-git.yaml} (100%) diff --git a/jobs/hackbench-20.yaml b/jobs/hackbench-git.yaml similarity index 100% rename from jobs/hackbench-20.yaml rename to jobs/hackbench-git.yaml -- 2.23.0

1 0

[PATCH v5 lkp-tests] hackbench/PKGBUILD: fix source
by Zhang Yale 31 Oct '20

31 Oct '20

[Why] Old source "https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-1.8.tar.gz" is not available, So change the source. Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- pkg/hackbench/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/hackbench/PKGBUILD b/pkg/hackbench/PKGBUILD index 797a00e6..842b2596 100644 --- a/pkg/hackbench/PKGBUILD +++ b/pkg/hackbench/PKGBUILD @@ -2,9 +2,9 @@ pkgname=hackbench pkgver=1.8 pkgrel=1 arch=('i386' 'x86_64') -url="https://www.kernel.org/pub/linux/utils/rt-tests" +url="https://git.kernel.org/pub/scm/utils/rt-tests" license=('GPL') -source=("https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-${pkgver}.tar.gz") +source=("https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/rt-test…") sha256sums=('SKIP') package() { -- 2.23.0

1 0

[PATCH v4 lkp-tests] hackbench/PKGBUILD: fix source
by Zhang Yale 31 Oct '20

31 Oct '20

[Why] Old source "https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-1.8.tar.gz" is not available, So change the source. Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- pkg/hackbench/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/hackbench/PKGBUILD b/pkg/hackbench/PKGBUILD index 797a00e6..f8880b64 100644 --- a/pkg/hackbench/PKGBUILD +++ b/pkg/hackbench/PKGBUILD @@ -4,7 +4,7 @@ pkgrel=1 arch=('i386' 'x86_64') url="https://www.kernel.org/pub/linux/utils/rt-tests" license=('GPL') -source=("https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-${pkgver}.tar.gz") +source=("https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/rt-test…") sha256sums=('SKIP') package() { -- 2.23.0

1 1

[PATCH lkp-tests] sshd: modify MAIL_PORT to 49000
by Zhang Yale 31 Oct '20

31 Oct '20

[Why] When we used 11312 as MAIL_PORT, It may be occupied by taskqueue-3060. So we changed MAIL_PORT to 49000. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- daemon/sshd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/sshd b/daemon/sshd index 82db61a6..1a1d59b4 100755 --- a/daemon/sshd +++ b/daemon/sshd @@ -90,7 +90,7 @@ run_email() [ -n "$my_email" ] || return 0 my_username=$(echo "$my_email" | awk -F '@' '{print $1}') compose_email - curl -XPOST "${MAIL_HOST:-$LKP_SERVER}:${MAIL_PORT:-11312}/send_mail_text" -d "$data" + curl -XPOST "${MAIL_HOST:-$LKP_SERVER}:${MAIL_PORT:-49000}/send_mail_text" -d "$data" } run_ssh -- 2.23.0

2 1

review star
by Wu Fengguang 30 Oct '20

30 Oct '20

Yuchuan is our review star, thanks Yuchuan! wfg@crystal /c/todo/bin% ./review-star Review email records in the last 7 days total review paragraph point people 89 43 110 18 Wu Fengguang 62 36 41 12 Cao Xueliang 87 35 37 12 Wei Jihui 13 11 33 13 Yu Chuan 53 16 30 0 Xiao Shenwei 21 10 28 6 Zhang Yuhang 40 9 28 10 Luan Shengde 34 7 25 6 Tong Qunfeng 44 24 25 3 Xu Xijian 41 16 24 1 Liu Yinsi 33 14 24 0 Wang Yong 40 18 22 6 Wu Zhende 32 18 21 3 Zhang Yu 15 12 21 3 Lin Jiaxin 29 23 18 7 Liu Shaofei 17 9 16 0 Li Yuanchao 20 7 14 3 Hu Xuejiao 85 9 13 0 Wang Chenglong 11 11 12 2 Sun Yukui 18 5 11 1 Lu Weitao 44 11 9 1 Zhang Yale 16 2 5 0 Zhang Dewan 15 6 5 2 Cui Yili 22 5 5 1 Li Ping 17 4 4 1 Bai Jing 20 3 4 0 Ren Wen 39 2 3 1 Lu Kaiyi 1 1 2 0 Zhou Shengrui 1 0 0 0 Shi Zhichao

1 0