- Compass-ci - mailweb.openeuler.org

[PATCH v3 compass-ci 1/5] openeuler: the link for one command to build openeuler initramfs image
by Wang Chenglong 27 Nov '20

27 Nov '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- rootfs/initramfs/openeuler/aarch64/20.03-LTS/build | 1 + rootfs/initramfs/openeuler/aarch64/20.09/build | 1 + 2 files changed, 2 insertions(+) create mode 120000 rootfs/initramfs/openeuler/aarch64/20.03-LTS/build create mode 120000 rootfs/initramfs/openeuler/aarch64/20.09/build diff --git a/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build b/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build new file mode 120000 index 0000000..f04acac --- /dev/null +++ b/rootfs/initramfs/openeuler/aarch64/20.03-LTS/build @@ -0,0 +1 @@ +../../../../../container/osimage/openeuler/run \ No newline at end of file diff --git a/rootfs/initramfs/openeuler/aarch64/20.09/build b/rootfs/initramfs/openeuler/aarch64/20.09/build new file mode 120000 index 0000000..f04acac --- /dev/null +++ b/rootfs/initramfs/openeuler/aarch64/20.09/build @@ -0,0 +1 @@ +../../../../../container/osimage/openeuler/run \ No newline at end of file -- 2.23.0

1 0

[PATCH compass-ci] doc: remove extra 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 deletions(-) delete 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 deleted file mode 100644 index 01e1084..0000000 --- a/doc/how-to-create-a-PKGBUILD.md +++ /dev/null @@ -1,79 +0,0 @@ -# ��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 v2 compass-ci] doc/job: add lkp_initrd_user.md
by Zhang Yale 26 Nov '20

26 Nov '20

Add a document for introducing the lkp_initrd_user field. Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- doc/job/lkp_initrd_user.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/job/lkp_initrd_user.md diff --git a/doc/job/lkp_initrd_user.md b/doc/job/lkp_initrd_user.md new file mode 100644 index 0000000..45e6d39 --- /dev/null +++ b/doc/job/lkp_initrd_user.md @@ -0,0 +1,10 @@ +# lkp_initrd_user + +Meaning: +- "lkp_initrd_user" is one of the init_field, the default value is "latest". +- User can set lkp_initrd_user to $USER in "/home/$USER/.config/compass-ci/default/$USER.yaml or not set. +- If the lkp-tests code is changed, build & run the lkp-initrd container which in "${CCI_SRC}/container/lkp-initrd" + to pack a new lkp-${os_arch}.cgz. +- The new lkp-${os_arch}.cgz file is generated in the "${SRV_INITRD}/lkp/${lkp_initrd_user}/lkp-${os_arch}.cgz". +- When user submit one job, qemu-pxe or other start mount the <"lkp"> initrd to consume the user submited <"job">, + "initrd http://${INITRD_HTTP_HOST}:${INITRD_HTTP_PORT}/initrd/lkp/${lkp_initrd_user}/lkp-${os_arch}.cgz". -- 2.23.0

1 0

[PATCH v2 compass-ci 1/2] kernel_version.md: update kernel information
by Xu Xijian 26 Nov '20

26 Nov '20

1. delete redundant soft links of kernel files I've created before and update this information in kernel_version.md. 2. the kernel version of centos/aarch64/7.6.1810 we use has been changed into 4.14.0-115.el7.0.1.aarch64. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- doc/job/kernel_version.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/job/kernel_version.md b/doc/job/kernel_version.md index 3e94ca8..4a193fb 100644 --- a/doc/job/kernel_version.md +++ b/doc/job/kernel_version.md @@ -6,10 +6,10 @@ Meaning: - If kernel_version is not given by users, it will use the default one. - Here are the kernel versions we support for different os: openeuler/aarch64/1.0 - - 4.19.90-2001(default) + - 4.19.90-vhulk2001.1.0.0026.aarch64(default) openeuler/aarch64/20.03 - - 4.19.90-2003(default) + - 4.19.90-2003.4.0.0036.oe1.aarch64(default) - 4.19.90-mysql - 4.19.90-nginx @@ -18,7 +18,7 @@ Meaning: - 5.8.0-1-arm64 centos/aarch64/7.6.1810 - - 4.14.0-115.el7a.0.1(default) + - 4.14.0-115.el7.0.1.aarch64(default) centos/aarch64/7.8.2003 - 4.18.0-147.8.1.el7(default) @@ -29,10 +29,10 @@ Meaning: Related files: - In initramfs boot process, every kernel version is related with a vmlinuz, module and headers. - Files like below under $boot_dir, an example $boot_dir can be "/srv/os/openeuler/aarch64/20.03/boot". -├── headers-4.19.90-2003.cgz -├── modules-4.19.90-2003.cgz -├── vmlinuz-4.19.90-2003 -└── vmlinuz -> vmlinuz-4.19.90-2003 +├── headers-4.19.90-2003.4.0.0036.oe1.aarch64.cgz +├── modules-4.19.90-2003.4.0.0036.oe1.aarch64.cgz +├── vmlinuz-4.19.90-2003.4.0.0036.oe1.aarch64 +└── vmlinuz -> vmlinuz-4.19.90-2003.4.0.0036.oe1.aarch64 Usage example: -- submit iperf.yaml testbox=vm-2p8g queue=vm-2p8g~$USER os=openeuler os_arch=aarch64 os_version=20.03 runtime=20 kernel_version=4.19.90-2003 +- submit iperf.yaml testbox=vm-2p8g queue=vm-2p8g~$USER os=openeuler os_arch=aarch64 os_version=20.03 runtime=20 kernel_version=4.19.90-2003.4.0.0036.oe1.aarch64 -- 2.23.0

1 0

[PATCH compass-ci] doc/manual: rename compare.md
by Li Yuanchao 26 Nov '20

26 Nov '20

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- ...50\276\203\346\265\213\350\257\225\347\273\223\346\236\234.md" | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/compare.md => "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" (100%) diff --git a/doc/compare.md "b/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" similarity index 100% rename from doc/compare.md rename to "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" -- 2.23.0

1 0

[PATCH compass-ci] doc/manual: 如何编写PKGBUILD.md
by Liu Shaofei 26 Nov '20

26 Nov '20

Signed-off-by: Liu Shaofei <liushaofei5(a)huawei.com> --- ...75\225\347\274\226\345\206\231PKGBUILD.md" | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 "doc/manual/\345\246\202\344\275\225\347\274\226\345\206\231PKGBUILD.md" diff --git "a/doc/manual/\345\246\202\344\275\225\347\274\226\345\206\231PKGBUILD.md" "b/doc/manual/\345\246\202\344\275\225\347\274\226\345\206\231PKGBUILD.md" new file mode 100644 index 0000000..d94b113 --- /dev/null +++ "b/doc/manual/\345\246\202\344\275\225\347\274\226\345\206\231PKGBUILD.md" @@ -0,0 +1,83 @@ +# PKGBUILD是什么？ +----------------- + +PKGBUILD是一个shell脚本，makepkg通过PKGBUILD中包含的指令，生成包含二进制文件和安装指令的软件包。 + +# PKGBUILD包含什么？ +------------------- + +PKGBUILD包含两部分内容：变量和函数 + +## 定义变量 + +- pkgname: 必须定义，表示软件包的名称; +- pkgver: 必须定义，表示软件包的版本号； +- pkgrel: 必须定义，表示软件包的发布号； +- arch: 必须定义，表示软件包使用的架构序列； +- depends: 可选字段，软件测试运行时需要的依赖包名称； +- makedepends: 可选字段，构建软件包时需要的文件列表； +- source: 可选字段，指定每个源文件的MD5哈希值，用于构建过程中验证源文件的完整性。 + +## 定义函数 + +- package函数 + package函数必须定义，此函数用于将文件安装到将成为构建包的根目录的目录中； +- prepare函数 + 定义可选的prepare函数，在其中执行用于准备构建源码的操作； +- build函数 + 定义可选的build函数，用于编译和/或构建源码； +- check函数 + 定义可选的check函数，用于运行程序包的测试套件。 + +> 注意： +> srcdir 和 pkgdir +> - srcdir: 提取或复制源文件的目录，所有打包功能都在srcdir目录内部运行； +> - pkgdir: 构建软件包的根目录，仅在package函数中使用。 + +# 如何编写PKGBUILD？ +------------------- + +## 创建PKGBUILD，文件名必须以“PKGBUILD”命名。 + +`touch PKGBUILD` + +## 使用vim打开PKGBUILD，编写PKGBUILD文件内容。 + +如下我们给出一个PKGBUILD例子： + +```shell +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" +} +``` + +# 参考 +------ + +- [PKGBUILD(5) Manual Page](https://www.archlinux.org/pacman/PKGBUILD.5.html) +- [pkgbuild demo文件](https://git.archlinux.org/pacman.git/plain/proto/PKGBUILD.proto) -- 2.23.0

1 0

[PATCH v2 lkp-tests] jobs: add borrow-1d.yaml
by Zhang Yale 26 Nov '20

26 Nov '20

Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- jobs/borrow-1d.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jobs/borrow-1d.yaml b/jobs/borrow-1d.yaml index f0103680..72949982 100644 --- a/jobs/borrow-1d.yaml +++ b/jobs/borrow-1d.yaml @@ -1,7 +1,17 @@ suite: borrow testcase: borrow -runtime: 1d timeout: 1d -sleep: +sshd: + pub_key: <%= + begin + File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp + rescue + nil + end + %> + my_email: + +# sleep at the bottom +sleep: 1d -- 2.23.0

1 0

[PATCH lkp-tests] jobs: add borrow-1d.yaml
by Zhang Yale 26 Nov '20

26 Nov '20

Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- jobs/borrow-1d.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/jobs/borrow-1d.yaml b/jobs/borrow-1d.yaml index f0103680..c6bccb05 100644 --- a/jobs/borrow-1d.yaml +++ b/jobs/borrow-1d.yaml @@ -1,7 +1,14 @@ suite: borrow testcase: borrow -runtime: 1d -timeout: 1d - -sleep: +sshd: + pub_key: <%= + begin + File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp + rescue + nil + end + %> + my_email: +# sleep at the bottom +sleep: 1d -- 2.23.0

1 1

[PATCH v2 compass-ci] doc/manual: rename doc to 如何查看任务结果.md
by Wei Jihui 26 Nov '20

26 Nov '20

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- ...47\234\213\344\273\273\345\212\241\347\273\223\346\236\234.md" | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename "doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223.md" => "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" (100%) 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.md" "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.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.md" rename to "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" -- 2.23.0

1 0

[PATCH compass-ci] doc: rename the manual/如何申请测试机.md
by Yu Chuan 26 Nov '20

26 Nov '20

Signed-off-by: Yu Chuan <13186087857(a)163.com> --- ...\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename "doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" => "doc/manual/\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" (97%) diff --git "a/doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--\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/\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" similarity index 97% rename from "doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--\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/\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" index 668ed15ba316..470dadb93481 100644 --- "a/doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--\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/\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" @@ -231,7 +231,7 @@ hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=vm-2p8g borrow-1h.yaml ## 4.2 Submit命令指导 -参考文档：[compass-ci测试平台使用教程--submit命令详解.md](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/manual/compass-ci测试平台使用教程--submit命令详解.md) +参考文档：[submit命令详解.md](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/manual/submit命令详解.md) ## 4.3 testbox都有什么可选项？ -- 2.23.0

1 0