February 2021 - Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] container/defconfig.rb: optimize skip rebuild image judge
by Wei Jihui 10 Feb '21

10 Feb '21

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- container/defconfig.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/container/defconfig.rb b/container/defconfig.rb index aa7d2fa..602b498 100755 --- a/container/defconfig.rb +++ b/container/defconfig.rb @@ -49,8 +49,7 @@ def get_available_memory end def docker_skip_rebuild(tag) - return if ENV['action'].nil? - return unless ENV['action'].include? 'run-only' + return if ENV['action'] != 'run-only' exit 1 if system "docker image inspect #{tag} > /dev/null 2>&1" end -- 2.23.0

1 0

[PATCH v2 lkp-tests] setup/fs: support much values of hdd_partitions parameter
by Cui Yili 10 Feb '21

10 Feb '21

error: hdd_partitions: /dev/vda /dev/vdb as above, setup/fs only deal with /dev/vda. /dev/vdb did not recognize. Signed-off-by: Cui Yili <2268260388(a)qq.com> --- setup/fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/fs b/setup/fs index 23eaa3b85..824c86614 100755 --- a/setup/fs +++ b/setup/fs @@ -159,7 +159,7 @@ mount_fs() { if is_btrfs_raid_levels; then bdevs="${partitions%% *}" else - bdevs="$partitions" + bdevs="$hdd_partitions" fi fs_options -- 2.23.0

1 0

[PATCH v2 lkp-tests 1/2] sbin/makepkg: download submodules from local server by default
by Liu Shaofei 10 Feb '21

10 Feb '21

[why] When building software package by cci-makepkg, the source codes repository contains submodules. By default, these submodules are downloaded from the local server, but the local server does not have submodules download address. So the submodules repository fails to be downloaded to test machine during the build. Signed-off-by: Liu Shaofei <370072077(a)qq.com> --- sbin/makepkg | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/sbin/makepkg b/sbin/makepkg index 7a92ea71b..b592a2ccb 100755 --- a/sbin/makepkg +++ b/sbin/makepkg @@ -587,6 +587,17 @@ download_git() { fi } +# modify submodules address to local server address. +# [ "$DISABLE_DOMAIN_CHANGE" == "false" ] => replace submodules domain, and download it from local server +# [ "$DISABLE_DOMAIN_CHANGE" == "true" ] => not replace submodules domain, and download it from remote end. +modify_gitmodules() { + [ "$DISABLE_DOMAIN_CHANGE" == "false" ] || return + + if [[ -f ".gitmodules" ]] && [[ -n ${LKP_SERVER} ]]; then + echo -e "[url \"git://${LKP_SERVER}/\"]\n\tinsteadOf = https://" >> /etc/gitconfig + fi +} + extract_git() { local netfile=$1 @@ -623,10 +634,7 @@ extract_git() { cd_safe "${dir##*/}" - # modify submodules address to local server address. - if [[ -f ".gitmodules" ]] && [[ -n ${LKP_SERVER} ]]; then - echo -e "[url \"git://${LKP_SERVER}/\"]\n\tinsteadOf = https://" >> /etc/gitconfig - fi + modify_gitmodules local ref=origin/HEAD if [[ -n $fragment ]]; then @@ -3668,6 +3676,7 @@ SRCEXT=${_SRCEXT:-$SRCEXT} GPGKEY=${_GPGKEY:-$GPGKEY} PACKAGER=${_PACKAGER:-$PACKAGER} CARCH=${_CARCH:-$CARCH} +DISABLE_DOMAIN_CHANGE=${DISABLE_DOMAIN_CHANGE:-false} if (( INFAKEROOT )); then if [[ -z $FAKEROOTKEY ]]; then -- 2.23.0

2 3

[PATCH v2 lkp-tests 2/2] tests/cci-makepkg: download submodules from remote end
by Liu Shaofei 10 Feb '21

10 Feb '21

DISABLE_DOMAIN_CHANGE parameter value is true, "sbin/makepkg" file will not replace domain name of submodules, the submodules will be downloaded from remote end. Signed-off-by: Liu Shaofei <370072077(a)qq.com> i# Your branch is ahead of 'origin/master' by 1 commit. --- tests/cci-makepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cci-makepkg b/tests/cci-makepkg index ecbf72134..8c744d807 100755 --- a/tests/cci-makepkg +++ b/tests/cci-makepkg @@ -142,7 +142,7 @@ build_source_pkg() local makepkg="$LKP_SRC/sbin/makepkg ${pkg_args} --config $LKP_SRC/etc/makepkg.conf" echo "${makepkg}" - PACMAN="${mark}" BUILDDIR=$TMP CARCH=$arch PKGEXT=.cgz CGZDEST="$sync_dest/$cgz_name" $makepkg + PACMAN="${mark}" DISABLE_DOMAIN_CHANGE=true BUILDDIR=$TMP CARCH=$arch PKGEXT=.cgz CGZDEST="$sync_dest/$cgz_name" $makepkg [ "$?" == 0 ] || exit 1 update_softlink -- 2.23.0

2 2

[PATCH compass-ci] src/scheduler/kernel_params.cr: no rootovl for local mount
by Xu Xijian 09 Feb '21

09 Feb '21

If the os_mount is "local", there is no need of overlay and it should be writable, so in the kernel params, delete "rootovl" for it and change "ro" to "rw" for it. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- src/scheduler/kernel_params.cr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/scheduler/kernel_params.cr b/src/scheduler/kernel_params.cr index ed64bea..6fbe405 100644 --- a/src/scheduler/kernel_params.cr +++ b/src/scheduler/kernel_params.cr @@ -3,7 +3,9 @@ class Job private def kernel_common_params - return "user=lkp job=/lkp/scheduled/job.yaml RESULT_ROOT=/result/job rootovl ip=dhcp ro" + common_params = "user=lkp job=/lkp/scheduled/job.yaml RESULT_ROOT=/result/job ip=dhcp" + return "#{common_params} rw" if "#{self.os_mount}" == "local" + return "#{common_params} rootovl ro" end private def kernel_custom_params -- 2.23.0

1 0

[PATCH compass-ci] container/defconfig.rb: fix undefined method `includes' for nil:NilClass
by Xu Xijian 09 Feb '21

09 Feb '21

[Why] When "ENV['action']" is nil, it will output error in this line in defconfig.rb: return unless ENV['action'].include? 'run-only' [errlog] Traceback (most recent call last): 1: from ./build:15:in `<main>' /home/xxj/compass-ci/container/defconfig.rb:52:in `docker_skip_rebuild': undefined method `include?' for nil:NilClass (NoMethodError) Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- container/defconfig.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/container/defconfig.rb b/container/defconfig.rb index 7dc9f33..aa7d2fa 100755 --- a/container/defconfig.rb +++ b/container/defconfig.rb @@ -49,6 +49,7 @@ def get_available_memory end def docker_skip_rebuild(tag) + return if ENV['action'].nil? return unless ENV['action'].include? 'run-only' exit 1 if system "docker image inspect #{tag} > /dev/null 2>&1" -- 2.23.0

1 0

[PATCH compass-ci] sparrow/4-docker/buildall: delete redundant wait
by Liu Yinsi 09 Feb '21

09 Feb '21

[why] if `&` is followed by `wait` is invalid to parallel run, in function do_one_build(), already has `wait`, so delete it. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/4-docker/buildall | 1 - 1 file changed, 1 deletion(-) diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index 4fcbac7..e7309fd 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -70,7 +70,6 @@ do [ "$container_name" == 'ssh-r' ] && continue build_depends $dir & - wait start_depends $dir done -- 2.23.0

2 2

[PATCH v2 compass-ci] sparrow/4-docker/buildall: delete redundant wait
by Liu Yinsi 09 Feb '21

09 Feb '21

[why] if `&` is followed by `wait` is invalid to parallel run, in function do_one_build(), already has `wait`and `&`, so delete it. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/4-docker/buildall | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index a4dab4b..96c7385 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -67,8 +67,7 @@ tmpdir=$(mktemp -d) for dir in $CONTAINER_PATH/*/ do - build_depends $dir & - wait + build_depends $dir start_depends $dir done -- 2.23.0

1 0

[PATCH compass-ci] qemu/kvm.sh: kvm support virtual disk
by Cui Yili 09 Feb '21

09 Feb '21

Signed-off-by: Cui Yili <2268260388(a)qq.com> --- providers/qemu/kvm.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/providers/qemu/kvm.sh b/providers/qemu/kvm.sh index 68b9a62..4be33b9 100755 --- a/providers/qemu/kvm.sh +++ b/providers/qemu/kvm.sh @@ -97,6 +97,26 @@ set_helper() [ -f "$helper" ] || helper=/usr/lib/qemu/qemu-bridge-helper } +add_disk() +{ + [ -d "$mount_points" ] || mount_points=$(pwd) + + [ -n "$hdd_partitions" ] && { + local unix_time=$(date +%s) + + local index=0 + for disk in $hdd_partitions + do + qcow2_file="${mount_points}/${unix_time}${disk##*/}.qcow2" + drive="file=${qcow2_file},media=disk,format=qcow2,index=${index}" + ((index++)) + + qemu-img create -fq qcow2 "${qcow2_file}" 512G + kvm+=(-drive ${drive}) + done + } +} + set_nic() { nic="tap,model=virtio-net-pci,helper=$helper,br=br0,mac=${mac}" @@ -134,7 +154,7 @@ print_message() log_info initrds: $initrds log_info append: $append [ "$DEBUG" == "true" ] || log_info less $log_file - + sleep 5 } @@ -228,6 +248,7 @@ set_options print_message public_option +add_disk individual_option run_qemu -- 2.23.0

1 0

[PATCH compass-ci] doc/support-os-os_arch-os_version.md: add 20.03-SP1
by Xu Xijian 09 Feb '21

09 Feb '21

1. add 20.03-SP1 version to this doc, it's already supported 2. adjust some lines to be aligned Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- doc/support-os-os_arch-os_version.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/support-os-os_arch-os_version.md b/doc/support-os-os_arch-os_version.md index 5d30486..f91e91b 100644 --- a/doc/support-os-os_arch-os_version.md +++ b/doc/support-os-os_arch-os_version.md @@ -1,22 +1,24 @@ ``` os os_arch os_version supported-os_mount openeuler aarch64 1.0 cifs/nfs, - 20.03 cifs/nfs, ,initramfs - 20.09 cifs/nfs, ,initramfs + 20.03 cifs/nfs, ,initramfs + 20.03-SP1 cifs/nfs, + 20.09 cifs/nfs, ,initramfs mainline-dailybuild cifs/nfs, 20.03-dailybuild cifs/nfs, 20.09-dailybuild cifs/nfs, 20.03-sp1-dailybuild cifs/nfs, x86 20.03 cifs/nfs, + 20.03-SP1 cifs/nfs, 20.09 cifs/nfs, centos aarch64 7 container, - 7.6.1810 cifs/nfs, ,initramfs - 7.8.2003 cifs/nfs, ,initramfs + 7.6.1810 cifs/nfs, ,initramfs + 7.8.2003 cifs/nfs, ,initramfs 8.1.1911 cifs/nfs, 8 container, x86 7.6.1810 cifs/nfs, 7.8.2003 cifs/nfs, -debian aarch64 sid cifs/nfs, ,initramfs +debian aarch64 sid cifs/nfs, ,initramfs x86 sid cifs/nfs, archlinux aarch64 2020-11-12 cifs/nfs, ``` -- 2.23.0

1 0