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

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

30 Oct '20

[why] some containers have start-depends, docker start "${containers[@]}" also cause container service resume failed, need start its dependence firstly. [how] before: 4-docker/buildall => execute $CONTAINER/build, install, first-run, start script after: 4-docker/buildall reboot => only execute $CONTAINER/first-run, start script 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

2 2

[PATCH compass-ci] sparrow/3-code/debian: fix format problem.
by Zhang Yale 30 Oct '20

30 Oct '20

Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- sparrow/3-code/os/debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sparrow/3-code/os/debian b/sparrow/3-code/os/debian index efb4fcb..80dca70 100644 --- a/sparrow/3-code/os/debian +++ b/sparrow/3-code/os/debian @@ -1,5 +1,5 @@ #!/bin/bash -cat >> /etc/default/docker <<EOF +cat > /etc/default/docker << EOF DOCKER_OPTS="--dns 114.114.114.114" EOF -- 2.23.0

5 5

[PATCH v6 compass-ci 1/5] container/ntp-server: Dockerfile
by Wang Chenglong 30 Oct '20

30 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 | 18 ++++++++++++++++++ 1 file changed, 18 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..76f2a0e --- /dev/null +++ b/container/ntp-server/Dockerfile @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM centos:7 +MAINTAINER Wang Chenglong <18509160991(a)163.com> + +RUN yum repolist +RUN yum -y install ntp && \ + yum clean all +RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + +COPY ntp.conf /etc/ntp.conf +COPY start-server.sh / + +EXPOSE 123 + +ENTRYPOINT ["/start-server.sh"] +CMD ["sh"] -- 2.23.0

2 2

[PATCH lkp-tests] bin/lkp-setup-rootfs: fix auto submit makepkg task
by Li Ping 30 Oct '20

30 Oct '20

[why] the define_files will generate the PKGBUILD and when run define_files_auto_pack will automatic run makepkg even though the job is not for makepkg --- bin/lkp-setup-rootfs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/lkp-setup-rootfs b/bin/lkp-setup-rootfs index 2890601e..a3663b42 100755 --- a/bin/lkp-setup-rootfs +++ b/bin/lkp-setup-rootfs @@ -187,14 +187,14 @@ define_files_pkg_pack() ( local benchmark=${1#pkg/} export benchmark=${benchmark%/PKGBUILD} - $LKP_SRC/tests/makepkg + $LKP_SRC/tests/cci-makepkg ) } # There may be $program-dev or $program-dev-dev in the # "$LKP_SRC/distro/depends" directory, # when the value passed by $define_files is "distro/depends/$program-dev", -# you don't know which script in "makepkg" or "pack-deps" to execute, +# you don't know which script in "cci-makepkg" or "pack-deps" to execute, # so it needs to be handled sparately. # Save the result to # "/srv/initrd/deps/$os/$os_arch/$os_version/$deps_benchmark.cgz", @@ -208,7 +208,7 @@ define_files_deps_pack() [ $suffix == "dev" ] && [ -f "$LKP_SRC/pkg/$pkg_benchmark/PKGBUILD" ] && { ( export benchmark=$pkg_benchmark - $LKP_SRC/tests/makepkg + $LKP_SRC/tests/cci-makepkg ) return 0 } @@ -228,10 +228,10 @@ define_files_auto_pack() do [ -f "$LKP_SRC/$path" ] || continue - [ ${path##*/} = PKGBUILD ] && { - define_files_pkg_pack $path + [ ${path##*/} = PKGBUILD ] && [ $suite = 'cci-makepkg' ] && { + define_files_pkg_pack $path } - [ ${path#distro/depends/} != $path ] && { + [ ${path#distro/depends/} != $path ] && [ $suite = 'cci-depends' ] && { define_files_deps_pack $path } done -- 2.23.0

2 1

[PATCH v6 compass-ci 5/5] container/ntp-server: start
by Wang Chenglong 30 Oct '20

30 Oct '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/start | 17 +++++++++++++++++ 1 file changed, 17 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..c6f04a6 --- /dev/null +++ b/container/ntp-server/start @@ -0,0 +1,17 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +SCRIPT_DIR=$(dirname $(realpath $0)) +. $(dirname $SCRIPT_DIR)/defconfig.sh + +docker_rm ntp-server +cmd=( + docker run + -id + --name=ntp-server + -p 123:123/udp + ntp-server +) + +"${cmd[@]}" -- 2.23.0

3 4

[PATCH v3 lkp-tests] fix: btrfs-progs is not installed when os_mount=initramfs
by Hu Xuejiao 29 Oct '20

29 Oct '20

[why] mkfs.btrfs "command not found" when os_mount=initramfs [how] it will user mkfs.ext4 because mkfs.ext4 is common, other mkfs.*** is not considered [how] mkfs.btrfs and mkfs.ext4 is no exist, it will return Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- lib/bootstrap.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index a7776d68..9744cb84 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -456,7 +456,12 @@ mount_rootfs() ROOTFS_DIR=/opt/rootfs mkdir -p $ROOTFS_DIR mount $rootfs_partition $ROOTFS_DIR || { - mkfs.btrfs -f $rootfs_partition + if has_cmd mkfs.btrfs; then + mkfs.btrfs -f $rootfs_partition + else + mkfs.ext4 -F $rootfs_partition || return + fi + mount $rootfs_partition $ROOTFS_DIR } mkdir -p $ROOTFS_DIR/tmp -- 2.23.0

3 2

[PATCH v2 lkp-tests] hackbench/PKGBUILD: fix source and build function
by Zhang Yale 29 Oct '20

29 Oct '20

[Why] Old source "https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-1.8.tar.gz" is not available, and need build before package. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- pkg/hackbench/PKGBUILD | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/hackbench/PKGBUILD b/pkg/hackbench/PKGBUILD index 797a00e6..7e3b52e9 100644 --- a/pkg/hackbench/PKGBUILD +++ b/pkg/hackbench/PKGBUILD @@ -4,10 +4,17 @@ pkgrel=1 arch=('i386' 'x86_64') url="https://www.kernel.org/pub/linux/utils/rt-tests" license=('GPL') -source=("https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-${pkgver}.tar.gz") +source=("https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/rt-test…") sha256sums=('SKIP') -package() { +build() +{ + cd "$srcdir/rt-tests-${pkgver}" + gcc -o hackbench hackbench.c -lpthread +} + +package() +{ mkdir -p "${pkgdir}/lkp/benchmarks/${pkgname}" cd "$srcdir/rt-tests-${pkgver}" make install DESTDIR="${pkgdir}/lkp/benchmarks/${pkgname}" -- 2.23.0

3 4

[PATCH v2 compass-ci] save hostname and queues relation in redis
by Xiao Shenwei 29 Oct '20

29 Oct '20

[why] the test machine has the ability to know which queues should be requested [how] for VM HW, we will register mac2hostname and hostname2queues. then they can find queues based on mac. API: boot.ipxe/mac/${mac} for docker, we will register hostname2queues, then container can find queues based on hostname. API: boot.container/hostname/${hostname} Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- src/lib/sched.cr | 8 ++++++++ src/scheduler/scheduler.cr | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index b2ef6ce..9407ddc 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -34,10 +34,18 @@ class Sched @redis.hash_set("sched/mac2host", normalize_mac(mac), hostname) end + def set_host2queues(hostname : String, queues : String) + @redis.hash_set("sched/host2queues", hostname, queues) + end + def del_host_mac(mac : String) @redis.hash_del("sched/mac2host", normalize_mac(mac)) end + def del_host2queues(hostname : String) + @redis.hash_del("sched/host2queues", hostname) + end + # return: # Hash(String, Hash(String, String)) def get_cluster_state(cluster_id) diff --git a/src/scheduler/scheduler.cr b/src/scheduler/scheduler.cr index 371e4ed..a946ea0 100644 --- a/src/scheduler/scheduler.cr +++ b/src/scheduler/scheduler.cr @@ -113,6 +113,18 @@ module Scheduler end end + # curl -X PUT "http://localhost:3000/set_host2queues?queues=vm-2p8g.aarch64&host=vm-2p8g.a…" + put "/set_host2queues" do |env| + env.response.headers["Connection"] = "close" + if (client_queues = env.params.query["queues"]?) && (client_host = env.params.query["host"]?) + sched.set_host2queues(client_host, client_queues) + + "Done" + else + "No yet" + end + end + # curl -X PUT "http://localhost:3000/del_host_mac?mac=00-01-02-03-04-05" put "/del_host_mac" do |env| env.response.headers["Connection"] = "close" @@ -125,6 +137,18 @@ module Scheduler end end + # curl -X PUT "http://localhost:3000/del_host2queues?host=vm-2p8g.aarch64" + put "/del_host2queues" do |env| + env.response.headers["Connection"] = "close" + if client_host = env.params.query["host"]? + sched.del_host2queues(client_host) + + "Done" + else + "No yet!" + end + end + # client(runner) report job's status # /~lkp/cgi-bin/lkp-jobfile-append-var # ?job_file=/lkp/scheduled/job.yaml&job_state=running&job_id=10 -- 2.23.0

3 4

[PATCH v2 lkp-tests] fix: btrfs-progs is not installed when os_mount=initramfs
by Hu Xuejiao 29 Oct '20

29 Oct '20

[why] mkfs.btrfs "command not found" when os_mount=initramfs [how] it will user mkfs.ext4. because mkfs.ext4 is common, other mkfs.*** is not considered [how] mkfs.btrf and mkfs.ext4 is no exist, it will return Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- lib/bootstrap.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index a7776d68..9744cb84 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -456,7 +456,12 @@ mount_rootfs() ROOTFS_DIR=/opt/rootfs mkdir -p $ROOTFS_DIR mount $rootfs_partition $ROOTFS_DIR || { - mkfs.btrfs -f $rootfs_partition + if has_cmd mkfs.btrfs; then + mkfs.btrfs -f $rootfs_partition + else + mkfs.ext4 -F $rootfs_partition || return + fi + mount $rootfs_partition $ROOTFS_DIR } mkdir -p $ROOTFS_DIR/tmp -- 2.23.0

3 2

[PATCH compass-ci] container/scheduler/start: fix duplicate -e
by Wu Zhende 29 Oct '20

29 Oct '20

[Why] "env = docker_env(defaults)" already add "-e xxx". Don't need to add in cmd again. SCHED_HOST/SCHED_PORT/GIT_SERVER/MASTER_FLUENTD_HOST/MASTER_FLUENTD_HOST may add duplicate -e. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/scheduler/start | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/container/scheduler/start b/container/scheduler/start index 6898d4b..70a3496 100755 --- a/container/scheduler/start +++ b/container/scheduler/start @@ -32,15 +32,17 @@ defaults = relevant_defaults(names) defaults['SSHR_PORT'] ||= 5050 defaults['SSHR_PORT_BASE'] ||= 50000 defaults['SSHR_PORT_LEN'] ||= 2000 +defaults['SCHED_PORT'] ||= '3000' +defaults['SCHED_HOST'] ||= '172.17.0.1' +defaults['MASTER_FLUENTD_PORT'] ||= '24224' env = docker_env(defaults) CCI_REPOS = ENV['CCI_REPOS'] || '/c' DEFAULT_LKP = "#{CCI_REPOS}/lkp-tests" DEFAULT_CCI = "#{CCI_REPOS}/compass-ci" LAB = defaults['lab'] || 'z9' -SCHED_PORT = defaults['SCHED_PORT'] || '3000' -SCHED_HOST = defaults['SCHED_HOST'] || '172.17.0.1' -MASTER_FLUENTD_PORT = defaults['MASTER_FLUENTD_PORT'] || '24224' +SCHED_PORT = defaults['SCHED_PORT'] +SCHED_HOST = defaults['SCHED_HOST'] DEFAULT_CONFIG_DIR = '/etc/compass-ci/defaults' docker_rm "s001-alpine-#{SCHED_PORT}" @@ -61,11 +63,6 @@ cmd = %W[ -e CCI_REPOS=#{CCI_REPOS} -e LKP_SRC=#{DEFAULT_LKP} -e CCI_SRC=#{DEFAULT_CCI} - -e SCHED_HOST=#{SCHED_HOST} - -e SCHED_PORT=#{SCHED_PORT} - -e GIT_SERVER=#{defaults["GIT_SERVER"]} - -e MASTER_FLUENTD_HOST=#{defaults["MASTER_FLUENTD_HOST"]} - -e MASTER_FLUENTD_PORT=#{MASTER_FLUENTD_PORT} -v #{ENV['LKP_SRC']}:#{DEFAULT_LKP} -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} -v #{DEFAULT_CONFIG_DIR}:#{DEFAULT_CONFIG_DIR}:ro -- 2.23.0

1 0