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

[PATCH v3 compass-ci] LICENSE: add document license
by Bai Jing 29 Oct '20

29 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- LICENSES/CCBY-4.0 | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 LICENSES/CCBY-4.0 diff --git a/LICENSES/CCBY-4.0 b/LICENSES/CCBY-4.0 new file mode 100644 index 0000000..93870a2 --- /dev/null +++ b/LICENSES/CCBY-4.0 @@ -0,0 +1,7 @@ +Copyright (c) 2020 Huawei Technologies Co., Ltd. +Your copying, use, modification, and distribution of this document is subject to the +Creative Commons Attribution-ShareAlike 4.0 International Public License ("CC BY-SA 4.0"). +For ease of understanding, you can visit https://creativecommons.org/licenses/by-sa/4.0/ +to learn about the outline of CC BY-SA 4.0(but not a substitute). +The complete agreement of CC BY-SA 4.0 can be obtained from the following website: +https://creativecommons.org/licenses/by-sa/4.0/legalcode. -- 2.23.0

1 0

[PATCH v6 compass-ci] sparrow: fix containers auto resume failed after reboot
by Liu Yinsi 29 Oct '20

29 Oct '20

before: sparrow/4-docker/buildall => execute $CONTAINER/build, install, first-run, start script after: sparrow/4-docker/buildall reboot => only execute /$CONTAINER/first-run, start script because some containers have start-depends, docker start "${containers[@]}" also cause container service resume failed, need start its dependence firstly. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/4-docker/buildall | 7 +++++-- sparrow/7-systemd/cci-network | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index 230c6ac..6e0a2f8 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -3,6 +3,7 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. CONTAINER_PATH="$CCI_SRC/container" +export action=$1 build_depends() { @@ -30,8 +31,10 @@ do_one() ( cd $container [ "$container_name" == 'sub-fluentd' ] && exit - [ -x build ] && ./build - [ -x install ] && ./install + if [ "$action" != "reboot" ]; then + [ -x build ] && ./build + [ -x install ] && ./install + fi [ -x first-run ] && ./first-run [ -x start ] && ./start ) diff --git a/sparrow/7-systemd/cci-network b/sparrow/7-systemd/cci-network index 4aadcdc..6e59dbb 100755 --- a/sparrow/7-systemd/cci-network +++ b/sparrow/7-systemd/cci-network @@ -4,7 +4,8 @@ #this file used in our own systemd unit file: cci-network.service. #contents as follows will be automatically executed after system reboot. -[[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci +# export ENV +. /etc/profile.d/compass.sh $CCI_SRC/sparrow/2-network/br0 $CCI_SRC/sparrow/2-network/iptables @@ -12,5 +13,5 @@ $CCI_SRC/sparrow/2-network/nfs $CCI_SRC/sparrow/2-network/cifs # --restart=always option is not absolutely reliable -containers=($(docker ps -a |grep -v NAMES |awk '{print $NF}')) -[ -n "$containers" ] && docker start "${containers[@]}" >/dev/null 2>&1 +# container need to start its dependences firstly. +$CCI_SRC/sparrow/4-docker/buildall reboot -- 2.23.0

1 0

[PATCH v5 compass-ci] sparrow: fix containers auto resume failed after reboot
by Liu Yinsi 29 Oct '20

29 Oct '20

before: sparrow/4-docker/buildall => execute $CONTAINER/build && install && start script after: sparrow/4-docker/buildall reboot => only execute /$CONTAINER/start script because some containers have start-depends, docker start "${containers[@]}" also cause container service resume failed, need start its dependence firstly. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/4-docker/buildall | 7 +++++-- sparrow/7-systemd/cci-network | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index 230c6ac..6e0a2f8 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -3,6 +3,7 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. CONTAINER_PATH="$CCI_SRC/container" +export action=$1 build_depends() { @@ -30,8 +31,10 @@ do_one() ( cd $container [ "$container_name" == 'sub-fluentd' ] && exit - [ -x build ] && ./build - [ -x install ] && ./install + if [ "$action" != "reboot" ]; then + [ -x build ] && ./build + [ -x install ] && ./install + fi [ -x first-run ] && ./first-run [ -x start ] && ./start ) diff --git a/sparrow/7-systemd/cci-network b/sparrow/7-systemd/cci-network index 4aadcdc..6e59dbb 100755 --- a/sparrow/7-systemd/cci-network +++ b/sparrow/7-systemd/cci-network @@ -4,7 +4,8 @@ #this file used in our own systemd unit file: cci-network.service. #contents as follows will be automatically executed after system reboot. -[[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci +# export ENV +. /etc/profile.d/compass.sh $CCI_SRC/sparrow/2-network/br0 $CCI_SRC/sparrow/2-network/iptables @@ -12,5 +13,5 @@ $CCI_SRC/sparrow/2-network/nfs $CCI_SRC/sparrow/2-network/cifs # --restart=always option is not absolutely reliable -containers=($(docker ps -a |grep -v NAMES |awk '{print $NF}')) -[ -n "$containers" ] && docker start "${containers[@]}" >/dev/null 2>&1 +# container need to start its dependences firstly. +$CCI_SRC/sparrow/4-docker/buildall reboot -- 2.23.0

1 0

[PATCH v5 compass-ci 4/5] container/ntp-server: build
by Wang Chenglong 29 Oct '20

29 Oct '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/build | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 container/ntp-server/build diff --git a/container/ntp-server/build b/container/ntp-server/build new file mode 100755 index 0000000..7826fb2 --- /dev/null +++ b/container/ntp-server/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 ntp-server . -- 2.23.0

1 0

[PATCH v2 lkp-tests] jobs/build-pkg.yaml: add pkgbuild_repo examples
by Lin Jiaxin 29 Oct '20

29 Oct '20

[why] pkgbuild_repo field's parameter format is not uniform for different git repository. Novices are easy to make mistakes. [how] Add examples of three types of git repository used by build-pkg. Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- jobs/build-pkg.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jobs/build-pkg.yaml b/jobs/build-pkg.yaml index 5888838a..b17fd2ad 100644 --- a/jobs/build-pkg.yaml +++ b/jobs/build-pkg.yaml @@ -1,4 +1,9 @@ suite: build-pkg category: functional +# pkgbuild_repo examples +# pkgbuild_repo: archlinux/aur-j/java8-openjdk +# pkgbuild_repo: archlinux/community//keepalived/trunk +# pkgbuild_repo: archlinux/packages//prometheus-node-exporter/trunk + build-pkg: -- 2.23.0

1 0

[PATCH v4 compass-ci 4/5] container/ntp-server: star
by Wang Chenglong 29 Oct '20

29 Oct '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/start | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 container/ntp-server/start diff --git a/container/ntp-server/start b/container/ntp-server/start new file mode 100755 index 0000000..6e7479e --- /dev/null +++ b/container/ntp-server/start @@ -0,0 +1,16 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +. ../defconfig.sh + +docker_rm ntp_server +cmd=( + docker run + -id + --name=ntp_server + -p 123:123/udp + ntp_server:latest +) + +"${cmd[@]}" -- 2.23.0

4 6

[PATCH v4 lkp-tests] fix(distro/depends): add depends file
by Wang Yong 29 Oct '20

29 Oct '20

[Why] there are pack-deps/makepkg depends file before and use nfs-common, now we use cci-depends/cci-makepkg file and use cifs-utils. Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- distro/depends/cci-depends | 2 ++ distro/depends/cci-makepkg | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 distro/depends/cci-depends create mode 100644 distro/depends/cci-makepkg diff --git a/distro/depends/cci-depends b/distro/depends/cci-depends new file mode 100644 index 000000000..1f7f73ac3 --- /dev/null +++ b/distro/depends/cci-depends @@ -0,0 +1,2 @@ +cifs-utils +cpio diff --git a/distro/depends/cci-makepkg b/distro/depends/cci-makepkg new file mode 100644 index 000000000..a7ee67537 --- /dev/null +++ b/distro/depends/cci-makepkg @@ -0,0 +1,10 @@ +curl +libarchive-tools +bzip2 +fakeroot +gnupg +gettext +openssl +ncurses-bin +binutils +cifs-utils -- 2.23.0

1 0

[PATCH v4 compass-ci 2/5] container/ntp-server: Dockerfile
by Wang Chenglong 29 Oct '20

29 Oct '20

[What] The docker file for build a container to provide network time synchronization service for virtual and physical machines. Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/Dockerfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 container/ntp-server/Dockerfile diff --git a/container/ntp-server/Dockerfile b/container/ntp-server/Dockerfile new file mode 100644 index 0000000..6d95bf2 --- /dev/null +++ b/container/ntp-server/Dockerfile @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM centos:7 + +RUN yum repolist +RUN yum -y install ntp \ + && yum clean all + +COPY ntp.conf /etc/ntp.conf +COPY start-server.sh / + +EXPOSE 123 + +ENTRYPOINT ["/start-server.sh"] +CMD ["sh"] -- 2.23.0

3 4

[PATCH v3 compass-ci] /lib/es_query.rb: add range query
by Zhang Yuhang 29 Oct '20

29 Oct '20

[why] Some queries need to limit the range of fields. Signed-off-by: Zhang Yuhang <zhangyuhang25(a)huawei.com> --- lib/es_query.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/es_query.rb b/lib/es_query.rb index aaaadc2..037213d 100644 --- a/lib/es_query.rb +++ b/lib/es_query.rb @@ -36,12 +36,27 @@ class ESQuery end end +# Range Query Example: +# range = { +# start_time: { +# gte: '2020-09-10 01:50:00', +# lte: '2020-09-10 01:53:00' +# }, +# end_time: { +# gt: '2020-09-10 01:52:00', +# lt: '2020-09-10 01:54:00' +# } +# } +# items['range'] = range +# build_mutli_field_subquery_body(items) def build_mutli_field_subquery_body(items) query_fields = [] items.each do |key, value| if value.is_a?(Array) inner_query = build_multi_field_or_query_body(key, value) query_fields.push({ bool: { should: inner_query } }) + elsif key.to_s == 'range' + query_fields.concat(value.map { |k, v| { range: { k => v } } }) else query_fields.push({ term: { key => value } }) end -- 2.23.0

2 2

[PATCH v4 compass-ci 1/5] container/ntp-server: build
by Wang Chenglong 29 Oct '20

29 Oct '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/build | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 container/ntp-server/build diff --git a/container/ntp-server/build b/container/ntp-server/build new file mode 100755 index 0000000..c02152a --- /dev/null +++ b/container/ntp-server/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 ntp_server . -- 2.23.0

3 4