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

[PATCH v4 lkp-tests] stats/crystal: add sysbench-mysql.cr
by Zhang Yu 26 Nov '20

26 Nov '20

Make ruby2crystal convert Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- stats/crystal/sysbench-mysql.cr | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 stats/crystal/sysbench-mysql.cr diff --git a/stats/crystal/sysbench-mysql.cr b/stats/crystal/sysbench-mysql.cr new file mode 100755 index 00000000..b9b6c8f1 --- /dev/null +++ b/stats/crystal/sysbench-mysql.cr @@ -0,0 +1,18 @@ +#!/usr/bin/env crystal + +# SQL statistics: +# queries performed: +# read: 210212086 +# write: 60060591 +# other: 30030296 +# total: 300302973 +# transactions: 15015147 (25024.26 per sec.) +# queries: 300302973 (500485.16 per sec.) +# ignored errors: 2 (0.00 per sec.) +# reconnects:0 (0.00 per sec.) + +while (line = STDIN.gets) + next unless line =~ /transactions:.*\(\s*(\S+)/ + + puts "transactions: #{$1}" +end -- 2.23.0

1 0

[PATCH compass-ci] doc: add how-to-create-a-PKGBUILD.md
by Liu Shaofei 26 Nov '20

26 Nov '20

Signed-off-by: Liu Shaofei <liushaofei5(a)huawei.com> --- doc/how-to-create-a-PKGBUILD.md | 79 +++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 doc/how-to-create-a-PKGBUILD.md diff --git a/doc/how-to-create-a-PKGBUILD.md b/doc/how-to-create-a-PKGBUILD.md new file mode 100644 index 0000000..01e1084 --- /dev/null +++ b/doc/how-to-create-a-PKGBUILD.md @@ -0,0 +1,79 @@ +# 如何编写PKGBUILD + +## PKGBUILD是什么？ + + PKGBUILD是一个shell脚本，makepkg通过PKGBUILD中包含的指令，生成包含二进制文件和安装指令的软件包。 + +## PKGBUILD包含什么？ + + PKGBUILD包含两部分内容：变量和函数 + + 1）、定义变量 + + - pkgname: 必须定义，表示软件包的名称; + - pkgver: 必须定义，表示软件包的版本号； + - pkgrel: 必须定义，表示软件包的发布号； + - arch: 必须定义，表示软件包使用的架构序列； + - depends: 可选字段，软件测试运行时需要的依赖包名称； + - makedepends: 可选字段，构建软件包时需要的文件列表； + - source: 可选字段，指定每个源文件的MD5哈希值，用于构建过程中验证源文件的完整性。 + + 2）、定义函数 + + - package函数 + package函数必须定义，此函数用于将文件安装到将成为构建包的根目录的目录中； + - prepare函数 + 定义可选的prepare函数，在其中执行用于准备构建源码的操作； + - build函数 + 定义可选的build函数，用于编译和/或构建源码； + - check函数 + 定义可选的check函数，用于运行程序包的测试套件。 + + 注意：srcdir 和 pkgdir + + - srcdir: 提取或复制源文件的目录，所有打包功能都在srcdir目录内部运行； + - pkgdir: 构建软件包的根目录，仅在package函数中使用。 + +## 如何编写PKGBUILD？ + + 1）、创建PKGBUILD，文件名必须以“PKGBUILD”命名。 + + `touch PKGBUILD` + + 2）、使用vim打开PKGBUILD，编写PKGBUILD文件内容。 + + 如下我们给出一个PKGBUILD例子： + + pkgname=zstd + pkgver=1.4.4 + pkgrel=2 + arch=('i686' 'x86_64' 'aarch64') + url='https://github.com/facebook/zstd' + license=('custom:BSD3' 'GPL2') + depends=('xz' 'zlib' 'lz4') + makedepends=('git') + source=('git://github.com/facebook/zstd.git#branch=dev') + md5sums=('SKIP') + + pkgver() { + cd "$srcdir/$pkgname" + git describe --long --tags | sed 's/$[^-]*-g$/r\1/;s/-/./g;s/^v//g' + } + + build() { + cd "$srcdir/$pkgname" + make + make -C contrib/pzstd + } + + package() { + cd "$srcdir/$pkgname" + make PREFIX="/usr" DESTDIR="$pkgdir/" install + install -D -m755 contrib/pzstd/pzstd "$pkgdir/usr/bin/pzstd" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + } + +## 参考 + + https://www.archlinux.org/pacman/PKGBUILD.5.html + https://git.archlinux.org/pacman.git/plain/proto/PKGBUILD.proto -- 2.23.0

1 0

[PATCH compass-ci] doc: add how-to-create-a-PKGBUILD
by Liu Shaofei 26 Nov '20

26 Nov '20

Signed-off-by: Liu Shaofei <liushaofei5(a)huawei.com> --- doc/how-to-create-a-PKGBUILD.md | 81 +++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 doc/how-to-create-a-PKGBUILD.md diff --git a/doc/how-to-create-a-PKGBUILD.md b/doc/how-to-create-a-PKGBUILD.md new file mode 100644 index 0000000..2230b5f --- /dev/null +++ b/doc/how-to-create-a-PKGBUILD.md @@ -0,0 +1,81 @@ +# ��PKGBUILD + +## PKGBUILD�� + + PKGBUILD��shell��makepkg��PKGBUILD�� + +## PKGBUILD�� + + PKGBUILD�� + + 1�� + + - pkgname: ��; + - pkgver: �� + - pkgrel: �� + - arch: �� + - depends: �� + - makedepends: �� + - source: ��MD5�� + + 2�� + + - package�� + package�� + - prepare�� + ��prepare�� + - build�� + ��build��/�� + - check�� + ��check�� + + ��srcdir �� pkgdir + + - srcdir: ��srcdir�� + - pkgdir: ��package�� + +## ��PKGBUILD�� + + 1��PKGBUILD��PKGBUILD�� + + `touch PKGBUILD` + + 2��vim��PKGBUILD��PKGBUILD�� + + ��PKGBUILD�� + + pkgname=zstd + pkgver=1.4.4 + pkgrel=2 + arch=('i686' 'x86_64' 'aarch64') + url='https://github.com/facebook/zstd' + license=('custom:BSD3' 'GPL2') + depends=('xz' 'zlib' 'lz4') + makedepends=('git') + source=('git://github.com/facebook/zstd.git#branch=dev') + md5sums=('SKIP') + + pkgver() { + cd "$srcdir/$pkgname" + git describe --long --tags | sed 's/$[^-]*-g$/r\1/;s/-/./g;s/^v//g' + } + + build() { + cd "$srcdir/$pkgname" + make + make -C contrib/pzstd + } + + package() { + cd "$srcdir/$pkgname" + make PREFIX="/usr" DESTDIR="$pkgdir/" install + install -D -m755 contrib/pzstd/pzstd "$pkgdir/usr/bin/pzstd" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + } + +## �� + + https://www.archlinux.org/pacman/PKGBUILD.5.html + https://git.archlinux.org/pacman.git/plain/proto/PKGBUILD.proto + + -- 2.23.0

1 1

[PATCH v2 compass-ci] add a document for adding open source project
by Li Yuanchao 26 Nov '20

26 Nov '20

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- ...-compass-ci-to-test-open-source-project.md | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 doc/how-to-use-compass-ci-to-test-open-source-project.md diff --git a/doc/how-to-use-compass-ci-to-test-open-source-project.md b/doc/how-to-use-compass-ci-to-test-open-source-project.md new file mode 100644 index 0000000..ad4f9b0 --- /dev/null +++ b/doc/how-to-use-compass-ci-to-test-open-source-project.md @@ -0,0 +1,53 @@ +使用compass-ci平台测试开源仓库，需要完成 +1. 将仓库url添加到upstream-repos仓库中 +2. 添加自己的测试case + +### 首先，将想要测试的代码仓信息以yaml格式文件的形式添加到upstream-repos仓库 + +仓库地址为：https://gitee.com/wu_fengguang/upstream-repos + +你可以先fork这个仓库，新建文件之后，通过Pull Request的方式完成添加。 + +以仓库backlight为例： + +它的url为：https://github.com/baskerville/backlight +1. 以首字母和仓库名创建路径 +``` +mkdir -p b/backlight +``` +2. 在该目录下新建同名文件backlight： +``` +cd b/backlight +touch backlight +``` +3. 使用vim写入url： +``` +vim backlight +``` +内容格式为 +``` +--- +url: +- https://github.com/baskerville/backlight +``` +请保持格式一致，若不确定，可参考upstream-repos仓库中已有文件。 + +### 然后，将测试case以yaml文件的形式添加到lkp-tests仓库的jobs目录 + +仓库地址为 https://gitee.com/wu_fengguang/lkp-tests + +这其中有一些已经适配好的测试case，如果你想要测试的case其中正好有，那就可以直接使用。使用方式以iperf为例。 + +iperf是已经适配的一个测试case，在lkp-tests仓库的jobs下有一个iperf.yaml文件，里面有一些测试的基本参数。 + +然后，你要在compass-ci仓库下面的 sbin/auto_submit.yaml 文件中添加 +``` +b/backlight/backlight: +- testbox=vm-2p8g os=openEuler os_version=20.03 os_mount=initramfs os_arch=aarch64 iperf.yaml +``` +并通过Pull Request的方式提交。相关参数含义见参考文档 + +参考文档： +- [compass-ci测试平台使用教程--submit命令详解](https://gitee.com/wu_fengguang/compass-ci/t… +- [如何适配测试用例](https://gitee.com/wu_fengguang/lkp-tests/blob/master/doc/add-test… + -- 2.23.0

1 0

[PATCH compass-ci 2/2] container/result-webdav: adjust the value of second_dir
by Cui Yili 26 Nov '20

26 Nov '20

[why] 1. when the uri starts with "//", etc., the previous regular expression did not get the second level directory correctly. 2. when the uploaded data package does not meet the format of "xxxx_yyyymmdd.cgz", uploading is also allowed, but no symbolic link. [how] 1. modify the variable second_dir regular expression。 2. make conditional judgments on link_name Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/result-webdav/nginx.conf | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/container/result-webdav/nginx.conf b/container/result-webdav/nginx.conf index c880522..e036e77 100644 --- a/container/result-webdav/nginx.conf +++ b/container/result-webdav/nginx.conf @@ -54,17 +54,21 @@ http { path = string.match(uri,"%g*/") upload_file = string.match(uri, ".+/([^/]*%.%w+)$") - second_dir = string.match(uri, "/.+/(.*)/.+") + second_dir = string.match(uri, "/*%w+/(%w+)/.+") if (second_dir == "pkg") then - link_name = "latest.cgz" + link_name = "latest" else - link_name = string.match(upload_file, "(.*)_%d+%.cgz")..".cgz" + link_name = string.match(upload_file, "(.*)_%d+%.cgz") + end + + if (link_name ~= '') + then + link_name = link_name..".cgz" + root_patch = "/srv/"..path + io.popen("cd "..root_patch.."&& ln -sf "..upload_file.." "..link_name) end - - root_patch = "/srv/"..path - io.popen("cd "..root_patch.."&& ln -sf "..upload_file.." "..link_name) } } -- 2.23.0

1 0

[PATCH compass-ci] doc: add how-to-apply-a-test-env.md
by Yu Chuan 26 Nov '20

26 Nov '20

Signed-off-by: Yu Chuan <13186087857(a)163.com> --- doc/how-to-apply-a-test-env.md | 252 +++++++++++++++++++++++++++++++++ 1 file changed, 252 insertions(+) create mode 100644 doc/how-to-apply-a-test-env.md diff --git a/doc/how-to-apply-a-test-env.md b/doc/how-to-apply-a-test-env.md new file mode 100644 index 000000000000..a703587f38cd --- /dev/null +++ b/doc/how-to-apply-a-test-env.md @@ -0,0 +1,252 @@ +# 1. 前提条件 +------------- + +- 已向compass-ci服务团队申请账号，且已登录到account-vm服务器上。 + + 参考资料：[apply for jumper account](./apply-ssh-account.md) + + +# 2. 申请测试机（虚拟机） +------------------------ + +## 2.1 生成本地RSA公私钥对 + +```shell +hi684@account-vm ~% ssh-keygen -t rsa +Generating public/private rsa key pair. +Enter file in which to save the key (/home/hi684/.ssh/id_rsa): +Created directory '/home/hi684/.ssh'. +Enter passphrase (empty for no passphrase): +Enter same passphrase again: +Your identification has been saved in /home/hi684/.ssh/id_rsa. +Your public key has been saved in /home/hi684/.ssh/id_rsa.pub. +The key fingerprint is: +SHA256:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx hi684@account-vm +The key's randomart image is: ++---[RSA 2048]----+ +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| ++----[SHA256]-----+ +hi684@account-vm ~% ls -hla .ssh +total 16K +drwx------. 2 hi684 hi684 4.0K Nov 26 16:37 . +drwx------. 7 hi684 hi684 4.0K Nov 26 16:37 .. +-rw-------. 1 hi684 hi684 1.8K Nov 26 16:37 id_rsa +-rw-r--r--. 1 hi684 hi684 398 Nov 26 16:37 id_rsa.pub +``` + +## 2.2 根据需求选择yaml + +每位用户家目录下面都存放了一个lkp-tests的文件夹 + +```shell +hi684@account-vm ~% cd lkp-tests/jobs +hi684@account-vm ~/lkp-tests/jobs% ls -hl borrow-* +-rw-r--r--. 1 root root 53 Nov 2 14:54 borrow-10d.yaml +-rw-r--r--. 1 root root 64 Nov 2 14:54 borrow-1d.yaml +-rw-r--r--. 1 root root 235 Nov 19 15:27 borrow-1h.yaml +``` + +## 2.3 提交yaml并连接测试机（虚拟机） + +```shell +hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=vm-2p8g borrow-1h.yaml +2020-11-26 14:44:25 +0800 WARN -- skip non-executable /home/hi684/lkp-tests/monitors/plain/wait +submit borrow-1h.yaml, got job_id=z9.170593 +query=>{"job_id":["z9.170593"]} +connect to ws://172.168.131.2:11310/filter +{"job_id":"z9.170593","message":"","job_state":"submit","result_root":"/srv/result/borrow/2020-11-26/vm-2p8g/openeuler-20.03-aarch64/3600/z9.170593"} +{"job_id": "z9.170593", "result_root": "/srv/result/borrow/2020-11-26/vm-2p8g/openeuler-20.03-aarch64/3600/z9.170593", "job_state": "set result root"} +{"job_id": "z9.170593", "job_state": "boot"} +{"job_id": "z9.170593", "job_state": "download"} +{"time":"2020-11-26 14:45:06","mac":"0a-1f-0d-3c-91-5c","ip":"172.18.156.13","job_id":"z9.170593","state":"running","testbox":"vm-2p8g.taishan200-2280-2s64p-256g--a38-12"} +{"job_state":"running","job_id":"z9.170593"} +{"job_id": "z9.170593", "state": "set ssh port", "ssh_port": "51840", "tbox_name": "vm-2p8g.taishan200-2280-2s64p-256g--a38-12"} +Host 172.168.131.2 not found in /home/hi684/.ssh/known_hosts +Warning: Permanently added '[172.168.131.2]:51840' (ECDSA) to the list of known hosts. +Last login: Wed Sep 23 11:10:58 2020 + + +Welcome to 4.19.90-2003.4.0.0036.oe1.aarch64 + +System information as of time: Thu Nov 26 06:44:18 CST 2020 + +System load: 0.83 +Processes: 107 +Memory used: 6.1% +Swap used: 0.0% +Usage On: 89% +IP address: 172.18.156.13 +Users online: 1 + + + +root@vm-2p8g ~# +``` + +更多关于`submit命令如何使用`、`testbox都有什么可选项`、`如何borrow指定的操作系统`，请参见文章末尾Faq。 + +## 2.4 使用完毕退还测试机（虚拟机） + +```shell +root@vm-2p8g ~# reboot +Connection to 172.168.131.2 closed by remote host. +Connection to 172.168.131.2 closed. +hi684@account-vm ~/lkp-tests/jobs% +``` + + +# 3. 申请测试机（物理机） +------------------------ + +## 3.1 生成本地RSA公私钥对 + +```shell +hi684@account-vm ~% ssh-keygen -t rsa +Generating public/private rsa key pair. +Enter file in which to save the key (/home/hi684/.ssh/id_rsa): +Created directory '/home/hi684/.ssh'. +Enter passphrase (empty for no passphrase): +Enter same passphrase again: +Your identification has been saved in /home/hi684/.ssh/id_rsa. +Your public key has been saved in /home/hi684/.ssh/id_rsa.pub. +The key fingerprint is: +SHA256:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx hi684@account-vm +The key's randomart image is: ++---[RSA 2048]----+ +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| ++----[SHA256]-----+ +hi684@account-vm ~% ls -hla .ssh +total 16K +drwx------. 2 hi684 hi684 4.0K Nov 26 16:37 . +drwx------. 7 hi684 hi684 4.0K Nov 26 16:37 .. +-rw-------. 1 hi684 hi684 1.8K Nov 26 16:37 id_rsa +-rw-r--r--. 1 hi684 hi684 398 Nov 26 16:37 id_rsa.pub +``` + +## 3.2 根据需求选择yaml + +每位用户家目录下面都存放了一个lkp-tests的文件夹 + +```shell +hi684@account-vm ~% cd lkp-tests/jobs +hi684@account-vm ~/lkp-tests/jobs% ls -hl borrow-* +-rw-r--r--. 1 root root 53 Nov 2 14:54 borrow-10d.yaml +-rw-r--r--. 1 root root 64 Nov 2 14:54 borrow-1d.yaml +-rw-r--r--. 1 root root 235 Nov 19 15:27 borrow-1h.yaml +``` + +## 3.3 提交yaml并连接测试机（物理机） + +```shell +hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=taishan200-2280-2s64p-256g borrow-1h.yaml +2020-11-26 14:49:13 +0800 WARN -- skip non-executable /home/hi684/lkp-tests/monitors/plain/wait +submit borrow-1h.yaml, got job_id=z9.170594 +query=>{"job_id":["z9.170594"]} +connect to ws://172.168.131.2:11310/filter +{"job_id":"z9.170594","message":"","job_state":"submit","result_root":"/srv/result/borrow/2020-11-26/taishan200-2280-2s64p-256g/openeuler-20.03-aarch64/3600/z9.170594"} +{"job_id": "z9.170594", "result_root": "/srv/result/borrow/2020-11-26/taishan200-2280-2s64p-256g/openeuler-20.03-aarch64/3600/z9.170594", "job_state": "set result root"} +{"job_id": "z9.170594", "job_state": "boot"} +{"job_id": "z9.170594", "job_state": "download"} +{"time":"2020-11-26 14:51:56","mac":"84-46-fe-26-d3-47","ip":"172.168.178.48","job_id":"z9.170594","state":"running","testbox":"taishan200-2280-2s64p-256g--a5"} +{"job_state":"running","job_id":"z9.170594"} +{"job_id": "z9.170594", "state": "set ssh port", "ssh_port": "50420", "tbox_name": "taishan200-2280-2s64p-256g--a5"} +Host 172.168.131.2 not found in /home/hi684/.ssh/known_hosts +Warning: Permanently added '[172.168.131.2]:50420' (ECDSA) to the list of known hosts. +Last login: Wed Sep 23 11:10:58 2020 + + +Welcome to 4.19.90-2003.4.0.0036.oe1.aarch64 + +System information as of time: Thu Nov 26 14:51:59 CST 2020 + +System load: 1.31 +Processes: 1020 +Memory used: 5.1% +Swap used: 0.0% +Usage On: 3% +IP address: 172.168.178.48 +Users online: 1 + + + +root@taishan200-2280-2s64p-256g--a5 ~# +``` + +更多关于`submit命令如何使用`、`testbox都有什么可选项`、`如何borrow指定的操作系统`，请参见文章末尾Faq。 + +## 3.4 使用完毕退还测试机（物理机） + +```shell +root@taishan200-2280-2s64p-256g--a5 ~# reboot +Connection to 172.168.131.2 closed by remote host. +Connection to 172.168.131.2 closed. +hi684@account-vm ~/lkp-tests/jobs% +``` + +# 4 Faq +------- + +## 4.1 如何自行修改申请时长？ + +```shell +hi684@account-vm ~/lkp-tests/jobs% cat borrow-1h.yaml +suite: borrow +testcase: borrow + +sshd: + pub_key: <%= + begin + File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp + rescue + nil + end + %> +# sleep at the bottom +sleep: 1h +hi684@account-vm ~/lkp-tests/jobs% grep sleep: borrow-1h.yaml +sleep: 1h +# 使用vim来修改你的sleep字段的值 +hi684@account-vm ~/lkp-tests/jobs% vim borrow-1h.yaml +# 修改完毕后重新submit即可 +hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=vm-2p8g borrow-1h.yaml +``` + +## 4.2 Submit命令指导 + +参考文档：[compass-ci测试平台使用教程--submit命令详解.md](./compass-ci测试平台使用教程--submit命令详解.md) + +## 4.3 testbox都有什么可选项？ + +testbox可选项见：https://gitee.com/wu_fengguang/lab-z9/tree/master/hosts + +> 说明： +> 虚拟机的testbox: +> - vm-xxx +> +> 物理机的testbox: +> - taishan200-2280-xxx + + +> 注意： +> - 物理机的testbox若选择以`--axx`结尾的，则表示指定到了具体的某一个物理机。若此物理机任务队列中已经有任务在排队，则需要等待队列中前面的任务执行完毕后，才会轮到你提交的borrow任务。 +> - 物理机的testbox若不选择以`-axx`结尾的，表示不指定具体的某一个物理机。则此时集群中的空闲物理机会即时被分配执行你的borrow任务。 + +## 4.4 如何borrow指定的操作系统？ + +关于支持的`os`, `os_arch`, `os_version`，参见：[os-os_verison-os_arch.md](./job/os-os_verison-os_arch.md) -- 2.23.0

1 0

[PATCH v6 lkp-tests] spec/submit_spec.rb: submit merge_yaml/*.yaml
by Hu Xuejiao 26 Nov '20

26 Nov '20

We will use 'rspec spec/submit_spec.rb' to merge job.yaml, it support merging from external file by "<<: job.yaml" Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- .../merge_yaml/merge_included_files.yaml | 1 + .../merge_included_files-defaults.yaml | 19 +++++++++++++++++++ spec/submit/merge_yaml/template_yaml | 3 +++ spec/submit_spec.rb | 4 ++++ 4 files changed, 27 insertions(+) create mode 100644 spec/submit/merge_yaml/merge_included_files.yaml create mode 100644 spec/submit/merge_yaml/merge_included_files/merge_included_files-defaults.yaml create mode 100644 spec/submit/merge_yaml/template_yaml diff --git a/spec/submit/merge_yaml/merge_included_files.yaml b/spec/submit/merge_yaml/merge_included_files.yaml new file mode 100644 index 00000000..8d459a32 --- /dev/null +++ b/spec/submit/merge_yaml/merge_included_files.yaml @@ -0,0 +1 @@ +<<: template_yaml diff --git a/spec/submit/merge_yaml/merge_included_files/merge_included_files-defaults.yaml b/spec/submit/merge_yaml/merge_included_files/merge_included_files-defaults.yaml new file mode 100644 index 00000000..42b53c13 --- /dev/null +++ b/spec/submit/merge_yaml/merge_included_files/merge_included_files-defaults.yaml @@ -0,0 +1,19 @@ +--- +suite: atomic +atomic: +lab: spec_lab +testbox: vm-2p8g--spec_submit +tbox_group: vm-2p8g--spec_submit +provider: qemu +template: kvm +nr_node: 1 +nr_cpu: 2 +memory: 8G +arch: aarch64 +cpufreq_governor: +need_kconfig: +- CONFIG_KVM_GUEST=y +pp: + atomic: + cpufreq_governor: +monitors: diff --git a/spec/submit/merge_yaml/template_yaml b/spec/submit/merge_yaml/template_yaml new file mode 100644 index 00000000..331cb470 --- /dev/null +++ b/spec/submit/merge_yaml/template_yaml @@ -0,0 +1,3 @@ +suite: atomic + +atomic: diff --git a/spec/submit_spec.rb b/spec/submit_spec.rb index 169d7812..d71ed891 100644 --- a/spec/submit_spec.rb +++ b/spec/submit_spec.rb @@ -48,4 +48,8 @@ describe 'submit job spec' do it 'separate yaml spec' do submit_job('separate_yaml') end + + it 'merge yaml spec' do + submit_job('merge_yaml') + end end -- 2.23.0

1 0

[PATCH v3 compass-ci] doc/manual: how to check the result files
by Wei Jihui 26 Nov '20

26 Nov '20

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- ...\273\273\345\212\241\347\273\223\346\236\234" | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 "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" 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" "b/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" new file mode 100644 index 0000000..7a8cf8b --- /dev/null +++ "b/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" @@ -0,0 +1,16 @@ +# �� + ��https://compass-ci.openeuler.org/jobs�� + ��suite��id��job state�� + +# ��compass-ci�� +## job.yaml�� + job.yaml��job�� + �� + +## output�� + output��check_exit_code��0�� + +## stats.json�� + �� + compass-ci��.json�� + stats.json��json�� -- 2.23.0

1 0

[PATCH v3 compass-ci] doc/job: add runtime.md
by Zhang Yale 26 Nov '20

26 Nov '20

Add a document for introducing the runtime field. Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- doc/job/runtime.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 doc/job/runtime.md diff --git a/doc/job/runtime.md b/doc/job/runtime.md new file mode 100644 index 0000000..8e720f8 --- /dev/null +++ b/doc/job/runtime.md @@ -0,0 +1,32 @@ +# runtime + +Meaning: +- Run time for test: seconds(s), hours(h) or days(d). +- Limit the test's run time in $runtime. + +Usage example: + +```bash +#!/bin/sh +# - runtime + +## delay for a specified amount of time +echo sleep started +exec sleep ${1:-$runtime} +echo sleep finished +``` + +`runtime` is a parameter of test script. +For any test case needing parameter(s), +need such comment line and follow exactly the +same format `# - parameter`. + +```yaml +suite: borrow +testcase: borrow + +runtime: 1d + +sleep: +``` + -- 2.23.0

1 0

[PATCH v2 compass-ci] fill 0 if standard_deviation is nil
by Lu Weitao 26 Nov '20

26 Nov '20

[Why] With template compare mode, it's not friendly for echart that return null for nil standard_deviation of a metric like: { "tables": { "vmstat.system.cs": { "standard_deviation": { "dimensions": ["compare_dimension", "openeuler 20.03"], "source": [ ["4G", "8G", "16G"], ["openeuler 20.03", 23, null, null] ] } } } } [How] fill 0 if standard_deviation is nil. Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/compare_matrixes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compare_matrixes.rb b/lib/compare_matrixes.rb index 1550435..dd9b86e 100644 --- a/lib/compare_matrixes.rb +++ b/lib/compare_matrixes.rb @@ -461,7 +461,7 @@ def assign_metric_values(metrics_values, dim, metric, values) metrics_values[metric]['standard_deviation'] ||= {} metric_value = get_values(values, true) metrics_values[metric]['average'][dim] = metric_value[:average] - metrics_values[metric]['standard_deviation'][dim] = metric_value[:stddev] + metrics_values[metric]['standard_deviation'][dim] = metric_value[:stddev] || 0 end def assign_metric_change(metrics_values) -- 2.23.0

1 0