- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] doc/manual: change the hyperlink of submit***.md
by Li Yuanchao 27 Nov '20

27 Nov '20

As the name and path of submit***.md changed, so change the hyperlink of it. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- ...\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" "b/doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" index ad4f9b0..b4d3078 100644 --- "a/doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" +++ "b/doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" @@ -48,6 +48,6 @@ b/backlight/backlight: 并通过Pull Request的方式提交。相关参数含义见参考文档参考文档： -- [compass-ci测试平台使用教程--submit命令详解](https://gitee.com/wu_fengguang/compass-ci/t… +- [submit命令详解](https://gitee.com/wu_fengguang/compass-ci/tree/master/doc/manua… - [如何适配测试用例](https://gitee.com/wu_fengguang/lkp-tests/blob/master/doc/add-test… -- 2.23.0

1 0

[PATCH v3 compass-ci 2/2] sparrow/0-package: fix failed to restart docker.service
by Liu Yinsi 27 Nov '20

27 Nov '20

[why] when execute systemctl restart docker, error message: localhost.localdomain systemd[1]:docker.service: Failed with result 'timeout'. localhost.localdomain systemd[1]:Failed to start Docker Application Container Engine. because docker restart default timeout is 90s, when run too much containers, restart docker may need several minutes, then restart failed. [how] set TimeoutSec=0 to avoid timeout. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/common | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 5eb9f76..2753b9d 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -40,4 +40,7 @@ cat > /etc/docker/daemon.json <<EOF } EOF +sed '/^Environment=/a\TimeoutSec=0' /usr/lib/systemd/system/docker.service + +systemctl daemon-reload systemctl restart docker -- 2.23.0

1 0

[PATCH v3 compass-ci 1/2] sparrow/0-package: fix failed to start ssh-r
by Liu Yinsi 27 Nov '20

27 Nov '20

[why] when execute ssh-r/start, error message: docker: Error response from daemon: driver failed programming external connectivity on endpoint ssh_r (55638ba16aa1264dff0fdc1badc93176eec07d2b848d4a8d418d07011d84313d): Error starting userland proxy: listen tcp 0.0.0.0:51998: bind: address already in use. [how] because ssh-r will bind ports 50000-51999, set ip_local_port_range to prevent occupation. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/common | 1 + 1 file changed, 1 insertion(+) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 523438c..5eb9f76 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -12,6 +12,7 @@ cat >> /etc/sysctl.conf <<EOF net.ipv4.ip_forward=1 net.ipv6.bindv6only=1 vm.max_map_count=262144 +net.ipv4.ip_local_port_range = 1024 48999 EOF sysctl -p -- 2.23.0

1 0

[PATCH v2 compass-ci] container/result-cifs: add the container to share /srv/result
by Xiao Shenwei 27 Nov '20

27 Nov '20

[why] our os-cifs container will mount three dir, /srv/os, /srv/initrd, /srv/result in order to reduce the coupling, need split them [how] one folder mount by one container [usage] mount -t cifs o guest,port=447 //ip/result /tmp/result Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- container/result-cifs/Dockerfile | 22 ++++++++++++++++++++++ container/result-cifs/build | 5 +++++ container/result-cifs/smb.conf | 29 +++++++++++++++++++++++++++++ container/result-cifs/start | 24 ++++++++++++++++++++++++ 4 files changed, 80 insertions(+) create mode 100644 container/result-cifs/Dockerfile create mode 100755 container/result-cifs/build create mode 100644 container/result-cifs/smb.conf create mode 100755 container/result-cifs/start diff --git a/container/result-cifs/Dockerfile b/container/result-cifs/Dockerfile new file mode 100644 index 0000000..a0d47c2 --- /dev/null +++ b/container/result-cifs/Dockerfile @@ -0,0 +1,22 @@ +# Origin: https://github.com/Stanback/alpine-samba +# Copyright (C) 2016-2020 Eric D. Stanback +# SPDX-License-Identifier: GPL-3.0 + +FROM alpine:edge + +MAINTAINER Xiao Shenwei <xiaoshenwei96(a)163.com> + +RUN sed -ri.origin 's|^https?://dl-cdn.alpinelinux.org|http://mirrors.huaweicloud.com|g' /etc/apk/repositories +RUN adduser -u 1090 -D lkp +RUN apk add --update \ + samba-common-tools \ + samba-client \ + samba-server \ + bash +RUN rm -rf /var/cache/apk/* + +COPY ./smb.conf /etc/samba/ + +EXPOSE 447/tcp + +ENTRYPOINT ["smbd", "--foreground", "--no-process-group", "--log-stdout"] diff --git a/container/result-cifs/build b/container/result-cifs/build new file mode 100755 index 0000000..d97b6dd --- /dev/null +++ b/container/result-cifs/build @@ -0,0 +1,5 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +docker build -t result-cifs . diff --git a/container/result-cifs/smb.conf b/container/result-cifs/smb.conf new file mode 100644 index 0000000..4ccd943 --- /dev/null +++ b/container/result-cifs/smb.conf @@ -0,0 +1,29 @@ +# refer to https://lkml.org/lkml/2019/7/16/716 and https://lkml.org/lkml/2019/9/19/586 +[global] + workgroup = MYGROUP + server string = Samba Server + map to guest = Bad User + load printers = no + printing = bsd + printcap name = /dev/null + disable spoolss = yes + disable netbios = yes + server role = standalone + server services = -dns, -nbt + smb ports = 445 + create mode = 0777 + directory mode = 0777 + guest only = yes + guest ok = yes + server min protocol = NT1 + unix extensions = yes + mangled names = no + +[result] + path = /srv/result/ + comment = result + browseable = yes + writable = yes + public = yes + force user = lkp + force group = lkp diff --git a/container/result-cifs/start b/container/result-cifs/start new file mode 100755 index 0000000..2d6acba --- /dev/null +++ b/container/result-cifs/start @@ -0,0 +1,24 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +. $CCI_SRC/container/defconfig.sh + +lsmod | grep -q "^cifs\s" || { + sudo modprobe cifs +} + +docker_rm result-cifs + +cmd=( + docker run + -d + -p 447:445 + -v /etc/localtime:/etc/localtime:ro + -v /srv/result:/srv/result + --name result-cifs + --restart=always + result-cifs +) + +"${cmd[@]}" -- 2.23.0

2 1

[PATCH v2 lkp-tests] lkp-tests/*: fix cci jobs upload in container
by Wang Yong 27 Nov '20

27 Nov '20

docker can not use mount operation, so now use curl to upload cci-depends/cci-makepkg cgz file Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- distro/common | 10 ++++++++++ tests/cci-depends | 9 +++++++-- tests/cci-makepkg | 18 ++++++++++++++---- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/distro/common b/distro/common index b48dfe5f1..ad6fc23e5 100755 --- a/distro/common +++ b/distro/common @@ -81,3 +81,13 @@ share_debian_package() exit 0 } + +upload_dest_cgz() +{ + . $LKP_SRC/lib/upload.sh + + local dir="$1" + local file="$(ls -F ${dir} | grep -v "@")" + + upload_one_curl "${dir}/${file}" "${dir}" >/dev/null +} diff --git a/tests/cci-depends b/tests/cci-depends index d5c21541d..123f3503a 100755 --- a/tests/cci-depends +++ b/tests/cci-depends @@ -29,8 +29,10 @@ pack_arch=$os_arch . $LKP_SRC/distro/$DISTRO -is_mount_point ${DEPS_MNT} && umount ${DEPS_MNT} -mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$DEPS_MNT $DEPS_MNT || die "Failed to run mount" +is_docker || { + is_mount_point ${DEPS_MNT} && umount ${DEPS_MNT} + mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$DEPS_MNT $DEPS_MNT || die "Failed to run mount" +} umask 002 @@ -59,3 +61,6 @@ fixup_preinstall fixup_arch_install $pack_arch pack_benchmark_deps + +is_docker || exit 0 +upload_dest_cgz ${pack_to} diff --git a/tests/cci-makepkg b/tests/cci-makepkg index d08f23718..e9d089289 100755 --- a/tests/cci-makepkg +++ b/tests/cci-makepkg @@ -34,11 +34,17 @@ pack_to=${os_mount}/${os}/${os_arch}/${os_version}/${benchmark} cd $LKP_SRC/pkg/$benchmark || die "pkg is empty" -[ -n "$LKP_SERVER" ] && { - is_mount_point ${PKG_MNT} && umount ${PKG_MNT} - mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" +mount_pkg_mnt() +{ + is_mount_point ${PKG_MNT} && umount ${PKG_MNT} + mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr,port=446 //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" +} + +is_docker || { + [ -n "$LKP_SERVER" ] && mount_pkg_mnt } + curl_pkgfile() { curl -sS -H 'Content-Type: Application/json' -XPOST "$LKP_SERVER"':8100/git_command' \ @@ -140,7 +146,11 @@ build_source_pkg() PACMAN=true BUILDDIR=$TMP CARCH=$arch PKGEXT=.cgz CGZDEST="$sync_dest/$cgz_name" $makepkg - [ "$?" == 0 ] && update_softlink + [ "$?" == 0 ] || exit 1 + update_softlink + + is_docker || exit 0 + upload_dest_cgz ${sync_dest} } build_source_pkg -- 2.23.0

1 0

[PATCH v3 compass-ci 5/5] openeuler: build openeuler initramfs image with one command
by Wang Chenglong 27 Nov '20

27 Nov '20

[Why] Use the tool to create a new openeuler-$version initramfs image with one command, and we also can customize the pre-installed software by configuring ./packages-to-install. [How] We create a link button for the user to use. $CCI_SRC/rootfs/initramfs/openeuler/aarch64/${os_version}/build --- container/osimage/openeuler/run | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 container/osimage/openeuler/run diff --git a/container/osimage/openeuler/run b/container/osimage/openeuler/run new file mode 100755 index 0000000..dde9985 --- /dev/null +++ b/container/osimage/openeuler/run @@ -0,0 +1,28 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +. ${CCI_SRC}/container/osimage/openeuler/lib +. ${CCI_SRC}/container/defconfig.sh + +export_root_passwd +DIR=$(dirname $(realpath $0)) + +cmd=( + docker run + --name init_docker + -v $DIR/create-image:/root/bin/create-image + -v $DIR/packages-to-install:/tmp/packages-to-install + -v $DIR/files-to-exclude:/tmp/files-to-exclude + -v $DIR/${image}.repo:/etc/yum.repos.d/openEuler.repo + -e ROOT_PASSWD=$ROOT_PASSWD + -e IMAGE_NAME=$IMAGE_NAME + $image + /root/bin/create-image +) + +load_docker_image +"${cmd[@]}" +cp_image_to_host +docker_rm init_docker &> /dev/null +echo "build finished" -- 2.23.0

1 0

[PATCH v3 compass-ci 4/5] openeuler: generate the cgz file in container
by Wang Chenglong 27 Nov '20

27 Nov '20

Install packages, set rootfs, pack images package and other actions in docker. Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/osimage/openeuler/create-image | 37 ++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 container/osimage/openeuler/create-image diff --git a/container/osimage/openeuler/create-image b/container/osimage/openeuler/create-image new file mode 100755 index 0000000..7402b2b --- /dev/null +++ b/container/osimage/openeuler/create-image @@ -0,0 +1,37 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +install_packages() +{ + yum -y install --skip-broken $(</tmp/packages-to-install) + yum clean all +} + +setup_rootfs() +{ + ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + rm -f /etc/machine-id /var/lib/dbus/machine-id + systemd-machine-id-setup +} + +setup_login() { + [ -n "$ROOT_PASSWD" ] || return + echo "Changing root password" + passwd_md5=$(openssl passwd -1 "$ROOT_PASSWD") + sed -i -r "s/^root:[^:]*:(.*)/root:${passwd_md5//\//\\/}:\1/" "$ROOTFS_DIR/etc/shadow" + + sed -i 's/[# ]PermitRootLogin.*/PermitRootLogin yes/' "$ROOTFS_DIR/etc/ssh/sshd_config" +} + +pack_cgz() +{ + echo "Packing package. Please wait." + find / ! -path "/tmp/${IMAGE_NAME}" | grep -vf /tmp/files-to-exclude | cpio -o -Hnewc | gzip -9 > /tmp/${IMAGE_NAME} + chmod 644 /tmp/${IMAGE_NAME} +} + +install_packages +setup_rootfs +setup_login +pack_cgz -- 2.23.0

1 0

[PATCH v3 compass-ci 3/5] openeuler: the function executed in host
by Wang Chenglong 27 Nov '20

27 Nov '20

Generate the root password, download and load the Docker image, and copy the image package to the host. Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/osimage/openeuler/lib | 45 +++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100755 container/osimage/openeuler/lib diff --git a/container/osimage/openeuler/lib b/container/osimage/openeuler/lib new file mode 100755 index 0000000..e0b7017 --- /dev/null +++ b/container/osimage/openeuler/lib @@ -0,0 +1,45 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +DIR="$(pwd)" +os_name="$(echo $DIR | awk -F "/" '{print $(NF - 2)}')" +os_version="$(echo $DIR | awk -F "/" '{print $NF}')" +docker_url="https://repo.openeuler.org/openEuler-${os_version}/docker_img/aarch64/openE…" +docker_tar_file="openEuler-${os_version}-docker.aarch64.tar.xz" +image=$(echo "${os_name}-${os_version,,}") +IMAGE_NAME="${os_name}-${os_version}-$(date +"%Y%m%d").cgz" + +export_root_passwd() +{ + local root_pwd_file="$HOME/.config/compass-ci/rootfs-passwd" + [ -f "$root_pwd_file" ] || { + echo "[INFO] Please set the password file." + echo "$HOME/.config/compass-ci/rootfs-passwd" + exit 1 + } + + export ROOT_PASSWD=$(cat "$root_pwd_file") +} + +load_docker_image() +{ + if [[ "$os_version" == '20.09' || "$os_version" == '20.03-LTS' ]]; then + [ -f "$HOME/$docker_tar_file" ] || wget -O "$HOME/$docker_tar_file" "$docker_url" + fi + + docker load -i "$HOME/$docker_tar_file" + + if [ $? -eq 0 ]; then + echo "finish downloading image" + else + echo "[ERROR] Pull docker image failed." + exit 1 + fi +} + +cp_image_to_host() +{ + docker cp -a init_docker:/tmp/${IMAGE_NAME} $HOME/ + echo "result: $(ls $HOME/${IMAGE_NAME})" +} -- 2.23.0

1 0

[PATCH v3 compass-ci 2/5] openeuler: configure files about build image with one command
by Wang Chenglong 27 Nov '20

27 Nov '20

[Contains] openeule-${os_version}.repo: yum configuration files files-to-exclude: list of files that need to be excluded packages-to-install: list of packages that need to install README.md: descriptive documentation Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/osimage/openeuler/README.md | 15 +++++++ container/osimage/openeuler/files-to-exclude | 11 +++++ .../openeuler/openeuler-20.03-lts.repo | 43 +++++++++++++++++++ .../osimage/openeuler/openeuler-20.09.repo | 43 +++++++++++++++++++ .../osimage/openeuler/packages-to-install | 10 +++++ 5 files changed, 122 insertions(+) create mode 100644 container/osimage/openeuler/README.md create mode 100644 container/osimage/openeuler/files-to-exclude create mode 100644 container/osimage/openeuler/openeuler-20.03-lts.repo create mode 100644 container/osimage/openeuler/openeuler-20.09.repo create mode 100644 container/osimage/openeuler/packages-to-install diff --git a/container/osimage/openeuler/README.md b/container/osimage/openeuler/README.md new file mode 100644 index 0000000..cea68f9 --- /dev/null +++ b/container/osimage/openeuler/README.md @@ -0,0 +1,15 @@ +# Use the tool to create a new openeuler-${os_version} initramfs image. + +Usage: + cd ${CCI_SRC}/rootfs/initramfs/openeuler/aarch64/${os_version}/ + ./build + +Some configuration items: +./packages-to-install + If you want to pre-install the software, you can write the package names in ./packages-to-install. + +./files-to-exclude + If you want remove some unnecessary files, you can write the names in ./files-to-exclude + +$HOME/.config/compass-ci/rootfs-passwd + Set the password for the image into this file. diff --git a/container/osimage/openeuler/files-to-exclude b/container/osimage/openeuler/files-to-exclude new file mode 100644 index 0000000..3854947 --- /dev/null +++ b/container/osimage/openeuler/files-to-exclude @@ -0,0 +1,11 @@ +/.dockerenv +/lib/modules +/usr/lib/modules +/usr/share/doc +/usr/share/man +/usr/share/info +/usr/share/i18n +/usr/share/locale +/usr/share/terminfo +/tmp/files-to-exclude +/tmp/packages-to-install diff --git a/container/osimage/openeuler/openeuler-20.03-lts.repo b/container/osimage/openeuler/openeuler-20.03-lts.repo new file mode 100644 index 0000000..691f438 --- /dev/null +++ b/container/osimage/openeuler/openeuler-20.03-lts.repo @@ -0,0 +1,43 @@ +#generic-repos is licensed under the Mulan PSL v2. +#You can use this software according to the terms and conditions of the Mulan PSL v2. +#You may obtain a copy of Mulan PSL v2 at: +# http://license.coscl.org.cn/MulanPSL2 +#THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR +#PURPOSE. +#See the Mulan PSL v2 for more details. + +[OS] +name=OS +baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/RPM-GPG-KEY-openEuler + +[everything] +name=everything +baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/everything/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/everything/$basearch/RPM-GPG-KEY-openEuler + +[EPOL] +name=EPOL +baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/EPOL/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/EPOL/$basearch/RPM-GPG-KEY-openEuler + +[debuginfo] +name=debuginfo +baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/debuginfo/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/debuginfo/$basearch/RPM-GPG-KEY-openEuler + +[source] +name=source +baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/source/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/source/RPM-GPG-KEY-openEuler diff --git a/container/osimage/openeuler/openeuler-20.09.repo b/container/osimage/openeuler/openeuler-20.09.repo new file mode 100644 index 0000000..1da7571 --- /dev/null +++ b/container/osimage/openeuler/openeuler-20.09.repo @@ -0,0 +1,43 @@ +#generic-repos is licensed under the Mulan PSL v2. +#You can use this software according to the terms and conditions of the Mulan PSL v2. +#You may obtain a copy of Mulan PSL v2 at: +# http://license.coscl.org.cn/MulanPSL2 +#THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR +#PURPOSE. +#See the Mulan PSL v2 for more details. + +[OS] +name=OS +baseurl=http://repo.openeuler.org/openEuler-20.09/OS/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.09/OS/$basearch/RPM-GPG-KEY-openEuler + +[everything] +name=everything +baseurl=http://repo.openeuler.org/openEuler-20.09/everything/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.09/everything/$basearch/RPM-GPG-KEY-openEuler + +[EPOL] +name=EPOL +baseurl=http://repo.openeuler.org/openEuler-20.09/EPOL/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.09/EPOL/$basearch/RPM-GPG-KEY-openEuler + +[debuginfo] +name=debuginfo +baseurl=http://repo.openeuler.org/openEuler-20.09/debuginfo/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.09/debuginfo/$basearch/RPM-GPG-KEY-openEuler + +[source] +name=source +baseurl=http://repo.openeuler.org/openEuler-20.09/source/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.09/source/RPM-GPG-KEY-openEuler diff --git a/container/osimage/openeuler/packages-to-install b/container/osimage/openeuler/packages-to-install new file mode 100644 index 0000000..f17eee1 --- /dev/null +++ b/container/osimage/openeuler/packages-to-install @@ -0,0 +1,10 @@ +cpio +systemd-udev.aarch64 +cifs-utils +nfs-utils +hostname +curl +openssh-server +openssl +iputils +wget -- 2.23.0

1 0

[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

[PATCH compass-ci] doc/manual : rename
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 ------------------- ...00\346\272\220\351\241\271\347\233\256.md" | 0 2 files changed, 53 deletions(-) delete mode 100644 doc/manual/how-to-use-compass-ci-to-test-open-source-project.md rename doc/how-to-use-compass-ci-to-test-open-source-project.md => "doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" (100%) diff --git a/doc/manual/how-to-use-compass-ci-to-test-open-source-project.md b/doc/manual/how-to-use-compass-ci-to-test-open-source-project.md deleted file mode 100644 index ad4f9b0..0000000 --- a/doc/manual/how-to-use-compass-ci-to-test-open-source-project.md +++ /dev/null @@ -1,53 +0,0 @@ -使用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… - diff --git a/doc/how-to-use-compass-ci-to-test-open-source-project.md "b/doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" similarity index 100% rename from doc/how-to-use-compass-ci-to-test-open-source-project.md rename to "doc/manual/\345\246\202\344\275\225\344\275\277\347\224\250compass-ci\346\265\213\350\257\225\345\274\200\346\272\220\351\241\271\347\233\256.md" -- 2.23.0

1 0

[PATCH compass-ci] doc/manual: rename compass-ci测试平台使用教程--submit命令详解.md to submit命令详解.md
by Wu Zhende 26 Nov '20

26 Nov '20

Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- .../submit\345\221\275\344\273\244\350\257\246\350\247\243.md" | 0 1 file changed, 0 insertions(+), 0 deletions(-) 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--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" => "doc/manual/submit\345\221\275\344\273\244\350\257\246\350\247\243.md" (100%) 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--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" "b/doc/manual/submit\345\221\275\344\273\244\350\257\246\350\247\243.md" similarity index 100% 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--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" rename to "doc/manual/submit\345\221\275\344\273\244\350\257\246\350\247\243.md" -- 2.23.0

1 0

[PATCH compass-ci] doc/manual: rename doc
by Wei Jihui 26 Nov '20

26 Nov '20

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- ...46\237\245\347\234\213\344\273\273\345\212\241\347\273\223.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\346\236\234" => "doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223.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\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.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" 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.md" -- 2.23.0

1 0

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

26 Nov '20

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

1 0

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

26 Nov '20

Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- jobs/borrow-10d.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/jobs/borrow-10d.yaml b/jobs/borrow-10d.yaml index 3896ef78..cd86284b 100644 --- a/jobs/borrow-10d.yaml +++ b/jobs/borrow-10d.yaml @@ -1,6 +1,13 @@ suite: borrow testcase: borrow -runtime: 10d - -sleep: +sshd: + pub_key: <%= + begin + File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp + rescue + nil + end + %> + my_email: +sleep: 10d -- 2.23.0

1 1

[PATCH compass-ci] doc/manual: fix compass-ci测试平台使用教程--submit命令详解.md
by Wu Zhende 26 Nov '20

26 Nov '20

Some pictures can't show. Use texts replace. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- ...75\344\273\244\350\257\246\350\247\243.md" | 53 +++++++++++++++++-- 1 file changed, 50 insertions(+), 3 deletions(-) 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--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" "b/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--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" index df7487c..3b5440c 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--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" +++ "b/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--submit\345\221\275\344\273\244\350\257\246\350\247\243.md" @@ -24,13 +24,60 @@ submit命令是我们提交测试任务最基本的方式，同时提供了很 ### -m的用法：使用-m参数可以启动任务监控功能，将会打印出任务执行过程中的各种状态信息方便用户实时监控所提交的任务执行到哪个阶段 -![../pictures/option-m.PNG](../pictures/option-m.PNG) +命令：submit -m iperf.yaml +效果如下： + submit iperf.yaml, got job_id=z9.170614 + query=>{"job_id":["z9.170614"]} + connect to ws://172.168.131.2:11310/filter + {"job_id":"z9.170614","message":"","job_state":"submit","result_root":"/srv/result/iperf/2020-11-26/vm-2p8g/openeuler-20.03-aarch6 + {"job_id": "z9.170614", "result_root": "/srv/result/iperf/2020-11-26/vm-2p8g/openeuler-20.03-aarch64/tcp-30/z9.170614", "job_state + {"job_id": "z9.170614", "job_state": "boot"} + {"job_id": "z9.170614", "job_state": "download"} + {"time":"2020-11-26 15:54:48","mac":"0a-ab-e5-da-a2-64","ip":"172.18.210.198","job_id":"z9.170614","state":"running","testbox":"vm + {"job_state":"running","job_id":"z9.170614"} + {"job_state":"post_run","job_id":"z9.170614"} + {"start_time":"2020-11-26 07:53:45","end_time":"2020-11-26 07:54:15","loadavg":"1.17 0.36 0.13 1/109 1960","job_id":"z9.170614"} + {"job_state":"finished","job_id":"z9.170614"} + {"job_id": "z9.170614", "job_state": "complete"} + {"time":"2020-11-26 15:55:26","mac":"0a-ab-e5-da-a2-64","ip":"172.18.210.198","job_id":"z9.170614","state":"rebooting","testbox":"} + {"job_id": "z9.170614", "job_state": "extract_finished"} + connection closed: normal ### -c的用法： -c参数需要搭配-m参数来使用。使用场景：申请设备的任务实现自动登入功能命令：submit -m -c borrow-1h.yaml 当我们提交一个申请设备的任务后，会获取到返回的登陆信息，如：ssh ip -p port -添加-c参数之后不需要我们手动输入ssh登陆命令来进入执行机，效果如下图所示 -![../pictures/option-c.PNG](../pictures/option-c.PNG) +添加-c参数之后不需要我们手动输入ssh登陆命令来进入执行机，效果如下所示: + submit /home/wuzhende/code/lkp-tests/jobs/borrow-1h.yaml, got job_id=z9.143309 + query=>{"job_id":["z9.143309"]} + connect to ws://localhost:11310/filter + {"job_id":"z9.143309","message":"","job_state":"submit","result_root":"/srv/result/borrow/2020-11-26/vm-2p8g/openeuler-20.03-aarch + {"job_id": "z9.143309", "result_root": "/srv/result/borrow/2020-11-26/vm-2p8g/openeuler-20.03-aarch64/3600/z9.143309", "job_state" + {"job_id": "z9.143309", "job_state": "boot"} + {"job_id": "z9.143309", "job_state": "download"} + {"time":"2020-11-26 18:42:38","mac":"0a-f7-47-0e-19-12","ip":"172.18.16.158","job_id":"z9.143309","state":"running","testbox":"vm- + {"job_state":"running","job_id":"z9.143309"} + {"job_id": "z9.143309", "state": "set ssh port", "ssh_port": "51170", "tbox_name": "vm-2p8g.wuzhende-2252124"} + Host 172.168.131.113 not found in /home/wuzhende/.ssh/known_hosts + Warning: Permanently added '[172.168.131.113]:51170' (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 18:42:40 CST 2020 + + System load: 1.53 + Processes: 105 + Memory used: 6.1% + Swap used: 0.0% + Usage On: 89% + IP address: 172.17.0.1 + Users online: 1 + + + + root@vm-2p8g ~# +已经成功登陆执行机 ### 总结以上即为submit各种参数的用法解释，您可以根据您的实际需求灵活搭配。 -- 2.23.0

1 0

2025

2024

2023

2022

2021

2020

Compass-ci