- Compass-ci - mailweb.openeuler.org

[PATCH v2 compass-ci 2/3] container/dracut-initrd: change someof the handle logic according to scheme doc
by Xu Xijian 11 Mar '21

11 Mar '21

Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- .../dracut-initrd/bin/set-local-sysroot.sh | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/container/dracut-initrd/bin/set-local-sysroot.sh b/container/dracut-initrd/bin/set-local-sysroot.sh index dc9000b..240551a 100644 --- a/container/dracut-initrd/bin/set-local-sysroot.sh +++ b/container/dracut-initrd/bin/set-local-sysroot.sh @@ -5,9 +5,9 @@ analyse_kernel_cmdline_params() { # example: $nfs_server_ip:/os/${os}/${os_arch}/${os_version}-snapshots/20210310005959 rootfs_src=$(echo $"$rootfs" | sed 's/\///') timestamp="$(basename $root)" - os="$(echo $root_src | awk -F '/|-' '{print $2}')" - os_arch="$(echo $root_src | awk -F '/|-' '{print $3}')" - os_version="$(echo $root_src | awk -F '/|-' '{print $4}')" + os="$(echo $rootfs_src | awk -F '/|-' '{print $2}')" + os_arch="$(echo $rootfs_src | awk -F '/|-' '{print $3}')" + os_version="$(echo $rootfs_src | awk -F '/|-' '{print $4}')" os_info="${os}_${os_arch}_${os_version}" export rootfs_src timestamp os_info } @@ -58,22 +58,22 @@ analyse_kernel_cmdline_params sed -i "s/^locking_type = .*/locking_type = 1/" /etc/lvm/lvm.conf use_root_partition="$(getarg use_root_partition=)" -if [ -n "$use_root_partition" ]; then - src_lv="$use_root_partition" # /dev/mapper/os-${os_info}_${timestamp} +if [ -z "$use_root_partition" ]; then + src_lv="/dev/mapper/os-${os_info}_$timestamp" sync_src_lv "$src_lv" else - src_lv="/dev/mapper/os-${os_info}_$timestamp" - [ -e "src_lv" ] || { + src_lv="$use_root_partition" + [ -e "$src_lv" ] || { echo "warn dracut: FATAL: no src_lv with local mount, reboot" reboot } fi save_root_partition="$(getarg save_root_partition=)" -if [ -n "$save_root_partition" ]; then - boot_lv="$save_root_partition" -else +if [ -z "$save_root_partition" ]; then boot_lv="/dev/mapper/os-${os_info}" +else + boot_lv="$save_root_partition" fi snapshot_boot_lv "$src_lv" "$boot_lv" -- 2.23.0

1 0

[PATCH v2 compass-ci 1/3] container/dracut-initrd: add basename into openeuler's 21xx+ kernel
by Xu Xijian 11 Mar '21

11 Mar '21

[why] It seems openeuler 21xx+ kernel not support cmd basename, our overlay need this cmd, so add basename into dracut module to enable initrd. [errlog] //lib/dracut/hooks/pre-pivot/10-overlay-mount.sh: line 50: basename: command not found //lib/dracut/hooks/pre-pivot/10-overlay-mount.sh: line 65: basename: command not found Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- container/dracut-initrd/bin/setup-dracut.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/dracut-initrd/bin/setup-dracut.sh b/container/dracut-initrd/bin/setup-dracut.sh index 45e895c..494588a 100755 --- a/container/dracut-initrd/bin/setup-dracut.sh +++ b/container/dracut-initrd/bin/setup-dracut.sh @@ -17,7 +17,7 @@ cp -a /usr/local/bin/cifs-lib.sh /usr/lib/dracut/modules.d/95cifs/ cat overlay-lkp.sh >> /usr/lib/dracut/modules.d/90overlay-root/overlay-mount.sh sed -i "/install() {/a\ inst /usr/bin/awk" /usr/lib/dracut/modules.d/40network/module-setup.sh -sed -i "/install() {/a\ inst /sbin/mke2fs" /usr/lib/dracut/modules.d/98dracut-systemd/module-setup.sh +sed -i "/install() {/a\ inst /sbin/mke2fs /usr/bin/basename" /usr/lib/dracut/modules.d/98dracut-systemd/module-setup.sh pre_mount_file="/usr/lib/dracut/modules.d/98dracut-systemd/dracut-pre-mount.sh" [ "$(sed -n '$p' $pre_mount_file)" = "exit 0" ] && sed -i '$d' "$pre_mount_file" cat set-local-sysroot.sh >> "$pre_mount_file" -- 2.23.0

1 0

[PATCH lkp-tests] add multi-qemu-x86.yaml
by Zhang Dewan 11 Mar '21

11 Mar '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- jobs/multi-qemu-x86.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 jobs/multi-qemu-x86.yaml diff --git a/jobs/multi-qemu-x86.yaml b/jobs/multi-qemu-x86.yaml new file mode 100644 index 00000000..5539c1ad --- /dev/null +++ b/jobs/multi-qemu-x86.yaml @@ -0,0 +1,23 @@ +suite: multi-qemu +category: functional +simplify-ci: +runtime: 100d +multi-qemu-0: + nr_vm: 5 + tbox_group: vm-2p1g-x86 +multi-qemu-1: + nr_vm: 5 + tbox_group: vm-2p2g-x86 +multi-qemu-2: + nr_vm: 5 + tbox_group: vm-2p4g-x86 +multi-qemu-3: + nr_vm: 10 + tbox_group: vm-2p8g-x86 +multi-qemu-4: + nr_vm: 5 + tbox_group: vm-2p16g-x86 +multi-qemu-5: + nr_vm: 1 + tbox_group: vm-2p32g-x86 +sleep: -- 2.23.0

1 0

[PATCH v2 lab-z9 2/2] add x86 vm host file
by Zhang Dewan 11 Mar '21

11 Mar '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- hosts/vm-1p1g-x86 | 3 ++- hosts/vm-2p16g-x86 | 3 ++- hosts/vm-2p1g-x86 | 3 ++- hosts/vm-2p32g-x86 | 3 ++- hosts/vm-2p4g-x86 | 3 ++- hosts/vm-2p8g-x86 | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/hosts/vm-1p1g-x86 b/hosts/vm-1p1g-x86 index 5c0e081..b278e80 100644 --- a/hosts/vm-1p1g-x86 +++ b/hosts/vm-1p1g-x86 @@ -1,5 +1,6 @@ +arch: aarch64 provider: qemu -template: pxe +template: kvm nr_node: 1 nr_cpu: 1 memory: 1G diff --git a/hosts/vm-2p16g-x86 b/hosts/vm-2p16g-x86 index 8abda03..cd49afc 100644 --- a/hosts/vm-2p16g-x86 +++ b/hosts/vm-2p16g-x86 @@ -1,5 +1,6 @@ +arch: aarch64 provider: qemu -template: pxe +template: kvm nr_node: 1 nr_cpu: 2 memory: 16G diff --git a/hosts/vm-2p1g-x86 b/hosts/vm-2p1g-x86 index 60658d3..4fffd2a 100644 --- a/hosts/vm-2p1g-x86 +++ b/hosts/vm-2p1g-x86 @@ -1,5 +1,6 @@ +arch: aarch64 provider: qemu -template: pxe +template: kvm nr_node: 1 nr_cpu: 2 memory: 1G diff --git a/hosts/vm-2p32g-x86 b/hosts/vm-2p32g-x86 index 2d7bb13..c7cc583 100644 --- a/hosts/vm-2p32g-x86 +++ b/hosts/vm-2p32g-x86 @@ -1,5 +1,6 @@ +arch: aarch64 provider: qemu -template: pxe +template: kvm nr_node: 1 nr_cpu: 2 memory: 32G diff --git a/hosts/vm-2p4g-x86 b/hosts/vm-2p4g-x86 index 638f803..41d0a3b 100644 --- a/hosts/vm-2p4g-x86 +++ b/hosts/vm-2p4g-x86 @@ -1,5 +1,6 @@ +arch: aarch64 provider: qemu -template: pxe +template: kvm nr_node: 1 nr_cpu: 2 memory: 4G diff --git a/hosts/vm-2p8g-x86 b/hosts/vm-2p8g-x86 index caa6a88..8bc5cad 100644 --- a/hosts/vm-2p8g-x86 +++ b/hosts/vm-2p8g-x86 @@ -1,5 +1,6 @@ +arch: aarch64 provider: qemu -template: pxe +template: kvm nr_node: 1 nr_cpu: 2 memory: 8G -- 2.23.0

1 0

[PATCH v2 lab-z9 1/2] add x86 vm host file
by Zhang Dewan 11 Mar '21

11 Mar '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- hosts/vm-1p1g-x86 | 6 ++++++ hosts/vm-2p16g-x86 | 6 ++++++ hosts/vm-2p1g-x86 | 6 ++++++ hosts/vm-2p32g-x86 | 6 ++++++ hosts/vm-2p4g-x86 | 6 ++++++ hosts/vm-2p8g-x86 | 6 ++++++ 6 files changed, 36 insertions(+) create mode 100644 hosts/vm-1p1g-x86 create mode 100644 hosts/vm-2p16g-x86 create mode 100644 hosts/vm-2p1g-x86 create mode 100644 hosts/vm-2p32g-x86 create mode 100644 hosts/vm-2p4g-x86 create mode 100644 hosts/vm-2p8g-x86 diff --git a/hosts/vm-1p1g-x86 b/hosts/vm-1p1g-x86 new file mode 100644 index 0000000..5c0e081 --- /dev/null +++ b/hosts/vm-1p1g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 1 +memory: 1G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p16g-x86 b/hosts/vm-2p16g-x86 new file mode 100644 index 0000000..8abda03 --- /dev/null +++ b/hosts/vm-2p16g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 16G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p1g-x86 b/hosts/vm-2p1g-x86 new file mode 100644 index 0000000..60658d3 --- /dev/null +++ b/hosts/vm-2p1g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 1G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p32g-x86 b/hosts/vm-2p32g-x86 new file mode 100644 index 0000000..2d7bb13 --- /dev/null +++ b/hosts/vm-2p32g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 32G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p4g-x86 b/hosts/vm-2p4g-x86 new file mode 100644 index 0000000..638f803 --- /dev/null +++ b/hosts/vm-2p4g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 4G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p8g-x86 b/hosts/vm-2p8g-x86 new file mode 100644 index 0000000..caa6a88 --- /dev/null +++ b/hosts/vm-2p8g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 8G +hdd_partitions: /dev/vda -- 2.23.0

1 0

[PATCH v1 lab-z9] add x86 vm host file
by Zhang Dewan 11 Mar '21

11 Mar '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- hosts/vm-1p1g-x86 | 6 ++++++ hosts/vm-2p16g-x86 | 6 ++++++ hosts/vm-2p1g-x86 | 6 ++++++ hosts/vm-2p32g-x86 | 6 ++++++ hosts/vm-2p4g-x86 | 6 ++++++ hosts/vm-2p8g-x86 | 6 ++++++ 6 files changed, 36 insertions(+) create mode 100644 hosts/vm-1p1g-x86 create mode 100644 hosts/vm-2p16g-x86 create mode 100644 hosts/vm-2p1g-x86 create mode 100644 hosts/vm-2p32g-x86 create mode 100644 hosts/vm-2p4g-x86 create mode 100644 hosts/vm-2p8g-x86 diff --git a/hosts/vm-1p1g-x86 b/hosts/vm-1p1g-x86 new file mode 100644 index 0000000..5c0e081 --- /dev/null +++ b/hosts/vm-1p1g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 1 +memory: 1G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p16g-x86 b/hosts/vm-2p16g-x86 new file mode 100644 index 0000000..8abda03 --- /dev/null +++ b/hosts/vm-2p16g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 16G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p1g-x86 b/hosts/vm-2p1g-x86 new file mode 100644 index 0000000..60658d3 --- /dev/null +++ b/hosts/vm-2p1g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 1G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p32g-x86 b/hosts/vm-2p32g-x86 new file mode 100644 index 0000000..2d7bb13 --- /dev/null +++ b/hosts/vm-2p32g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 32G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p4g-x86 b/hosts/vm-2p4g-x86 new file mode 100644 index 0000000..638f803 --- /dev/null +++ b/hosts/vm-2p4g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 4G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p8g-x86 b/hosts/vm-2p8g-x86 new file mode 100644 index 0000000..caa6a88 --- /dev/null +++ b/hosts/vm-2p8g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 8G +hdd_partitions: /dev/vda -- 2.23.0

1 0

[PATCH lkp-tests 2/2] add x86 vm host file
by Zhang Dewan 11 Mar '21

11 Mar '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- hosts/vm-1p1g-x86 | 6 ++++++ hosts/vm-2p16g-x86 | 6 ++++++ hosts/vm-2p1g-x86 | 6 ++++++ hosts/vm-2p32g-x86 | 6 ++++++ hosts/vm-2p4g-x86 | 6 ++++++ hosts/vm-2p8g-x86 | 6 ++++++ 6 files changed, 36 insertions(+) create mode 100644 hosts/vm-1p1g-x86 create mode 100644 hosts/vm-2p16g-x86 create mode 100644 hosts/vm-2p1g-x86 create mode 100644 hosts/vm-2p32g-x86 create mode 100644 hosts/vm-2p4g-x86 create mode 100644 hosts/vm-2p8g-x86 diff --git a/hosts/vm-1p1g-x86 b/hosts/vm-1p1g-x86 new file mode 100644 index 00000000..5c0e081c --- /dev/null +++ b/hosts/vm-1p1g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 1 +memory: 1G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p16g-x86 b/hosts/vm-2p16g-x86 new file mode 100644 index 00000000..8abda03f --- /dev/null +++ b/hosts/vm-2p16g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 16G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p1g-x86 b/hosts/vm-2p1g-x86 new file mode 100644 index 00000000..60658d38 --- /dev/null +++ b/hosts/vm-2p1g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 1G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p32g-x86 b/hosts/vm-2p32g-x86 new file mode 100644 index 00000000..2d7bb132 --- /dev/null +++ b/hosts/vm-2p32g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 32G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p4g-x86 b/hosts/vm-2p4g-x86 new file mode 100644 index 00000000..638f803f --- /dev/null +++ b/hosts/vm-2p4g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 4G +hdd_partitions: /dev/vda diff --git a/hosts/vm-2p8g-x86 b/hosts/vm-2p8g-x86 new file mode 100644 index 00000000..caa6a88f --- /dev/null +++ b/hosts/vm-2p8g-x86 @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +nr_node: 1 +nr_cpu: 2 +memory: 8G +hdd_partitions: /dev/vda -- 2.23.0

1 0

[PATCH lkp-tests 1/2] add a host group in lkp-tests/hosts
by Zhang Dewan 11 Mar '21

11 Mar '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- hosts/taishan200-2280-2s48p-256g | 1 + 1 file changed, 1 insertion(+) create mode 100644 hosts/taishan200-2280-2s48p-256g diff --git a/hosts/taishan200-2280-2s48p-256g b/hosts/taishan200-2280-2s48p-256g new file mode 100644 index 00000000..6399b995 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g @@ -0,0 +1 @@ +arch: aarch64 -- 2.23.0

1 0

help star
by Wu Fengguang 11 Mar '21

11 Mar '21

Xueliang is our help star, thanks Xueliang! ~/todo/bin% ./help-star 19.6 Wu Fengguang 18.6 Cao Xueliang 15.9 Wei Jihui 15.2 Yu Chuan 10.8 Wu Zhende 8.8 Luan Shengde 7.8 Liu Yinsi 6.8 Wang Chenglong 6.7 Lin Jiaxin 5.6 Bai Jing 5.4 Wang Yong 5.3 Cui Yili 5.0 Xu Xijian 4.8 Li Yuanchao 4.6 Liu Shaofei 3.3 Lu Weitao 3.1 Zhang Dewan 1.8 Du Kaitian 0.9 Li Ping 0.0 Zhang Yale

1 0

review star
by Wu Fengguang 11 Mar '21

11 Mar '21

Jihui is our review star again, thanks Jihui! ~/todo/bin% ./review-star Review email records in the last 7 days total review paragraph point people 30 17 26 24 Xu Xijian 80 18 27 22 Wei Jihui 87 5 14 19 Yu Chuan 51 4 5 9 Cao Xueliang 32 13 32 7 Luan Shengde 16 3 3 3 Wu Zhende 5 2 1 2 Cui Yili 15 5 7 2 Wu Fengguang 5 2 2 1 Lin Jiaxin 9 0 0 0 Zhang Dewan 11 3 8 0 Liu Shaofei 3 0 0 0 Wang Yong 21 0 0 0 Liu Yinsi 13 0 0 0 Li Yuanchao 13 0 0 0 Bai Jing 26 1 2 0 Lu Weitao 12 1 1 0 Wang Chenglong 28 0 0 0 Li Ping

1 0