December 2020 - Compass-ci - mailweb.openeuler.org

[PATCH v4 lkp-tests] lkp-tests/tests: add rpmbuild-pkg to build RPM
by Zhang Yale 10 Dec '20

10 Dec '20

Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- tests/rpmbuild-pkg | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100755 tests/rpmbuild-pkg diff --git a/tests/rpmbuild-pkg b/tests/rpmbuild-pkg new file mode 100755 index 00000000..4467c12c --- /dev/null +++ b/tests/rpmbuild-pkg @@ -0,0 +1,59 @@ +#!/bin/bash +# - rpm_repo + +. $LKP_SRC/lib/debug.sh +. $LKP_SRC/lib/upload.sh + +[ -n "$rpm_repo" ] || die "rpm_repo is empty" +benchmark=${rpm_repo##*/} +sync_dest="/initrd/rpmbuild-pkg/${os_mount}/${os}/${os_arch}/${os_version}/${benchmark}" + +init_workspace() +{ + # generate workspace in ${HOME} + rpmdev-setuptree +} + +get_pkgfile() +{ + curl -sS -H 'Content-Type: Application/json' -XPOST "$LKP_SERVER"':8100/git_command' \ + -d '{"git_repo": "'${rpm_repo}'", "git_command": ["git-show", "HEAD:'$1'"]}' -o "${2}" +} + +request_pkg() +{ + filelist=$(curl -sS -H 'Content-Type: Application/json' -XPOST "$LKP_SERVER"':8100/git_command' \ + -d '{"git_repo": "'${rpm_repo}'", "git_command": ["git-ls-files", "."]}') + for pkgfile in ${filelist[*]} + do + local dir="SOURCES" + echo $pkgfile | egrep "\.spec$" && dir="SPECS" + get_pkgfile "$pkgfile" "${HOME}/rpmbuild/${dir}/$pkgfile" + done +} + +rpmbuild_pkg() +{ + spec_dir=${HOME}/rpmbuild/SPECS/$benchmark.spec + sed -i 's/^$Source[^ ]*:[ \t]*$https/\1http/g' `grep http -rl $benchmark.spec` + # Install build depends + yum-builddep -y $spec_dir + # Download tar.gz to default path ${HOME}/rpmbuild/SOURCE + spectool -g -R $spec_dir + # Building rpm or srpm packages + rpmbuild -ba $spec_dir +} + +upload_pkg() +{ + # rpm package will be generated in "${HOME}/rpmbuild/SRPMS" and "${HOME}/rpmbuild/RPMS" + for file in $(find ${HOME}/rpmbuild/ -type f -name "*.rpm") + do + upload_one_curl ${file} ${sync_dest} + done +} + +init_workspace +request_pkg +rpmbuild_pkg +upload_pkg -- 2.23.0

1 0

[PATCH v3 lkp-tests] sbin/set-env.sh: modify the method of adding env-variables
by Hu Xuejiao 10 Dec '20

10 Dec '20

Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- sbin/set-env.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sbin/set-env.sh b/sbin/set-env.sh index a8b161fa..0b197afc 100644 --- a/sbin/set-env.sh +++ b/sbin/set-env.sh @@ -2,10 +2,17 @@ . lib/env.sh -write_shellrc() +write_shell_profile() { - echo "export LKP_SRC=$PWD" >> $(shell_profile) - echo "export PATH=\$PATH:\$LKP_SRC/sbin:\$LKP_SRC/bin" >> $(shell_profile) + shell_profile_file=$(shell_profile) + if [ $# -gt 0 ]; then + echo $@ >> $shell_profile_file + else + echo "export LKP_SRC=$PWD" >> $shell_profile_file + echo "export PATH=\$PATH:\$LKP_SRC/sbin:\$LKP_SRC/bin" >> $shell_profile_file + fi + + source $shell_profile_file } write_host() @@ -28,5 +35,5 @@ write_host() EOF } -write_shellrc +write_shell_profile write_host -- 2.23.0

1 0

[PATCH v6 compass-ci 3/4] docker-rootfs: the function executed in host
by Wang Chenglong 10 Dec '20

10 Dec '20

the function is called by script on host. it contains get the password, download and load the docker image copy the image package to the host, create the links of vmlinuz and initrd. Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/docker-rootfs/common | 156 +++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100755 container/docker-rootfs/common diff --git a/container/docker-rootfs/common b/container/docker-rootfs/common new file mode 100755 index 0000000..fe37da9 --- /dev/null +++ b/container/docker-rootfs/common @@ -0,0 +1,156 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +# This file is called by script run running on host +# define functions and set host environment variables + +get_host_aarch() +{ + aarch=$(arch) +} + +check_cmd_input() +{ + ( [ $# -eq 2 ] && [ -f "$1" ] ) || { + usage + exit 1 + } + + check_docker_img_file "$1" + init_rootfs_dir "$2" + + export RUN_DIR=$(dirname $(realpath "$0")) +} + +usage() +{ + echo " + Usage: + ./run <src_docker_file_abspath> <dst_rootfs_new_abspath> + + src_docker_file_abspath: source .tar.xz file absolute path with suffix: [ tar.xz ]. + dst_rootfs_new_abspath: destination absolute path to create for rootfs + + Example: + ./run /tmp/openEuler-docker/openEuler-docker.${aarch}.tar.xz /tmp/openeuler-rootfs/ + " +} + +check_docker_img_file() +{ + local allow_docker_img_suffix + local docker_img_name + local docker_img_suffix + + allow_docker_img_suffix='tar.xz' + docker_img_name=$(basename "$1") + docker_img_suffix=${docker_img_name##*.} + + [ "$docker_img_suffix" == 'tar.xz' ] || { + docker_img_suffix=$(echo "$docker_img_name" |awk -F '.' '{print $(NF-1)"."$NF}') + echo "${allow_docker_img_suffix}" |grep -wq "$docker_img_suffix" || { + echo "[ERROR] Only support: .tar.xz file!" + exit 2 + } + } +} + +init_rootfs_dir() +{ + [ -d "$1" ] && return 1 + + local limit_prompt_times + local current_prompt_time + + limit_prompt_times=3 + current_prompt_time=0 + + while true + do + read -r -p "[WARNING] Do you want to create \"$1\"? [y|n]> " if_create + + [ "$if_create" == 'y' ] && break + [ "$if_create" == 'n' ] && echo "[ERROR] User cancelled running." && exit + done + mkdir -p $1 +} + +check_passwd_file() +{ + [ -f "$1" ] || { + echo "[INFO] No password file specified and root password kept." + return 2 + } + export ROOT_NEW_PASSWD=$(cat "$1") +} + +load_docker_img() +{ + echo "Loading docker image..." + docker_repos_tag=$(docker load -i $1) + docker_name_tag=${docker_repos_tag#*:} +} + +cp_rootfs() +{ + docker cp -a rootfs-docker:/tmp/$1 /tmp/ + cd $2 + zcat /tmp/$1 |cpio -idmv +} + +create_get_initrd() { + echo "Creating initrd.lkp via container/dracut-initrd..." + cd "$CCI_SRC/container/dracut-initrd" || { + echo "Failed to change into $CCI_SRC/container/dracut-initrd" + exit 6 + } + ./run "$ROOTFS_DIR/lib/modules/$ROOTFS_KERNEL" + + echo "Finding initrd.lkp under $ROOTFS_DIR/boot ..." + cd "$ROOTFS_DIR" || { + echo "Failed to change into dir \"$ROOTFS_DIR\"" + exit 7 + } + local initrd_lkp=$(find ./boot -name "initramfs.lkp*") && export ROOTFS_INITRD_LKP=$initrd_lkp + + [ -f "$ROOTFS_INITRD_LKP" ] || { + echo "Failed to generate \"$ROOTFS_INITRD_LKP\"" + exit 8 + } + + echo "initrd_lkp: $ROOTFS_INITRD_LKP" +} + +get_rootfs_kernel() +{ + echo "Finding vmlinuz under $ROOTFS_DIR/boot ..." + cd "$ROOTFS_DIR" || { + echo "Failed to change into dir \"$ROOTFS_DIR\"" + exit 5 + } + + local vmlinuz_file + local vmlinuz kernel + vmlinuz_file=$(find ./boot -name "vmlinuz-*" | grep -v rescue) && export ROOTFS_VMLINUZ_FILE=$vmlinuz_file + vmlinuz=$(basename "$vmlinuz_file") && export ROOTFS_VMLINUZ=$vmlinuz + kernel=${vmlinuz:8} && export ROOTFS_KERNEL=$kernel + + echo "vmlinuz: $ROOTFS_VMLINUZ_FILE" + echo "kernel: $ROOTFS_KERNEL" +} + +create_links_vmlinuz_initrd() +{ + export ROOTFS_DIR=$1 + get_rootfs_kernel + create_get_initrd + + echo "Creating links to initrd.lkp and vmlinuz..." + cd $ROOTFS_DIR + ln -fs $ROOTFS_INITRD_LKP initrd.lkp + cd $ROOTFS_DIR/boot + ln -fs $ROOTFS_VMLINUZ vmlinuz + + echo "[INFO] Create links to initrd.lkp and vmlinuz success!" +} -- 2.23.0

2 1

[PATCH compass-ci 3/3] lib/sched.cr: use env.cr
by Wu Zhende 10 Dec '20

10 Dec '20

Get log from env.cr's method Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/sched.cr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index abb8a33..6225ac2 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -5,7 +5,7 @@ require "kemal" require "yaml" require "./job" -require "./json_logger" +require "./env" require "./block_helper" require "./taskqueue_api" require "./remote_git_client" @@ -34,7 +34,7 @@ class Sched @block_helper = BlockHelper.new @rgc = RemoteGitClient.new @env = env - @log = env.get("log").as(JSONLogger) + @log = env.log.as(JSONLogger) end def normalize_mac(mac : String) -- 2.23.0

1 0

[PATCH compass-ci 2/3] scheduler/scheduler.cr: use env.cr
by Wu Zhende 10 Dec '20

10 Dec '20

Use methods in env.cr to simplify the obtaining of sched and log. Replace get_sched_from_env(env) with env.sched. Replace log(env) with env.log. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/scheduler/scheduler.cr | 51 ++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/src/scheduler/scheduler.cr b/src/scheduler/scheduler.cr index 17a6f15..4fde6e3 100644 --- a/src/scheduler/scheduler.cr +++ b/src/scheduler/scheduler.cr @@ -3,6 +3,7 @@ require "kemal" +require "../lib/env" require "../lib/sched" require "../lib/json_logger" @@ -31,28 +32,18 @@ require "../lib/json_logger" module Scheduler VERSION = "0.2.0" - add_context_storage_type(Sched) - add_context_storage_type(JSONLogger) add_context_storage_type(Time::Span) before_all do |env| env.set "start_time", Time.monotonic - env.set "log", JSONLogger.new(env: env) - env.set "sched", Sched.new(env) env.response.headers["Connection"] = "close" - end - - def self.get_sched_from_env(env) - env.get("sched").as(Sched) - end - - def self.log(env) - env.get("log").as(JSONLogger) + env.create_log + env.create_sched end # for debug (maybe kemal debug|logger does better) def self.debug_message(env, response) - log(env).info(%({"from": "#{env.request.remote_address}", "response": #{response.to_json}})) + env.log.info(%({"from": "#{env.request.remote_address}", "response": #{response.to_json}})) end # echo alive @@ -67,20 +58,20 @@ module Scheduler # /boot.xxx/host/${hostname} # /boot.yyy/mac/${mac} get "/boot.:boot_type/:parameter/:value" do |env| - response = get_sched_from_env(env).find_job_boot + response = env.sched.find_job_boot job_id = response[/tmpfs\/(.*)\/job\.cgz/, 1]? - log(env).info(%({"job_id": "#{job_id}", "job_state": "boot"})) if job_id + env.log.info(%({"job_id": "#{job_id}", "job_state": "boot"})) if job_id response end # /~lkp/cgi-bin/gpxelinux.cgi?hostname=:hostname&mac=:mac&last_kernel=:last_kernel get "/~lkp/cgi-bin/gpxelinux.cgi" do |env| - response = get_sched_from_env(env).find_next_job_boot + response = env.sched.find_next_job_boot job_id = response[/tmpfs\/(.*)\/job\.cgz/, 1]? - log(env).info(%({"job_id": "#{job_id}", "job_state": "boot"})) if job_id + env.log.info(%({"job_id": "#{job_id}", "job_state": "boot"})) if job_id response end @@ -89,10 +80,10 @@ module Scheduler # - echo job_id to caller # -- job_id = "0" ? means failed post "/submit_job" do |env| - job_messages = get_sched_from_env(env).submit_job + job_messages = env.sched.submit_job job_messages.each do |job_message| - log(env).info(job_message.to_json) + env.log.info(job_message.to_json) end job_messages.to_json @@ -104,7 +95,7 @@ module Scheduler job_package = env.params.url["job_package"] file_path = ::File.join [Kemal.config.public_folder, job_id, job_package] - log(env).info(%({"job_id": "#{job_id}", "job_state": "download"})) + env.log.info(%({"job_id": "#{job_id}", "job_state": "download"})) send_file env, file_path end @@ -117,7 +108,7 @@ module Scheduler # curl -X PUT "http://localhost:3000/set_host_mac?hostname=wfg&mac=00-01-02-03-04-05" put "/set_host_mac" do |env| if (client_hostname = env.params.query["hostname"]?) && (client_mac = env.params.query["mac"]?) - get_sched_from_env(env).set_host_mac(client_mac, client_hostname) + env.sched.set_host_mac(client_mac, client_hostname) "Done" else @@ -128,7 +119,7 @@ module Scheduler # curl -X PUT "http://localhost:3000/set_host2queues?queues=vm-2p8g.aarch64&host=vm-2p8g.a…" put "/set_host2queues" do |env| if (client_queues = env.params.query["queues"]?) && (client_host = env.params.query["host"]?) - get_sched_from_env(env).set_host2queues(client_host, client_queues) + env.sched.set_host2queues(client_host, client_queues) "Done" else @@ -139,7 +130,7 @@ module Scheduler # curl -X PUT "http://localhost:3000/del_host_mac?mac=00-01-02-03-04-05" put "/del_host_mac" do |env| if client_mac = env.params.query["mac"]? - get_sched_from_env(env).del_host_mac(client_mac) + env.sched.del_host_mac(client_mac) "Done" else @@ -150,7 +141,7 @@ module Scheduler # curl -X PUT "http://localhost:3000/del_host2queues?host=vm-2p8g.aarch64" put "/del_host2queues" do |env| if client_host = env.params.query["host"]? - get_sched_from_env(env).del_host2queues(client_host) + env.sched.del_host2queues(client_host) "Done" else @@ -164,7 +155,7 @@ module Scheduler # ?job_file=/lkp/scheduled/job.yaml&job_state=post_run&job_id=10 # ?job_file=/lkp/scheduled/job.yaml&loadavg=0.28 0.82 0.49 1/105 3389&start_time=1587725398&end_time=1587725698&job_id=10 get "/~lkp/cgi-bin/lkp-jobfile-append-var" do |env| - log(env).info(get_sched_from_env(env).update_job_parameter) + env.log.info(env.sched.update_job_parameter) "Done" end @@ -187,7 +178,7 @@ module Scheduler # response: get "server ip" from cluster state, # return "server=<server ip>". get "/~lkp/cgi-bin/lkp-cluster-sync" do |env| - response = get_sched_from_env(env).request_cluster_state + response = env.sched.request_cluster_state debug_message(env, response) @@ -201,14 +192,14 @@ module Scheduler # get job_id from request job_id = env.params.query["job_id"]? if job_id - log(env).info(get_sched_from_env(env).close_job(job_id)) + env.log.info(env.sched.close_job(job_id)) end "Done" end get "/~lkp/cgi-bin/lkp-wtmp" do |env| - log(env).info(get_sched_from_env(env).update_tbox_wtmp) + env.log.info(env.sched.update_tbox_wtmp) "Done" end @@ -219,10 +210,10 @@ module Scheduler job_id = env.params.query["job_id"].to_s if testbox && ssh_port - get_sched_from_env(env).report_ssh_port(testbox, ssh_port) + env.sched.report_ssh_port(testbox, ssh_port) end - log(env).info(%({"job_id": "#{job_id}", "state": "set ssh port", "ssh_port": "#{ssh_port}", "tbox_name": "#{testbox}"})) + env.log.info(%({"job_id": "#{job_id}", "state": "set ssh port", "ssh_port": "#{ssh_port}", "tbox_name": "#{testbox}"})) "Done" end -- 2.23.0

1 0

[PATCH compass-ci 1/3] lib: add env.cr
by Wu Zhende 10 Dec '20

10 Dec '20

Add env.cr for HTTP::Server::Context. Support HTTP::Server::Context.sched and HTTP::Server::Context.log. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/env.cr | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/lib/env.cr diff --git a/src/lib/env.cr b/src/lib/env.cr new file mode 100644 index 0000000..d33b4c0 --- /dev/null +++ b/src/lib/env.cr @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +require "./sched" +require "./json_logger" + +class HTTP::Server + # Instances of this class are passed to an `HTTP::Server` handler. + class Context + def create_sched + @sched = Sched.new(self) + end + + def sched + @sched ||= create_sched + end + + def create_log + @log = JSONLogger.new(env: self) + end + + def log + @log ||= create_log + end + end +end -- 2.23.0

1 0

[PATCH v3 lkp-tests] tests/build-pkg: support squid download remote files
by Liu Shaofei 10 Dec '20

10 Dec '20

When building software in PKGBUILD file, download upstream files often times out. We need to cache these files by squid server.The example is as follow: https://invisible-mirror.net/archives/conflict/conflict-20150705.tgz => http://invisible-mirror.net/archives/conflict/conflict-20150705.tgz Signed-off-by: Liu Shaofei <liushaofei5(a)huawei.com> --- tests/build-pkg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/build-pkg b/tests/build-pkg index e4eca747..17157771 100755 --- a/tests/build-pkg +++ b/tests/build-pkg @@ -108,6 +108,8 @@ replace_source() echo "$url" | egrep 'git\+|\.git$' && { url="\"${repo_dir}git://${LKP_SERVER}/${upstream_repo}#commit=${upstream_commit}\"" } + url=$(echo "$url" | sed 's|https://|http://|g') + echo "$url" >> $1 done echo ")" >> $1 @@ -126,8 +128,7 @@ build_source_pkg() repo_dir="${repo_dir%.git*}::" fi } - - replace_source "PKGBUILD.src" + replace_source PKGBUILD.src [ -n "$PKGBUILD_TAG" ] && replace_source "PKGBUILD-$PKGBUILD_TAG" -- 2.23.0

2 2

[PATCH compass-ci] doc/manual: rename browse-results and compare-results
by Wu Fengguang 10 Dec '20

10 Dec '20

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- doc/manual/{view-task-results.en.md => browse-results.en.md} | 0 .../manual/browse-results.zh.md | 0 doc/manual/{compare-test-results.en.md => compare-results.en.md} | 0 .../manual/compare-results.zh.md | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename doc/manual/{view-task-results.en.md => browse-results.en.md} (100%) rename "doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223\346\236\234.md" => doc/manual/browse-results.zh.md (100%) rename doc/manual/{compare-test-results.en.md => compare-results.en.md} (100%) rename "doc/manual/\345\246\202\344\275\225\346\257\224\350\276\203\346\265\213\350\257\225\347\273\223\346\236\234.md" => doc/manual/compare-results.zh.md (100%) diff --git a/doc/manual/view-task-results.en.md b/doc/manual/browse-results.en.md similarity index 100% rename from doc/manual/view-task-results.en.md rename to doc/manual/browse-results.en.md diff --git "a/doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223\346\236\234.md" b/doc/manual/browse-results.zh.md similarity index 100% rename from "doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223\346\236\234.md" rename to doc/manual/browse-results.zh.md diff --git a/doc/manual/compare-test-results.en.md b/doc/manual/compare-results.en.md similarity index 100% rename from doc/manual/compare-test-results.en.md rename to doc/manual/compare-results.en.md diff --git "a/doc/manual/\345\246\202\344\275\225\346\257\224\350\276\203\346\265\213\350\257\225\347\273\223\346\236\234.md" b/doc/manual/compare-results.zh.md similarity index 100% rename from "doc/manual/\345\246\202\344\275\225\346\257\224\350\276\203\346\265\213\350\257\225\347\273\223\346\236\234.md" rename to doc/manual/compare-results.zh.md -- 2.23.0

1 0

[PATCH v3 compass-ci 3/3] sbin/compare_template: add row_size to limit the number of table columns
by Lu Kaiyi 10 Dec '20

10 Dec '20

[why] if too much columns in a row, it's ugly in command line display. [how] add row_size limit to split the table columns to multi-table. [example] compare_template compare_template.yaml [output] Hackbench Performance Testing +------------------------------------+------------+-----------+-----------+-----------+------------+-----------+-----------+------------+ | meminfo.Active | 4k|1G | 4k|10G | 4k|80G | 4k|100G | 16k|1G | 16k|10G | 16k|100G | 32k|1G | +------------------------------------+------------+-----------+-----------+-----------+------------+-----------+-----------+------------+ | openeuler 20.03 average | 1051645.34 | 704958.00 | 706798.00 | 657669.27 | 1030484.85 | 979289.00 | 948576.00 | 1262591.17 | | openeuler 20.03 standard_deviation | 74.00 | 0.00 | 0.00 | 8.00 | 46.00 | 0.00 | 2.00 | 42.00 | +------------------------------------+------------+-----------+-----------+-----------+------------+-----------+-----------+------------+ +------------------------------------+------------+------------+------------+------------+------------+------------+------------+------------+ | meminfo.Active | 64k|1G | 64k|100G | 128k|1G | 128k|100G | 256k|1G | 256k|100G | 512k|1G | 512k|100G | +------------------------------------+------------+------------+------------+------------+------------+------------+------------+------------+ | openeuler 20.03 average | 1418731.53 | 1854231.33 | 2004321.76 | 2960171.75 | 2979326.50 | 4775340.00 | 5003555.53 | 5630845.75 | | openeuler 20.03 standard_deviation | 47.00 | 10.00 | 65.00 | 18.00 | 88.00 | 8.00 | 108.00 | 15.00 | +------------------------------------+------------+------------+------------+------------+------------+------------+------------+------------+ +------------------------------------+------------+------------+------------+ | meminfo.Active | 1024k|1G | 1024k|100G | 2048k|100G | +------------------------------------+------------+------------+------------+ | openeuler 20.03 average | 8974190.91 | 9641039.00 | 5480763.67 | | openeuler 20.03 standard_deviation | 118.00 | 36.00 | 86.00 | +------------------------------------+------------+------------+------------+ Hackbench Performance Testing +------------------------------------+------------+-------------+-------------+-------------+------------+-------------+-------------+------------+ | meminfo.Memused | 4k|1G | 4k|10G | 4k|80G | 4k|100G | 16k|1G | 16k|10G | 16k|100G | 32k|1G | +------------------------------------+------------+-------------+-------------+-------------+------------+-------------+-------------+------------+ | openeuler 20.03 average | 9696255.67 | 17831902.00 | 17846148.00 | 17638278.33 | 9618919.65 | 18067696.00 | 18059618.20 | 6274953.67 | | openeuler 20.03 standard_deviation | 73.00 | 0.00 | 0.00 | 3.00 | 74.00 | 0.00 | 0.00 | 89.00 | +------------------------------------+------------+-------------+-------------+-------------+------------+-------------+-------------+------------+ ... Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- sbin/compare_template | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/sbin/compare_template b/sbin/compare_template index 6b702c0..22d54e9 100755 --- a/sbin/compare_template +++ b/sbin/compare_template @@ -9,14 +9,16 @@ import prettytable as pt # receive compare_template.yaml and auto pretty show compare results class TableShow: - def __init__(self, result_dict): + def __init__(self, result_dict, row_size=8): self.title = result_dict['title'] self.tables = result_dict['tables'] + self.row_size = row_size self.tb = None def show_table(self): for (table_title, table) in self.tables.items(): self.tb = pt.PrettyTable() + self.tb.header = True self.set_field_names(table, table_title) self.set_align(table_title) self.add_row(table) @@ -40,9 +42,23 @@ class TableShow: format_data_row = ["%.2f" % data for data in row[1:]] self.tb.add_row([row_title, *format_data_row]) + def get_row_num(self): + row_num, rem = divmod(len(self.tb.field_names[1:]), self.row_size) + if rem > 0: + row_num += 1 + self.tb.row_num = row_num + def print_table(self): print(self.title) - print(self.tb) + self.get_row_num() + for row in range(self.tb.row_num): + start = 1 + row * self.row_size + end = start + self.row_size + if end > len(self.tb.field_names): + end = -1 + # set the field names to include in displays + self.tb.fields = [self.tb.field_names[0], *self.tb.field_names[start:end]] + print(self.tb) print() -- 2.23.0

2 1

[PATCH compass-ci] doc/manual: rename borrow-machine
by Wu Fengguang 10 Dec '20

10 Dec '20

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- .../{apply-for-a-test-machine.en.md => borrow-machine.en.md} | 0 .../manual/borrow-machine.zh.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename doc/manual/{apply-for-a-test-machine.en.md => borrow-machine.en.md} (100%) rename "doc/manual/\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" => doc/manual/borrow-machine.zh.md (100%) diff --git a/doc/manual/apply-for-a-test-machine.en.md b/doc/manual/borrow-machine.en.md similarity index 100% rename from doc/manual/apply-for-a-test-machine.en.md rename to doc/manual/borrow-machine.en.md diff --git "a/doc/manual/\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" b/doc/manual/borrow-machine.zh.md similarity index 100% rename from "doc/manual/\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" rename to doc/manual/borrow-machine.zh.md -- 2.23.0

1 0

2024

2023

2022

2021

2020

Compass-ci December 2020