- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci 2/2] test2
by Xu Xijian 02 Mar '21

02 Mar '21

Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- container/dracut-initrd/test2 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 container/dracut-initrd/test2 diff --git a/container/dracut-initrd/test2 b/container/dracut-initrd/test2 new file mode 100644 index 0000000..e69de29 -- 2.23.0

1 1

[PATCH compass-ci 1/2] test1
by Xu Xijian 02 Mar '21

02 Mar '21

Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- container/dracut-initrd/test1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 container/dracut-initrd/test1 diff --git a/container/dracut-initrd/test1 b/container/dracut-initrd/test1 new file mode 100644 index 0000000..e69de29 -- 2.23.0

1 1

[PATCH v2 compass-ci 2/2] container/dracut-initrd: add module 90lkp/lkp-deploy.sh
by Xu Xijian 02 Mar '21

02 Mar '21

lkp-deploy.sh does the concrete work of 90lkp, it adds the lkp scripts into testbox's rootfs to run test job. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- .../modules.d/90lkp/lkp-deploy.sh | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 container/dracut-initrd/modules.d/90lkp/lkp-deploy.sh diff --git a/container/dracut-initrd/modules.d/90lkp/lkp-deploy.sh b/container/dracut-initrd/modules.d/90lkp/lkp-deploy.sh new file mode 100755 index 0000000..e88959b --- /dev/null +++ b/container/dracut-initrd/modules.d/90lkp/lkp-deploy.sh @@ -0,0 +1,48 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +. /lib/dracut-lib.sh + +# transfer LKP dirs +[ -d /lkp ] || return 0 + +cp -a /lkp "$NEWROOT"/ + +for i in /lkp/lkp/src/rootfs/addon/* /usr/local/* /opt/* +do + dir=$(basename "$i") + + [ "$i" != "${i%/\*}" ] && continue # skip: i='dir/*' + + [ -d "$NEWROOT/$dir" ] || mkdir -p "$NEWROOT/$dir" + + for j in "$i"/* "$i"/.??* + do + [ "$j" != "${j%/\*}" ] && continue # skip: j='dir/*' + + [ -f "$j" ] && { + cp -a "$j" "$NEWROOT/$dir"/ + continue + } + + subdir=$(basename "$j") + + [ -d "$NEWROOT/$dir/$subdir" ] || mkdir -p "$NEWROOT/$dir/$subdir" + + for k in "$j"/* + do + [ "$k" != "${k%/\*}" ] && continue # skip: k='dir/*' + + cp -a "$j"/* "$NEWROOT/$dir/$subdir"/ + done + done +done + +[ -d /usr/src ] && + cp -a /usr/src "$NEWROOT"/usr/ + +kmdir=/lib/modules/$(uname -r) +if test -d "$kmdir" && ! test -d "$NEWROOT/$kmdir"; then + cp -an "$kmdir" "$NEWROOT"/lib/modules/ + cp -an /lib/firmware "$NEWROOT"/lib/ +fi -- 2.23.0

2 2

[PATCH v3 lkp-tests] daemon: add mysql
by Wei Jihui 02 Mar '21

02 Mar '21

add mysql for sysbench-mysql test Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- daemon/mysql | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100755 daemon/mysql diff --git a/daemon/mysql b/daemon/mysql new file mode 100755 index 00000000..a275a812 --- /dev/null +++ b/daemon/mysql @@ -0,0 +1,92 @@ +#!/bin/sh +# - nic +# - device +# mysql_user +# mysql_host +# mysql_port +# mysql_db +# mysql_password +. $LKP_SRC/lib/common.sh + +: "${mysql_user:=root}" +: "${mysql_host:=$server}" +: "${mysql_port:=3306}" +: "${mysql_db:=sysbench_test}" +: "${mysql_password:=mysql_password}" + +prepare() +{ + systemctl stop firewalld >/dev/null 2>&1 + iptables -F >/dev/null 2>&1 + systemctl start tuned >/dev/null 2>&1 +} + +insmod_getcpu() +{ + if [ -d "/getcpu" ]; then + cd /getcpu && insmod getcpu-hi.ko + else + echo "this test will not use getcpu optimize to bind core." + fi +} + +create_basedir() +{ + mkdir -p /data + mkfs.xfs -f /dev/"$device" + mount /dev/"$device" /data + + mkdir -p /data/mysql/data /data/mysql/share /data/mysql/tmp /data/mysql/run /data/mysql/log + + useradd mysql + touch /data/mysql/log/mysql.log + chown -R mysql:mysql /data + chown -R mysql:mysql /data/mysql/log/mysql.log +} + +configure_mysql() +{ + if [ ! -f $mysqld ] || [ ! -f $mysql ] || [ ! -f $mysql_server ]; then + echo "mysql is not installed!" && exit 1 + fi + + "$mysqld" --user=mysql --basedir=/data/mysql --datadir=/data/mysql/data/ --initialize --port="$mysql_port" + sleep 10 + + "$mysql_server" start + sleep 10 + + "$mysql" -u "$mysql_user" -e "flush privileges; use mysql; alter user 'root'@'localhost' identified by '$mysql_password'; flush privileges;" + sed -i '/^skip-grant-tables/d' /etc/my.cnf + "$mysql_server" restart + sleep 10 +} + +create_database() +{ + "$mysql" -u "$mysql_user" -p"$mysql_password" -e "use mysql; update user set host ='%' where user='root'; flush privileges;" + "$mysql" -u "$mysql_user" -p"$mysql_password" -e "create database $mysql_db;" + "$mysql_server" stop + sleep 10 +} + +start_mysql() +{ + numactl -C 0-92 -i 0-3 "$mysqld" --defaults-file=/etc/my.cnf --port="$mysql_port" & + sleep 20 +} + +main() +{ + local mysql="/usr/local/mysql/bin/mysql" + local mysqld="/usr/local/mysql/bin/mysqld" + local mysql_server="/usr/local/mysql/support-files/mysql.server" + + prepare + insmod_getcpu + create_basedir + configure_mysql + create_database + start_mysql +} +main -- 2.23.0

1 0

[PATCH compass-ci 4/4] sparrow/5-build/register-account: check account info before register
by Liu Yinsi 02 Mar '21

02 Mar '21

for user locally deploy compass-ci client, if not fill config yaml $CCI_SRC/sparrow/setup.yaml, failed to register account, so check my_email, my_name. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/5-build/register-account | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sparrow/5-build/register-account b/sparrow/5-build/register-account index 1a23e07..94b7407 100755 --- a/sparrow/5-build/register-account +++ b/sparrow/5-build/register-account @@ -2,4 +2,10 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. -$CCI_SRC/sbin/build-my-info.rb +source ${CCI_SRC}/lib/log.sh + +if [ -n "$my_email" ] && [ -n "$my_name" ]; then + $CCI_SRC/sbin/build-my-info.rb -e $my_email -n $my_name +else + log_info "if you need to register account, please try: $CCI_SRC/sbin/build-my-info.rb -e \$my_email -n \$my_name" +fi -- 2.23.0

1 0

[PATCH compass-ci 3/4] sparrow/3-code/dev-env: delete redunbant code
by Liu Yinsi 02 Mar '21

02 Mar '21

0-package/read-config already copy $CCI_SRC/sparrow/setup.yaml to /etc/compass-ci/setup.yaml, so delete redunbant code. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/3-code/dev-env | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 698a4a2..df7b1ce 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -2,12 +2,7 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. -mkdir -p /etc/compass-ci -cp -a $CCI_SRC/sparrow/setup.yaml /etc/compass-ci/setup.yaml - -server_ip=$(awk '/^server_ip:\s/ {print $2; exit}' /etc/compass-ci/setup.yaml) [ -z $server_ip ] && server_ip=$(ip route get 1.2.3.4 | awk '{print $7; exit}') - server_name=$(hostname | cut -f1 -d.) : ${sched_host:=$server_ip} : ${sched_port:=3000} -- 2.23.0

1 0

[PATCH compass-ci 3/3] lib/job.cr: set job_state when submit job
by Wu Zhende 02 Mar '21

02 Mar '21

Set job_state to "submit" when submitting a job. Because each phase corresponds to a state in lifecycle. We can query all submitted jobs that have not been consumed in ES based on this status. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/job.cr | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/job.cr b/src/lib/job.cr index 63ec8fb..60e0b65 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -142,6 +142,7 @@ class Job # init job with "-1", or use the original job_content["id"] id = "-1" if "#{id}" == "" @hash["id"] = JSON::Any.new("#{id}") + self["job_state"] = "submit" check_required_keys() check_account_info() -- 2.23.0

1 0

[PATCH compass-ci 2/3] lib/mq.cr: add rabbitmq class
by Wu Zhende 02 Mar '21

02 Mar '21

Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/mq.cr | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 src/lib/mq.cr diff --git a/src/lib/mq.cr b/src/lib/mq.cr new file mode 100644 index 0000000..011d732 --- /dev/null +++ b/src/lib/mq.cr @@ -0,0 +1,39 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +require "singleton" +require "amqp-client" + +class MQClient + getter ch : AMQP::Client::Channel + MQ_HOST = ENV.has_key?("MQ_HOST") ? ENV["MQ_HOST"] : "172.17.0.1" + MQ_PORT = (ENV.has_key?("MQ_PORT") ? ENV["MQ_PORT"] : 5672).to_i32 + + def initialize(host = MQ_HOST, port = MQ_PORT) + @client = AMQP::Client.new("amqp://#{host}:#{port}") + conn = @client.connect + @ch = conn.channel.as(AMQP::Client::Channel) + end + + def self.instance + Singleton::Of(self).instance + end + + def pushlish_confirm(queue, msg) + q = @ch.queue(queue) + q.publish_confirm msg + end + + def pushlish(queue, msg) + q = @ch.queue(queue) + q.publish msg + end + + def get(queue) + q = @ch.queue(queue) + q.subscribe(no_ack: false) do |msg| + @ch.basic_ack(msg.delivery_tag) + msg.body_io.to_s + end + end +end -- 2.23.0

1 0

[PATCH compass-ci 1/3] container/scheduler: add start depend
by Wu Zhende 02 Mar '21

02 Mar '21

Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/scheduler/start-depends | 1 + 1 file changed, 1 insertion(+) diff --git a/container/scheduler/start-depends b/container/scheduler/start-depends index 4a17b46..1aced31 100755 --- a/container/scheduler/start-depends +++ b/container/scheduler/start-depends @@ -1,3 +1,4 @@ redis es taskqueue +rabbitmq -- 2.23.0

1 0

[PATCH v2 lkp-tests] lib/bootstrap.sh: change $HOSTNAME suffix
by Wang Yong 02 Mar '21

02 Mar '21

Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- lib/bootstrap.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index 76f07e6a7..52c9da32a 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -273,6 +273,9 @@ setup_hosts() { is_docker && return + suffix="sh.intel.com" + [ -n "${CCI_SRC}" ] && suffix="compass-ci.net" + # /etc/hosts may be shared when it's NFSROOT and there is no obvious # way to detect if rootfs is already RAM based. So unconditionally # symlink it to my own tmpfs copy. @@ -283,8 +286,8 @@ setup_hosts() else cp /etc/hosts $tmpfs_hosts fi - echo "127.0.0.1 $HOSTNAME.sh.intel.com $HOSTNAME" >> $tmpfs_hosts - echo "::1 $HOSTNAME.sh.intel.com $HOSTNAME" >> $tmpfs_hosts + echo "127.0.0.1 $HOSTNAME.${suffix} $HOSTNAME" >> $tmpfs_hosts + echo "::1 $HOSTNAME.${suffix} $HOSTNAME" >> $tmpfs_hosts ln -fs $tmpfs_hosts /etc/hosts } -- 2.23.0

1 0