- Compass-ci - mailweb.openeuler.org

[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

[PATCH compass-ci] serial_log: change permission
by Wu Zhende 09 Feb '21

09 Feb '21

The automatically generated file may be unreadable due to umask. Change the permission to the required permission when creating. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- providers/docker/docker.rb | 1 + providers/multi-qemu | 1 + 2 files changed, 2 insertions(+) diff --git a/providers/docker/docker.rb b/providers/docker/docker.rb index 56c9754..28ed29b 100755 --- a/providers/docker/docker.rb +++ b/providers/docker/docker.rb @@ -96,6 +96,7 @@ end def record_start_log(log_file, hash: {}) start_time = Time.new File.open(log_file, 'w') do |f| + f.chmod(0664) # fluentd refresh time is 1s # let fluentd to monitor this file first sleep(2) diff --git a/providers/multi-qemu b/providers/multi-qemu index c729c8e..1f945e6 100755 --- a/providers/multi-qemu +++ b/providers/multi-qemu @@ -53,6 +53,7 @@ def record_runtime_log(hostname, start_time: Time.new, is_start: true) log_file = "#{LOG_DIR}/#{hostname}" if is_start File.open(log_file, 'w') do |f| + f.chmod(0664) # fluentd refresh time is 1s # let fluentd to monitor this file first sleep(2) -- 2.23.0

2 1

[PATCH compass-ci] sparrow: start ssh-r container when the host reboot
by Cao Xueliang 09 Feb '21

09 Feb '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- sparrow/7-systemd/cci-network | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sparrow/7-systemd/cci-network b/sparrow/7-systemd/cci-network index 0438935..d01295c 100755 --- a/sparrow/7-systemd/cci-network +++ b/sparrow/7-systemd/cci-network @@ -15,3 +15,5 @@ $CCI_SRC/sparrow/2-network/cifs # --restart=always option is not absolutely reliable # container need to start its dependences firstly. $CCI_SRC/sparrow/4-docker/buildall run-only +# need start ssh-r when the host reboot +$CCI_SRC/container/ssh-r/start -- 2.23.0

1 1

[PATCH v4 compass-ci 3/3] sparrow/4-docker/buildall: delete unnecessary code
by Liu Yinsi 09 Feb '21

09 Feb '21

[why] avoid to rebuild container, this issue already solved by calling docker_skip_rebuild() in each build script, so delete related code. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/4-docker/buildall | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index e6ba448..4fcbac7 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -69,11 +69,8 @@ do container_name=$(basename $dir) [ "$container_name" == 'ssh-r' ] && continue - docker images | grep -wq "$container_name" - if [ "$?" != 0 ] || [ "$action" != "run-only" ]; then - build_depends $dir & - wait - fi + build_depends $dir & + wait start_depends $dir done -- 2.23.0

2 2

[PATCH compass-ci] sparrow/4-docker/buildall: build container ssh-r, but skip run
by Liu Yinsi 09 Feb '21

09 Feb '21

Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/4-docker/buildall | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index 4fcbac7..a4dab4b 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -56,6 +56,7 @@ do_one_run() mkdir $tmpdir/start_$container_name 2>/dev/null && ( cd "$container" + [ "$container_name" == 'ssh-r' ] && continue [ -x first-run ] && ./first-run [ -x start ] && ./start [ "$container_name" == 'initrd-lkp' ] && ./run @@ -66,9 +67,6 @@ tmpdir=$(mktemp -d) for dir in $CONTAINER_PATH/*/ do - container_name=$(basename $dir) - [ "$container_name" == 'ssh-r' ] && continue - build_depends $dir & wait start_depends $dir -- 2.23.0

1 0

[PATCH compass-ci] sparrow/0-package/common: fix invalid sed command
by Liu Yinsi 09 Feb '21

09 Feb '21

before: sed /^Environment=/a\TimeoutSec=0' after: sed -i /^Environment=/a\TimeoutSec=0' Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index fca591c..0324f58 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -48,7 +48,7 @@ cat > /etc/docker/daemon.json <<EOF } EOF -sed '/^Environment=/a\TimeoutSec=0' /usr/lib/systemd/system/docker.service +sed -i '/^Environment=/a\TimeoutSec=0' /usr/lib/systemd/system/docker.service systemctl daemon-reload systemctl restart docker -- 2.23.0

1 0

[PATCH v2 lkp-tests] hosts/*: add default hdd_partitions
by Wang Yong 09 Feb '21

09 Feb '21

add default hdd_partitions for vm Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- hosts/vm-1p1g | 1 + hosts/vm-2p16g | 1 + hosts/vm-2p1g | 1 + hosts/vm-2p32g | 1 + hosts/vm-2p4g | 1 + hosts/vm-2p8g | 1 + 6 files changed, 6 insertions(+) diff --git a/hosts/vm-1p1g b/hosts/vm-1p1g index c64cc3601..1b26b2fc6 100644 --- a/hosts/vm-1p1g +++ b/hosts/vm-1p1g @@ -3,3 +3,4 @@ template: kvm nr_node: 1 nr_cpu: 1 memory: 1G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p16g b/hosts/vm-2p16g index 428450720..21ec35343 100644 --- a/hosts/vm-2p16g +++ b/hosts/vm-2p16g @@ -3,3 +3,4 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 16G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p1g b/hosts/vm-2p1g index c78103361..0052caf1a 100644 --- a/hosts/vm-2p1g +++ b/hosts/vm-2p1g @@ -3,3 +3,4 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 1G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p32g b/hosts/vm-2p32g index 14455f202..ab876e8f9 100644 --- a/hosts/vm-2p32g +++ b/hosts/vm-2p32g @@ -3,3 +3,4 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 32G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p4g b/hosts/vm-2p4g index 7e9570da1..3282e3793 100644 --- a/hosts/vm-2p4g +++ b/hosts/vm-2p4g @@ -3,3 +3,4 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 4G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p8g b/hosts/vm-2p8g index e5d5f846b..d92082523 100644 --- a/hosts/vm-2p8g +++ b/hosts/vm-2p8g @@ -3,3 +3,4 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 8G +hdd_partitions: /dev/vda -- 2.23.0

1 0