- Compass-ci - mailweb.openeuler.org

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

19 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 lkp-tests] jobs/rpmbuild-pkg.yaml: change the rpm_repo field to level-1 parameter
by Li Ping 19 Feb '21

19 Feb '21

Signed-off-by: Li Ping <1477412247(a)qq.com> --- jobs/rpmbuild-pkg.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/rpmbuild-pkg.yaml b/jobs/rpmbuild-pkg.yaml index 19fd5ec28..53e145b3b 100644 --- a/jobs/rpmbuild-pkg.yaml +++ b/jobs/rpmbuild-pkg.yaml @@ -1,5 +1,5 @@ suite: rpmbuild-pkg category: functional +rpm_repo: rpmbuild-pkg: - rpm_repo: -- 2.23.0

1 0

[PATCH lkp-tests] tests/rpmbuild-pkg: fix no such file error
by Li Ping 19 Feb '21

19 Feb '21

[why]: grep: 2ping.spec: No such file or directory sed: no input files --- tests/rpmbuild-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/rpmbuild-pkg b/tests/rpmbuild-pkg index 156ca0f63..781d04a0d 100755 --- a/tests/rpmbuild-pkg +++ b/tests/rpmbuild-pkg @@ -35,7 +35,7 @@ download_rpm_repo() build_rpm() { spec_dir=${HOME}/rpmbuild/SPECS/$benchmark.spec - sed -i 's/^$Source[^ ]*:[ \t]*$https/\1http/g' `grep http -rl $benchmark.spec` + sed -i 's/^$Source[^ ]*:[ \t]*$https/\1http/g' `grep http -rl $spec_dir` # Install build depends yum-builddep -y $spec_dir # Download tar.gz to default path ${HOME}/rpmbuild/SOURCE -- 2.23.0

1 0

[PATCH v4 compass-ci 1/2] doc: add job/os_mount.md
by Yu Chuan 19 Feb '21

19 Feb '21

Add description of os_mount field in job.yaml. This patch is the description when os_mount=local, and other values of os_mount will be added in the patch later. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- doc/job/os_mount.md | 94 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 doc/job/os_mount.md diff --git a/doc/job/os_mount.md b/doc/job/os_mount.md new file mode 100644 index 000000000000..226251a8bace --- /dev/null +++ b/doc/job/os_mount.md @@ -0,0 +1,94 @@ +# Summary +========= + +`os_mount` defines the mount method of testbox's root partition. + +It has the following optional values: + - nfs + - cifs + - initramfs + - container + - local + +Usage example: + - submit iperf.yaml testbox=vm-2p8g os_mount=nfs + - submit iperf.yaml testbox=vm-2p8g os_mount=cifs + - submit iperf.yaml testbox=vm-2p8g os_mount=initramfs + - submit iperf.yaml testbox=dc-8g os_mount=container + - submit iperf.yaml testbox=vm-2p8g os_mount=local + +# Optional Values +================= + +## Work flow when os_mount=local + +1. user submit job with os_mount: local + - optional {kernel_append_root}: + - save_root_partition: give an iconic string, then the root partition data used by this job will be retained. + and you can use the root partition data of this job in the futher job by {use_root_partition}. + - use_root_partition : give an iconic string, then the root partition data generated by the + pervious job which has the {save_root_partition} field will be used. + - root_partition_size: specify the size of root partition, *default is 10G*. + + - tips: + - value of {save_root_partition} and {use_root_partition} need to be iconic enough, uuid is recommended. + - value of {save_root_partition} and {use_root_partition} will be the suffix of logical volume. + +2. scheduler return the ipxe_str to testbox + ``` + dhcp + initrd http://${http_server_ip}:${http_server_port}/os/openeuler/aarch64/20.03-iso-snapshots/{timestamp}/initrd.lkp + initrd http://${http_server_ip}:${http_server_port}/os/openeuler/aarch64/20.03-iso-snapshots/{timestamp}/boot/vmlinuz + imgargs vmlinux root=/dev/mapper/os-openeuler_aarch64_20.03 rootfs_src={nfs_server_ip}:os/openeuler/aarch64/20.03-iso-snapshots/{timestamp} initrd=initrd.lkp {kernel_append_root} + boot + ``` + +3. dracut step of boot + ``` + if have {use_root_partition}; then + base_lv_name=openeuler_aarch64_20.03_{value_of_use_root_partition} + lvdisplay /dev/mappaer/os-{base_lv_name} > /dev/null || exit 1 + + if have {save_root_partition}; then + boot_lv_name=openeuler_aarch64_20.03_{value_of_save_root_partition} + + if {save_root_partition} == {use_root_partition}; then + boot from /dev/mappaer/os-{boot_lv_name} + fi + + lvremove -f /dev/mappaer/os-{boot_lv_name} + lvcreate /dev/mappaer/os-{boot_lv_name} from /dev/mappaer/os-{base_lv_name} || exit 1 + boot from /dev/mappaer/os-{boot_lv_name} + else + boot_lv_name=openeuler_aarch64_20.03_{value_of_use_root_partition} + boot from /dev/mappaer/os-{boot_lv_name} + fi + + else: + base_lv_name=openeuler_aarch64_20.03_{timestamp} + lvdisplay /dev/mappaer/os-{base_lv_name} > /dev/null || { + # create logical volume + lvcreate -L {root_partition_size} -n {base_lv_name} os || exit 1 + + # rsync nfsroot to lvm:/dev/mapper/os-{base_lv_name} + mount -t nfs {nfs_server_ip}:os/openeuler/aarch64/20.03-iso-snapshots/{timestamp} /mnt + mkdir /mnt1 && mount /dev/mapper/os-{base_lv_name} /mnt1 + cp -a /mnt/. /mnt1/ + umount /mnt /mnt1 + + # change premission of lvm:/dev/mapper/os-{base_lv_name} to readonly + lvchange -p r /dev/mapper/os-{base_lv_name} + } + + boot_lv_name=openeuler_aarch64_20.03 + if have {save_root_partition}; then + boot_lv_name=openeuler_aarch64_20.03_{value_of_save_root_partition} + fi + + lvremove -f /dev/mappaer/os-{boot_lv_name} + lvcreate /dev/mappaer/os-{boot_lv_name} from /dev/mappaer/os-{base_lv_name} || exit 1 + boot from /dev/mappaer/os-{boot_lv_name} + fi + ``` + +4. execute the job -- 2.23.0

2 2

[PATCH compass-ci] sched: add rpmbuild-pkg upload dir
by Cao Xueliang 19 Feb '21

19 Feb '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/lib/job.cr | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index b724b07..1afc22f 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -154,9 +154,9 @@ class Job set_submit_date() set_pp_params() set_rootfs() + set_os_mount() set_result_root() set_result_service() - set_os_mount() set_depends_initrd() set_kernel() set_initrds_uri() @@ -247,7 +247,7 @@ class Job def get_pkg_common_dir pkg_style = nil - ["cci-makepkg", "cci-depends", "build-pkg"].each do |item| + ["cci-makepkg", "cci-depends", "build-pkg", "rpmbuild-pkg"].each do |item| pkg_style = @hash[item]? break if pkg_style end @@ -276,6 +276,8 @@ class Job package_dir = ",/initrd/pkg/#{common_dir}/#{@hash["cci-makepkg"]["benchmark"]}" elsif @hash["cci-depends"]? package_dir = ",/initrd/deps/#{common_dir}/#{@hash["cci-depends"]["benchmark"]}" + elsif @hash["rpmbuild-pkg"]? + package_dir = ",/initrd/rpmbuild-pkg/#{common_dir}/#{@hash["rpm_repo"].to_s.split("/")[-1]}" elsif @hash["build-pkg"]? if @hash["pkgbuild_repo"].to_s =~ /(packages|community)\/\// package_name = @hash["pkgbuild_repo"].to_s.split("/")[-2] -- 2.23.0

1 0

[PATCH lkp-tests] bootstrap.sh: optimize the test_ping logic
by Yu Chuan 19 Feb '21

19 Feb '21

[Why] 1. '-W' => '-w' -w <deadline> reply wait <deadline> in seconds -W <timeout> time to wait for response deadline(-w) is more appropriate than timeout(-W). 2. delete 'return 1' If ping does not receive any reply packets at all it will exit with code 1. If a packet count and deadline are both specified, and fewer than count packets are received by the time the deadline has arrived, it will also exit with code 1. On other error it exits with code 2. Otherwise it exits with code 0. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- lib/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index 38965ff60755..76f07e6a7669 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -87,7 +87,7 @@ net_devices_link() test_ping() { - ping -c 1 -W 1 $LKP_SERVER > /dev/null || return 1 + ping -c 1 -w 1 $LKP_SERVER > /dev/null } network_ok() -- 2.23.0

1 0

[PATCH lkp-tests] distro/depends/rpmbuild-pkg: add depend pkg
by Wei Jihui 19 Feb '21

19 Feb '21

[Error] yum-builddep: command not found [How] %yum provides yum-builddep dnf-plugins-core-4.0.11-5.oe1.noarch : Core Plugins for DNF Repo : @System Matched from: Filename : /usr/bin/yum-builddep Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- distro/depends/rpmbuild-pkg | 1 + 1 file changed, 1 insertion(+) diff --git a/distro/depends/rpmbuild-pkg b/distro/depends/rpmbuild-pkg index 6f00a6a2..50fd9b75 100644 --- a/distro/depends/rpmbuild-pkg +++ b/distro/depends/rpmbuild-pkg @@ -1,2 +1,3 @@ build-essential rpmdevtools +dnf-plugins-core -- 2.23.0

1 0

[PATCH v4 compass-ci 2/2] doc: add job/rootfs_disk.md
by Yu Chuan 19 Feb '21

19 Feb '21

Add description of rootfs_disk field in job.yaml. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- doc/job/rootfs_disk.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 doc/job/rootfs_disk.md diff --git a/doc/job/rootfs_disk.md b/doc/job/rootfs_disk.md new file mode 100644 index 000000000000..18d165ca1e08 --- /dev/null +++ b/doc/job/rootfs_disk.md @@ -0,0 +1,27 @@ +# Summary +========= + +`rootfs_disk` defines a list of disks, these disks will be combined into one volume group(os), +this volume group will have multiple logical volume, storing multiple rootfs, each of these +logical volume corresponds to a rootfs, such as follow: + /dev/mapper/ + . + ├── os-openeuler_aarch64_20.03 + ├── os-openeuler_aarch64_20.03_{timestamp} + ├── os-openeuler_aarch64_20.03_sp1 + ├── os-openeuler_aarch64_20.03_sp1_{timestamp} + └── ... + +Addition: +1. `/dev/mapper/os-{os}_{os_arch}_{os_version}_{timestamp}` + - is a readonly logical volume + - used for backup and rollback + +2. `/dev/mapper/os-{os}_{os_arch}_{os_version}` + - is a read write logical volume + - use for boot and run job + - defaultly, this logical volume will be wiped before every job run + +3. every logical volume default size: 10G + +4. more info can refer os_mount.md -- 2.23.0

2 2

[PATCH compass-ci 2/4] container/mail-robot: add handle forwarded my_name/my_email(s)
by Luan Shengde 19 Feb '21

19 Feb '21

[why] for forwarded email from security admins, the email content will contain my_name/my_email(s) waiting to be assigned an account. a forwarded email may contain multi my_name/my_email(s), just loop them. add store lab to ES Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/mail-robot/lib/apply-account.rb | 49 ++++++++++++++++++++--- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/container/mail-robot/lib/apply-account.rb b/container/mail-robot/lib/apply-account.rb index e8288d7..bc340ad 100755 --- a/container/mail-robot/lib/apply-account.rb +++ b/container/mail-robot/lib/apply-account.rb @@ -54,6 +54,8 @@ class ApplyAccount @mail_content = mail_content @es_host = @send_mail_host @es_port = ES_PORT + # email address file for security admins. + @sec_admins = YAML.load_file '/etc/compass-ci/conf/sec_admins.yaml' @my_info = {} end @@ -63,11 +65,31 @@ class ApplyAccount # in order to successfully send email for failed parsing # firstly get my_email before execute parse_mail_content is needed @my_info['my_email'] = @mail_content.from[0] - parse_mail_content - apply_my_account - store_account_info - send_mail('') + # for the forwarded email, we will get the email/name from the mail_content + # all emails from security admins will be treated as forwarded emails. + # the mail_content may like: + # --- + # my_name_1: my_email_1 + # my_name_2: my_email_2 + # --- + # the forwarded email allowed to contain multi emails/names + # in this case, we will loop them + if @sec_admins.include? @my_info['my_email'] + users = forward_users + users.each do |user| + @my_info.clear + next if user.match?(/---/) + + @my_info['my_name'], @my_info['my_email'] = user.split(/:\s+/) + @my_info['my_ssh_pubkey'] = [] + applying_account + sleep 10 + end + else + parse_mail_content + applying_account + end rescue StandardError => e puts e.message puts e.backtrace @@ -75,6 +97,17 @@ class ApplyAccount send_mail(e.message) end + def forward_users + forward_email_content = ParseApplyAccountEmail.new(@mail_content) + forward_email_content.extract_users + end + + def applying_account + apply_my_account + store_account_info + send_mail('') + end + def parse_mail_content parse_apply_account_email = ParseApplyAccountEmail.new(@mail_content) @@ -93,7 +126,9 @@ class ApplyAccount apply_info['my_token'] = my_account_es['my_uuid'] if my_account_es['my_token'].nil? apply_info.update my_account_es apply_info.update @my_info - apply_info['my_ssh_pubkey'] = (apply_info['my_ssh_pubkey'] + my_ssh_pubkey_new).uniq + if my_ssh_pubkey_new + apply_info['my_ssh_pubkey'] = (apply_info['my_ssh_pubkey'] + my_ssh_pubkey_new).uniq + end @my_info.update apply_info apply_info['is_update_account'] = true apply_info @@ -102,6 +137,9 @@ class ApplyAccount def apply_my_account my_account_es = read_my_account_es apply_info = {} + + # lab will also be stored to ES. + @my_info['lab'] = ENV['lab'] if my_account_es build_apply_info(apply_info, my_account_es) else @@ -109,7 +147,6 @@ class ApplyAccount @my_info['my_token'] = my_token apply_info.update @my_info end - apply_info['lab'] = ENV['lab'] apply_new_account(apply_info, my_account_es) end -- 2.23.0

2 7

[PATCH compass-ci 1/4] container/mail-robot: optimize regular express
by Luan Shengde 19 Feb '21

19 Feb '21

[why] the mail robot will enable forwarded emails from security admins. the mail subject may 'apply account', 'Fw: apply account', .etc. Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/mail-robot/mail-robot.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/mail-robot/mail-robot.rb b/container/mail-robot/mail-robot.rb index a809eae..c3bc943 100755 --- a/container/mail-robot/mail-robot.rb +++ b/container/mail-robot/mail-robot.rb @@ -32,7 +32,7 @@ def handle_new_email(mail_file, mail_drafts) end def apply_account(mail_content) - return unless mail_content.subject == 'apply account' + return unless mail_content.subject.match?(/apply account/i) assign_uuid = ApplyAccount.new(mail_content) assign_uuid.check_to_send_account -- 2.23.0

2 2