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

[PATCH compass-ci] fix: sched: use testbox to find and submit idle jobs
by Ren Wen 14 Oct '20

14 Oct '20

Use testbox to find and submit idle jobs because of different types of physical machines have different jobs. Before: find and submit idle jobs using tbox_group queues. Now: find and submit using testbox queues. Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 2fbf05d..a61a57b 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -432,7 +432,7 @@ class Sched # when find no job at "sched/#{tbox_group}" # try to get from "sched/#{tbox_group}/idle" - return get_idle_job(tbox_group, testbox) + return get_idle_job(tbox, testbox) end private def prepare_job(queue_name, testbox) @@ -457,20 +457,21 @@ class Sched return job end - private def get_idle_job(tbox_group, testbox) - job = prepare_job("sched/#{tbox_group}/idle", testbox) + private def get_idle_job(tbox, testbox) + queue_name = "sched/#{tbox}/idle" + job = prepare_job(queue_name, testbox) # if there has no idle job, auto submit and get 1 if job.nil? - auto_submit_idle_job(tbox_group) - job = prepare_job("sched/#{tbox_group}/idle", testbox) + auto_submit_idle_job(tbox) + job = prepare_job(queue_name, testbox) end return job end - def auto_submit_idle_job(tbox_group) - full_path_patterns = "#{ENV["CCI_REPOS"]}/lab-#{ENV["lab"]}/allot/idle/#{tbox_group}/*.yaml" + def auto_submit_idle_job(tbox) + full_path_patterns = "#{ENV["CCI_REPOS"]}/lab-#{ENV["lab"]}/allot/idle/#{tbox}/*.yaml" extra_job_fields = [ "idle_job=true", "FLUENTD_SERVER_HOST=#{ENV["FLUENTD_SERVER_HOST"]}", @@ -479,7 +480,7 @@ class Sched Jobfile::Operate.auto_submit_job( full_path_patterns, - "testbox: #{tbox_group}", + "testbox: #{tbox}", extra_job_fields) if Dir.glob(full_path_patterns).size > 0 end -- 2.23.0

3 4

[PATCH lkp-tests] /lkp-tests/pkg: add PKGBUILD for test-tools
by Li Ping 14 Oct '20

14 Oct '20

Signed-off-by: Li Ping <15396232681(a)163.com> --- pkg/test-tools/PKGBUILD | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkg/test-tools/PKGBUILD diff --git a/pkg/test-tools/PKGBUILD b/pkg/test-tools/PKGBUILD new file mode 100644 index 00000000..3335a67c --- /dev/null +++ b/pkg/test-tools/PKGBUILD @@ -0,0 +1,19 @@ +pkgname=test-tools +pkgver=git +pkgrel=1 +pkgdesc="smoke test" +url="https://gitee.com/openeuler/test-tools.git" +arch=aarch64 +license=('GPL') +source=("https://gitee.com/openeuler/test-tools.git" + "https://gitee.com/openeuler/integration-test.git" +) +md5sums=('SKIP' 'SKIP') + +package() { + test_tools_path="${pkgdir}/lkp/benchmarks/${pkgname}" + mkdir -p "${test_tools_path}" + cp -af "${srcdir}/test-tools/"* "${test_tools_path}" + cp -af "${srcdir}/integration-test/testcases" "${test_tools_path}/mugen" + cp -af "${srcdir}/integration-test/suite2cases" "${test_tools_path}/mugen" +} -- 2.23.0

2 1

[PATCH v2 compass-ci 2/2] container/extract-stats add 'SRV_HTTP_HOST/PORT' in environment variables
by Lu Weitao 14 Oct '20

14 Oct '20

background: extract-stats service use mail-job tool that need get SRV_HTTP_HOST/PORT from ENV for display job result url in email Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- container/extract-stats/start | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/container/extract-stats/start b/container/extract-stats/start index 6bb9f10..e5ee777 100755 --- a/container/extract-stats/start +++ b/container/extract-stats/start @@ -4,6 +4,7 @@ # frozen_string_literal: true require 'set' +require 'open3' require_relative '../defconfig.rb' names = Set.new %w[ @@ -25,6 +26,8 @@ DEFAULT_LKP = '/c/lkp-tests' DEFAULT_CCI = '/c/compass-ci' FLUENTD_HOST = defaults['FLUENTD_HOST'] || '172.17.0.1' FLUENTD_PORT = defaults['FLUENTD_PORT'] || '24224' +SRV_HTTP_HOST = defaults['SRV_HTTP_HOST'] || Open3.capture3('curl ip.sb')[0].chomp +SRV_HTTP_PORT = defaults['SRV_HTTP_PORT'] || '11300' docker_rm "extract-stats" cmd = %w[ @@ -35,6 +38,8 @@ cmd = %w[ ] + env + %W[ -e LKP_SRC=#{DEFAULT_LKP} -e CCI_SRC=#{DEFAULT_CCI} + -e SRV_HTTP_HOST=#{SRV_HTTP_HOST} + -e SRV_HTTP_PORT=#{SRV_HTTP_PORT} -v #{ENV['LKP_SRC']}:#{DEFAULT_LKP} -v /etc/localtime:/etc/localtime:ro -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} -- 2.23.0

1 0

[PATCH v2 compass-ci 1/2] add job result url with mail-job
by Lu Weitao 14 Oct '20

14 Oct '20

sample: mail-job crystal.92144 Date: Mon, Oct 12 2020 17:30:56PM +0800 From: team(a)crystal.ci To: lwt(a)crystal.ci Subject: [Compass-ci] job: crystal.92144 result Hi, Thanks for your participation in Kunpeng and software ecosystem! Your Job: crystal.92144 had finished. Please check job result: http://172.17.0.1:11300/result/iperf/vm-hi1620-2p8g--lwt/2020-10-12/crystal… Regards Compass-ci https://gitee.com/openeuler/compass-ci Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/constants.rb | 5 ++++- lib/mail_job_result.rb | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/constants.rb b/lib/constants.rb index 3a4f083..3d1ef1d 100644 --- a/lib/constants.rb +++ b/lib/constants.rb @@ -9,4 +9,7 @@ ES_HOST = config['ES_HOST'] || '172.17.0.1' ES_PORT = config['ES_PORT'] || 9200 MAIL_HOST = config['MAIL_HOST'] || '172.17.0.1' -MAIL_PORT = config['MAIL_PORT'] || 11_311 +MAIL_PORT = config['MAIL_PORT'] || 11311 + +SRV_HTTP_HOST = config['SRV_HTTP_HOST'] || ENV['SRV_HTTP_HOST'] || '172.17.0.1' +SRV_HTTP_PORT = config['SRV_HTTP_PORT'] || ENV['SRV_HTTP_PORT'] || 11300 diff --git a/lib/mail_job_result.rb b/lib/mail_job_result.rb index 9202b81..29a9c1a 100644 --- a/lib/mail_job_result.rb +++ b/lib/mail_job_result.rb @@ -9,8 +9,10 @@ require 'json' # compose and send email for job result class MailJobResult - def initialize(job_id) + def initialize(job_id, result_host = SRV_HTTP_HOST, result_port = SRV_HTTP_PORT) @job_id = job_id + @result_host = result_host + @result_port = result_port end def send_mail @@ -25,7 +27,7 @@ class MailJobResult body = "Hi, Thanks for your participation in Kunpeng and software ecosystem! Your Job: #{@job_id} had finished. - Please check job result: \n\n#{signature}" + Please check job result: http://#{@result_host}:#{@result_port}#{@result_root}\n\n#{signature}" { 'to' => @submitter_email, 'body' => body, 'subject' => subject } end @@ -34,6 +36,7 @@ class MailJobResult exit unless job['email'] @submitter_email = job['email'] + @result_root = job['result_root'] end def query_job -- 2.23.0

1 0

[PATCH v6 compass-ci 5/6] container/mail-robot: start file
by Luan Shengde 14 Oct '20

14 Oct '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/mail-robot/start | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100755 container/mail-robot/start diff --git a/container/mail-robot/start b/container/mail-robot/start new file mode 100755 index 0000000..a2e183d --- /dev/null +++ b/container/mail-robot/start @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require_relative '../defconfig.rb' +docker_rm 'mail-robot' + +JUMPER_IP = '192.168.132.2' +JUMPER_PORT = '29999' +SEND_MAIL_PORT = '11311' + +cmd = %W[ + docker run + --restart=always + --name=mail-robot + -d + -e JUMPER_IP=#{JUMPER_IP} + -e JUMPER_PORT=#{JUMPER_PORT} + -e SEND_MAIL_PORT=#{SEND_MAIL_PORT} + -v /c/upstream-repos:/upstream-repos:ro + -v /srv/cci/Maildir:/Maildir:rw + -v /c/compass-ci:/compass-ci:ro + mail-robot +] + +cmd += ['bash', '-c', 'umask 002 && ruby ./mail-robot.rb'] + +system(*cmd) -- 2.23.0

2 3

[PATCH v2 compass-ci 5/5] container/send-internet-mail: start file
by Luan Shengde 14 Oct '20

14 Oct '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-internet-mail/start | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100755 container/send-internet-mail/start diff --git a/container/send-internet-mail/start b/container/send-internet-mail/start new file mode 100755 index 0000000..ef9b987 --- /dev/null +++ b/container/send-internet-mail/start @@ -0,0 +1,54 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +. /c/compass-ci/container/defconfig.sh +docker_rm send-internet-mail + +cmd=( + docker run + --restart=always + --name=send-internet-mail + -d + -p 11312:11312 + -v /etc/localtime:/etc/localtime:ro + send-internet-mail +) + +"${cmd[@]}" + +cat<<EOF +port: 11312 +--- + +No need to specify the sender + +data='{ +"subject": "email subject", +"to": "email_to_addr", +"body": "email message" +}' + +or + +data=" +subject: email subject +to: email_to_addr +body: email message" + +command: + curl -XPOST 'service_server_ip:service_port/send_mail_yaml' -d "\$data" + +--- +data=" +To: email_to_addr +Subject: email_subject + +mail_msg_line1 +mail_msg_line2 +... +" + +command: + curl -XPOST 'service_server_ip:service_port/send_mail_text' -d "\$data" +EOF -- 2.23.0

2 2

[PATCH v2 compass-ci] git_mirror: fix git-remote-http <defunct>
by Li Yuanchao 14 Oct '20

14 Oct '20

when use system() or %x() call shell command git, there would be a new child process to do git command. And it seems the child process doesn't clear everytime when it's finished. It needs to be waited by parent process. But it often comes out 'no child' error when wait in main thread, so I trap SIGCHLD to SIG_IGN, and the init process will handle it. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 88a94ac..4ab5e32 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -45,8 +45,8 @@ class GitMirror def git_fetch(mirror_dir) fetch_info = %x(git -C #{mirror_dir} fetch 2>&1) - # Check whether mirror_dir is a good git repository by 3 conditions. If not, delete it. - if ($CHILD_STATUS.exitstatus == ERR_CODE) && fetch_info.include?(ERR_MESSAGE) && Dir.empty?(mirror_dir) + # Check whether mirror_dir is a good git repository by 2 conditions. If not, delete it. + if fetch_info.include?(ERR_MESSAGE) && Dir.empty?(mirror_dir) FileUtils.rmdir(mirror_dir) end return fetch_info.include? '->' @@ -89,6 +89,7 @@ class MirrorMain connection.start channel = connection.create_channel @message_queue = channel.queue('new_refs') + Signal.trap(:SIGCHLD, 'SIG_IGN') end def fork_stat_init(stat_key) -- 2.23.0

1 0

[PATCH compass-ci] add two field to config local repository
by Xiao Shenwei 14 Oct '20

14 Oct '20

DOCKER_REGISTRY_HOST, DOCKER_REGISTRY_HOST these field are our local repository address it's used by $CCI_SRC/sbin/docker-pull Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- sparrow/3-code/dev-env | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 80ee2cf..11c7fb0 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -10,6 +10,8 @@ server_ip=$(ip route get 1.2.3.4 | awk '{print $7; exit}') : ${gitcache_port:=5000} : ${FLUENTD_SERVER_HOST:=$server_ip} : ${FLUENTD_SERVER_PORT:=24224} +: ${DOCKER_REGISTRY_HOST:=$server_ip} +: ${DOCKER_REGISTRY_PORT:=5001} mkdir -p /etc/compass-ci/defaults cat > /etc/compass-ci/defaults/$server_name.yaml <<EOF @@ -22,6 +24,8 @@ GITCACHE_HOST: $gitcache_host GITCACHE_PORT: $gitcache_port FLUENTD_SERVER_HOST: $FLUENTD_SERVER_HOST FLUENTD_SERVER_PORT: $FLUENTD_SERVER_PORT +DOCKER_REGISTRY_HOST: $DOCKER_REGISTRY_HOST +DOCKER_REGISTRY_PORT: $DOCKER_REGISTRY_PORT EOF cat > /etc/profile.d/compass.sh <<'EOF' -- 2.23.0

1 0

[PATCH compass-ci 2/3] sparrow: process will exit if firewalld.service was not installed
by Hu Xuejiao 14 Oct '20

14 Oct '20

When firewalld is inactive, return code of 'systemctl status firewalld' will be 3, and install-tiny has set -e, so this will cause this process exit. Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/2-network/iptables | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/sparrow/2-network/iptables b/sparrow/2-network/iptables index 092c4ca..772eb6f 100755 --- a/sparrow/2-network/iptables +++ b/sparrow/2-network/iptables @@ -12,15 +12,23 @@ iptables -I FORWARD 1 -j ACCEPT iptables -t nat -A POSTROUTING -o "$PUB_IFACE" -s $BR0_SUBNET -j MASQUERADE iptables -t nat -A POSTROUTING -o $BR0_IFACE -d $BR0_SUBNET -j MASQUERADE -systemctl status firewalld | grep -q "running" && { +command -v firewall-cmd > /dev/null || { + echo "firewalld.service could not be found" + exit 0 +} + +systemctl start firewalld +[ "$(systemctl is-active firewalld)" == "active" ] || { + echo "start firewalld.service failed" + exit 0 +} - DOCKER0_IFACE=docker0 - DOCKER0_SUBNET=172.17.0.0/16 - iptables -t nat -A POSTROUTING -o $PUB_IFACE -s $DOCKER0_SUBNET -j MASQUERADE - iptables -t nat -A POSTROUTING -o $DOCKER0_IFACE -d $DOCKER0_SUBNET -j MASQUERADE +DOCKER0_SUBNET=172.17.0.0/16 - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$DOCKER0_SUBNET accept" - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$BR0_SUBNET accept" - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=0.0.0.0/32 accept" -} +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source +address=$DOCKER0_SUBNET accept" +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source +address=$BR0_SUBNET accept" +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source +address=0.0.0.0/32 accept" -- 2.23.0

2 1

[PATCH lab-z9] fix(allot): idle job should be directly assigned to the testbox level
by Yu Chuan 14 Oct '20

14 Oct '20

Assign 36 physical machines for multi-qemu job, a total of 864 virtual machines. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- allot/idle/taishan200-2280-2s48p-256g--a11 | 1 + allot/idle/taishan200-2280-2s48p-256g--a12 | 1 + allot/idle/taishan200-2280-2s48p-256g--a13 | 1 + allot/idle/taishan200-2280-2s48p-256g--a14 | 1 + allot/idle/taishan200-2280-2s48p-256g--a15 | 1 + allot/idle/taishan200-2280-2s48p-256g--a16 | 1 + allot/idle/taishan200-2280-2s48p-256g--a17 | 1 + allot/idle/taishan200-2280-2s48p-256g--a18 | 1 + allot/idle/taishan200-2280-2s48p-256g--a19 | 1 + allot/idle/taishan200-2280-2s48p-256g--a20 | 1 + allot/idle/taishan200-2280-2s48p-256g--a21 | 1 + allot/idle/taishan200-2280-2s48p-256g--a22 | 1 + allot/idle/taishan200-2280-2s48p-256g--a24 | 1 + allot/idle/taishan200-2280-2s48p-256g--a25 | 1 + allot/idle/taishan200-2280-2s48p-256g--a26 | 1 + allot/idle/taishan200-2280-2s48p-256g--a27 | 1 + allot/idle/taishan200-2280-2s48p-256g--a28 | 1 + allot/idle/taishan200-2280-2s48p-256g--a29 | 1 + allot/idle/taishan200-2280-2s48p-256g--a30 | 1 + allot/idle/taishan200-2280-2s48p-256g--a31 | 1 + allot/idle/taishan200-2280-2s48p-256g--a32 | 1 + allot/idle/taishan200-2280-2s48p-256g--a33 | 1 + allot/idle/taishan200-2280-2s48p-256g--a34 | 1 + allot/idle/taishan200-2280-2s48p-256g--a35 | 1 + .../multi-qemu.yaml | 0 allot/idle/taishan200-2280-2s48p-256g--a61 | 1 + allot/idle/taishan200-2280-2s48p-256g--a62 | 1 + allot/idle/taishan200-2280-2s48p-256g--a63 | 1 + allot/idle/taishan200-2280-2s48p-256g--a64 | 1 + allot/idle/taishan200-2280-2s48p-256g--a65 | 1 + allot/idle/taishan200-2280-2s48p-256g--a66 | 1 + allot/idle/taishan200-2280-2s48p-256g--a67 | 1 + allot/idle/taishan200-2280-2s48p-256g--a68 | 1 + allot/idle/taishan200-2280-2s48p-256g--a69 | 1 + allot/idle/taishan200-2280-2s48p-256g--a70 | 1 + allot/idle/taishan200-2280-2s48p-256g--a71 | 1 + .../taishan200-2280-2s64p-256g/multi-qemu.yaml | 18 ------------------ 37 files changed, 35 insertions(+), 18 deletions(-) create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a11 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a12 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a13 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a14 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a15 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a16 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a17 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a18 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a19 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a20 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a21 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a22 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a24 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a25 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a26 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a27 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a28 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a29 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a30 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a31 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a32 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a33 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a34 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a35 rename allot/idle/{taishan200-2280-2s48p-256g => taishan200-2280-2s48p-256g--a60}/multi-qemu.yaml (100%) create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a61 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a62 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a63 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a64 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a65 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a66 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a67 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a68 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a69 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a70 create mode 120000 allot/idle/taishan200-2280-2s48p-256g--a71 delete mode 100644 allot/idle/taishan200-2280-2s64p-256g/multi-qemu.yaml diff --git a/allot/idle/taishan200-2280-2s48p-256g--a11 b/allot/idle/taishan200-2280-2s48p-256g--a11 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a11 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a12 b/allot/idle/taishan200-2280-2s48p-256g--a12 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a12 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a13 b/allot/idle/taishan200-2280-2s48p-256g--a13 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a13 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a14 b/allot/idle/taishan200-2280-2s48p-256g--a14 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a14 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a15 b/allot/idle/taishan200-2280-2s48p-256g--a15 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a15 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a16 b/allot/idle/taishan200-2280-2s48p-256g--a16 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a16 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a17 b/allot/idle/taishan200-2280-2s48p-256g--a17 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a17 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a18 b/allot/idle/taishan200-2280-2s48p-256g--a18 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a18 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a19 b/allot/idle/taishan200-2280-2s48p-256g--a19 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a19 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a20 b/allot/idle/taishan200-2280-2s48p-256g--a20 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a20 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a21 b/allot/idle/taishan200-2280-2s48p-256g--a21 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a21 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a22 b/allot/idle/taishan200-2280-2s48p-256g--a22 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a22 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a24 b/allot/idle/taishan200-2280-2s48p-256g--a24 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a24 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a25 b/allot/idle/taishan200-2280-2s48p-256g--a25 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a25 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a26 b/allot/idle/taishan200-2280-2s48p-256g--a26 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a26 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a27 b/allot/idle/taishan200-2280-2s48p-256g--a27 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a27 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a28 b/allot/idle/taishan200-2280-2s48p-256g--a28 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a28 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a29 b/allot/idle/taishan200-2280-2s48p-256g--a29 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a29 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a30 b/allot/idle/taishan200-2280-2s48p-256g--a30 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a30 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a31 b/allot/idle/taishan200-2280-2s48p-256g--a31 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a31 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a32 b/allot/idle/taishan200-2280-2s48p-256g--a32 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a32 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a33 b/allot/idle/taishan200-2280-2s48p-256g--a33 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a33 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a34 b/allot/idle/taishan200-2280-2s48p-256g--a34 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a34 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a35 b/allot/idle/taishan200-2280-2s48p-256g--a35 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a35 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g/multi-qemu.yaml b/allot/idle/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml similarity index 100% rename from allot/idle/taishan200-2280-2s48p-256g/multi-qemu.yaml rename to allot/idle/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml diff --git a/allot/idle/taishan200-2280-2s48p-256g--a61 b/allot/idle/taishan200-2280-2s48p-256g--a61 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a61 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a62 b/allot/idle/taishan200-2280-2s48p-256g--a62 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a62 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a63 b/allot/idle/taishan200-2280-2s48p-256g--a63 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a63 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a64 b/allot/idle/taishan200-2280-2s48p-256g--a64 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a64 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a65 b/allot/idle/taishan200-2280-2s48p-256g--a65 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a65 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a66 b/allot/idle/taishan200-2280-2s48p-256g--a66 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a66 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a67 b/allot/idle/taishan200-2280-2s48p-256g--a67 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a67 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a68 b/allot/idle/taishan200-2280-2s48p-256g--a68 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a68 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a69 b/allot/idle/taishan200-2280-2s48p-256g--a69 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a69 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a70 b/allot/idle/taishan200-2280-2s48p-256g--a70 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a70 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s48p-256g--a71 b/allot/idle/taishan200-2280-2s48p-256g--a71 new file mode 120000 index 000000000000..479a75ab5069 --- /dev/null +++ b/allot/idle/taishan200-2280-2s48p-256g--a71 @@ -0,0 +1 @@ +taishan200-2280-2s48p-256g--a60 \ No newline at end of file diff --git a/allot/idle/taishan200-2280-2s64p-256g/multi-qemu.yaml b/allot/idle/taishan200-2280-2s64p-256g/multi-qemu.yaml deleted file mode 100644 index 4525fcd49735..000000000000 --- a/allot/idle/taishan200-2280-2s64p-256g/multi-qemu.yaml +++ /dev/null @@ -1,18 +0,0 @@ -suite: multi-qemu -category: functional - -os: openeuler -os_version: 20.03 -os_arch: aarch64 -os_mount: initramfs -simplify-ci: -multi-qemu-0: - nr_vm: 20 - tbox_group: vm-hi1620-2p8g -multi-qemu-1: - nr_vm: 2 - tbox_group: vm-hi1620-2p4g -multi-qemu-2: - nr_vm: 2 - tbox_group: vm-hi1620-1p1g -sleep: 100d -- 2.23.0

4 8

[PATCH lkp-tests] pkg: Changing the iozone-package version
by Hu Xuejiao 14 Oct '20

14 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- pkg/iozone/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/iozone/PKGBUILD b/pkg/iozone/PKGBUILD index 43412913..1bc09ba4 100644 --- a/pkg/iozone/PKGBUILD +++ b/pkg/iozone/PKGBUILD @@ -1,6 +1,6 @@ pkgname=iozone pkgver=3 -pkgrel=479 +pkgrel=430 pkgdesc="A filesystem benchmark tool" arch=('i386' 'x86_64') url="http://www.iozone.org/" -- 2.23.0

2 1

[PATCH compass-ci] use local tool to pull images
by Xiao Shenwei 14 Oct '20

14 Oct '20

$CCI_SRC/sbin/docker-pull docker-pull will download images from local repository, if failed, will request docker hub Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/docker/docker.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/docker/docker.rb b/providers/docker/docker.rb index c75fc2c..b454f68 100755 --- a/providers/docker/docker.rb +++ b/providers/docker/docker.rb @@ -69,7 +69,7 @@ end def run(hostname, load_path, hash) docker_image = hash['docker_image'] - system "docker pull #{docker_image}" + system "docker-pull #{docker_image}" system( { 'hostname' => hostname, 'docker_image' => docker_image, 'load_path' => load_path }, ENV['CCI_SRC'] + '/providers/docker/run.sh' -- 2.23.0

1 0

[PATCH compass-ci 3/3] sparrow: sparrow: open the masquerade at public zone
by Hu Xuejiao 14 Oct '20

14 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/2-network/iptables | 1 + 1 file changed, 1 insertion(+) diff --git a/sparrow/2-network/iptables b/sparrow/2-network/iptables index 772eb6f..46f2299 100755 --- a/sparrow/2-network/iptables +++ b/sparrow/2-network/iptables @@ -32,3 +32,4 @@ firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$BR0_SUBNET accept" firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=0.0.0.0/32 accept" +firewall-cmd --zone=public --add-masquerade -- 2.23.0

1 0

[PATCH compass-ci 1/3] sparrow: systemctl restart docker
by Hu Xuejiao 14 Oct '20

14 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/3-code/os/debian | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sparrow/3-code/os/debian b/sparrow/3-code/os/debian index 171b979..efb4fcb 100644 --- a/sparrow/3-code/os/debian +++ b/sparrow/3-code/os/debian @@ -2,3 +2,5 @@ cat >> /etc/default/docker <<EOF DOCKER_OPTS="--dns 114.114.114.114" EOF + +systemctl restart docker -- 2.23.0

1 0

[PATCH compass-ci] fix: Error: unexpected token: or in job.cr
by Cao Xueliang 14 Oct '20

14 Oct '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/lib/job.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 6abab9a..32aa662 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -324,7 +324,7 @@ class Job if "#{os_mount}" == "initramfs" temp_initrds.concat(initramfs_initrds()) - elsif "#{os_mount}" == "nfs" or "#{os_mount}" == "cifs" + elsif "#{os_mount}" == "nfs" || "#{os_mount}" == "cifs" temp_initrds.concat(nfs_cifs_initrds()) end -- 2.23.0

1 0

[PATCH compass-ci] remove from hi1620 from vm-hi1620 and vm-pxe-hi1620
by Bai Jing 14 Oct '20

14 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- doc/tutorial.md | 2 +- providers/multi-qemu | 2 +- providers/my-qemu.sh | 2 +- providers/qemu.sh | 2 +- sbin/auto_submit.yaml | 8 ++++---- sparrow/6-test/qemu | 4 ++-- src/spec/scheduler/tools_spec.cr | 6 +++--- user-client/helper/iperf.yaml | 2 +- user-client/helper/redis_op/redis_op_zrange | 4 ++-- user-client/helper/redis_op/redis_op_zremrangebyrank | 2 +- user-client/helper/redis_op_gc/consistency.rb | 2 +- user-client/helper/redis_op_gc/taskqueue_snap.rb | 8 ++++---- user-client/jobs/iperf-pxe.yaml | 4 ++-- user-client/jobs/iperf-vm.yaml | 2 +- user-client/maintain/walk-os-test/iperf-walk-os.yaml | 2 +- user-client/maintain/walk-os-test/my-qemu.sh | 2 +- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/doc/tutorial.md b/doc/tutorial.md index 85c9834..03f1342 100644 --- a/doc/tutorial.md +++ b/doc/tutorial.md @@ -101,7 +101,7 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM SUT/schduler/部署等资源相关变量。 ```yaml - testbox: vm-hi1620-2p8g + testbox: vm-2p8g os: openeuler os_version: 20.03 os_arch: aarch64 diff --git a/providers/multi-qemu b/providers/multi-qemu index 72453fb..23e0451 100755 --- a/providers/multi-qemu +++ b/providers/multi-qemu @@ -8,7 +8,7 @@ require 'fileutils' PWD = Dir.pwd # Run multiple QEMU in parallel -HOSTNAME = ARGV[0] || "vm-hi1620-2p8g--#{ENV['USER']}" +HOSTNAME = ARGV[0] || "vm-2p8g--#{ENV['USER']}" NR_VM = ARGV[1] || 1 def run(seqno) diff --git a/providers/my-qemu.sh b/providers/my-qemu.sh index 2f20f67..954d3a0 100755 --- a/providers/my-qemu.sh +++ b/providers/my-qemu.sh @@ -3,7 +3,7 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. [[ $tbox_group ]] || -tbox_group=vm-hi1620-2p8g +tbox_group=vm-2p8g export hostname=$tbox_group--$USER-$$ $CCI_SRC/providers/qemu.sh diff --git a/providers/qemu.sh b/providers/qemu.sh index 786a7aa..d97fd85 100755 --- a/providers/qemu.sh +++ b/providers/qemu.sh @@ -8,7 +8,7 @@ load_cci_defaults -: ${hostname:="vm-hi1620-1p1g-1"} +: ${hostname:="vm-1p1g-1"} # unicast prefix: x2, x6, xA, xE export mac=$(echo $hostname | md5sum | sed 's/^$..$$..$$..$$..$$..$.*$/0a-\1-\2-\3-\4-\5/') echo hostname: $hostname diff --git a/sbin/auto_submit.yaml b/sbin/auto_submit.yaml index 7076cca..1096014 100644 --- a/sbin/auto_submit.yaml +++ b/sbin/auto_submit.yaml @@ -1,7 +1,7 @@ AvxToNeon/AvxToNeon: -- testbox=vm-hi1620-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml +- testbox=vm-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml compass-ci/compass-ci: -- testbox=vm-hi1620-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml -- testbox=vm-hi1620-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml archlinux: -- testbox=vm-hi1620-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml +- testbox=vm-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml diff --git a/sparrow/6-test/qemu b/sparrow/6-test/qemu index 1e92a47..107204f 100755 --- a/sparrow/6-test/qemu +++ b/sparrow/6-test/qemu @@ -12,5 +12,5 @@ run_job() } dmidecode -s system-product-name | grep -iq "virtual" && exit -run_job vm-hi1620-2p8g -run_job vm-pxe-hi1620-2p8g +run_job vm-2p8g +run_job vm-pxe-2p8g diff --git a/src/spec/scheduler/tools_spec.cr b/src/spec/scheduler/tools_spec.cr index 0a71af0..780fce3 100644 --- a/src/spec/scheduler/tools_spec.cr +++ b/src/spec/scheduler/tools_spec.cr @@ -58,9 +58,9 @@ describe Public do result.should eq testgroup_name end - it "instance: vm-pxe-hi1620-1p1g-chief-1338976" do - testbox = "vm-pxe-hi1620-1p1g-chief-1338976" - tbox_group = "vm-pxe-hi1620-1p1g-chief" + it "instance: vm-pxe-1p1g--chief-1338976" do + testbox = "vm-pxe-1p1g--chief-1338976" + tbox_group = "vm-pxe-1p1g--chief" result = Public.get_tbox_group_name(testbox) result.should eq tbox_group diff --git a/user-client/helper/iperf.yaml b/user-client/helper/iperf.yaml index 06980c3..1509470 100644 --- a/user-client/helper/iperf.yaml +++ b/user-client/helper/iperf.yaml @@ -12,7 +12,7 @@ if role client: iperf: protocol: tcp job_origin: jobs/iperf.yaml -testbox: vm-pxe-hi1620-1p1g-1 +testbox: vm-pxe-1p1g-1 arch: x86_64 node_roles: server client diff --git a/user-client/helper/redis_op/redis_op_zrange b/user-client/helper/redis_op/redis_op_zrange index ce4d6e7..3b1c074 100755 --- a/user-client/helper/redis_op/redis_op_zrange +++ b/user-client/helper/redis_op/redis_op_zrange @@ -4,14 +4,14 @@ if [ $# -gt 1 ]; then echo "USAGE: $0 # find all your job" - echo "e.g.: $0 queues/sched/vm-hi1620-2p8g/in_process # find jobs in queue" + echo "e.g.: $0 queues/sched/vm-2p8g/in_process # find jobs in queue" exit 1 fi if [[ $1 ]]; then key_name=$1 else - [[ $tbox_group ]] || tbox_group=vm-hi1620-2p8g + [[ $tbox_group ]] || tbox_group=vm-2p8g key_name=queues/sched/$tbox_group-$USER/ready fi diff --git a/user-client/helper/redis_op/redis_op_zremrangebyrank b/user-client/helper/redis_op/redis_op_zremrangebyrank index 6b6365b..5a2d03f 100755 --- a/user-client/helper/redis_op/redis_op_zremrangebyrank +++ b/user-client/helper/redis_op/redis_op_zremrangebyrank @@ -4,7 +4,7 @@ if [ $# != 3 ]; then echo "USAGE: $0 key min max" - echo "e.g.: $0 queues/sched/vm-hi1620-2p8g/in_process 10 20" + echo "e.g.: $0 queues/sched/vm-2p8g/in_process 10 20" exit 1 fi diff --git a/user-client/helper/redis_op_gc/consistency.rb b/user-client/helper/redis_op_gc/consistency.rb index f81c68f..29dd401 100755 --- a/user-client/helper/redis_op_gc/consistency.rb +++ b/user-client/helper/redis_op_gc/consistency.rb @@ -35,7 +35,7 @@ puts "options: #{options.inspect}" # it records all "task id" and task's current redis key value # like: # 25536 -# {"add_time":1596876735.944146, "queue":"sched/vm-hi1620-2p8g--$USER/ready"} +# {"add_time":1596876735.944146, "queue":"sched/vm-2p8g--$USER/ready"} cmd = "#{CMD_BASE} queues/id2content , hgetall" result = `#{cmd}`.chomp results = result.split("\n") diff --git a/user-client/helper/redis_op_gc/taskqueue_snap.rb b/user-client/helper/redis_op_gc/taskqueue_snap.rb index f0a7034..b32af8d 100755 --- a/user-client/helper/redis_op_gc/taskqueue_snap.rb +++ b/user-client/helper/redis_op_gc/taskqueue_snap.rb @@ -12,10 +12,10 @@ if !ARGV.empty? puts "input: #{__FILE__}" puts 'output: taskqueue_snap_yyyymmdd.md' puts ' # id, first add time, current queue' - puts ' # 14703, 2020-07-22 14:33, sched/vm-hi1620-2p8g-xxx/in_process' - puts ' # 14831, 2020-07-22 17:51, sched/vm-hi1620-2p8g-xxx/in_process' - puts ' # crystal.89630, 2020-09-23 11:19, sched/vm-hi1620-2p8g/in_process' - puts ' # crystal.89667, 2020-09-23 11:20, sched/vm-hi1620-2p8g/in_process' + puts ' # 14703, 2020-07-22 14:33, sched/vm-2p8g--xxx/in_process' + puts ' # 14831, 2020-07-22 17:51, sched/vm-2p8g--xxx/in_process' + puts ' # crystal.89630, 2020-09-23 11:19, sched/vm-2p8g/in_process' + puts ' # crystal.89667, 2020-09-23 11:20, sched/vm-2p8g/in_process' exit end diff --git a/user-client/jobs/iperf-pxe.yaml b/user-client/jobs/iperf-pxe.yaml index ccf5c9d..209c5d6 100644 --- a/user-client/jobs/iperf-pxe.yaml +++ b/user-client/jobs/iperf-pxe.yaml @@ -16,7 +16,7 @@ if role client: iperf: protocol: tcp job_origin: jobs/iperf.yaml -testbox: vm-pxe-hi1620-2p8g-1 +testbox: vm-pxe-2p8g-1 arch: x86_64 node_roles: server client @@ -35,7 +35,7 @@ if role client: iperf: protocol: tcp job_origin: jobs/iperf.yaml -testbox: vm-pxe-hi1620-2p8g-1 +testbox: vm-pxe-2p8g-1 arch: x86_64 node_roles: server client diff --git a/user-client/jobs/iperf-vm.yaml b/user-client/jobs/iperf-vm.yaml index 31c5a3a..434b964 100644 --- a/user-client/jobs/iperf-vm.yaml +++ b/user-client/jobs/iperf-vm.yaml @@ -16,7 +16,7 @@ if role client: iperf: protocol: tcp job_origin: jobs/iperf.yaml -testbox: vm-hi1620-2p8g-1 +testbox: vm-2p8g-1 arch: x86_64 node_roles: server client diff --git a/user-client/maintain/walk-os-test/iperf-walk-os.yaml b/user-client/maintain/walk-os-test/iperf-walk-os.yaml index 2991743..647220c 100644 --- a/user-client/maintain/walk-os-test/iperf-walk-os.yaml +++ b/user-client/maintain/walk-os-test/iperf-walk-os.yaml @@ -7,7 +7,7 @@ if role server: if role client: iperf: protocol: tcp -testbox: vm-hi1620-2p8g--USER +testbox: vm-2p8g--USER os: OS os_arch: OS_ARCH os_version: OS_VER diff --git a/user-client/maintain/walk-os-test/my-qemu.sh b/user-client/maintain/walk-os-test/my-qemu.sh index 2f20f67..954d3a0 100755 --- a/user-client/maintain/walk-os-test/my-qemu.sh +++ b/user-client/maintain/walk-os-test/my-qemu.sh @@ -3,7 +3,7 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. [[ $tbox_group ]] || -tbox_group=vm-hi1620-2p8g +tbox_group=vm-2p8g export hostname=$tbox_group--$USER-$$ $CCI_SRC/providers/qemu.sh -- 2.23.0

1 0

[PATCH compass-ci] sparrow: systemctl restart docker
by Hu Xuejiao 14 Oct '20

14 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/3-code/os/debian | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sparrow/3-code/os/debian b/sparrow/3-code/os/debian index 171b979..efb4fcb 100644 --- a/sparrow/3-code/os/debian +++ b/sparrow/3-code/os/debian @@ -2,3 +2,5 @@ cat >> /etc/default/docker <<EOF DOCKER_OPTS="--dns 114.114.114.114" EOF + +systemctl restart docker -- 2.23.0

1 0

[PATCH lkp-tests] depends: add git in deploy-cci(dependency)
by Hu Xuejiao 14 Oct '20

14 Oct '20

Testcase(deploy-cci): git clone https://gitee.com/**/compass-ci.git, but when os_mount=initramfs, the git package is missing. Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- distro/depends/deploy-cci | 1 + 1 file changed, 1 insertion(+) create mode 100644 distro/depends/deploy-cci diff --git a/distro/depends/deploy-cci b/distro/depends/deploy-cci new file mode 100644 index 00000000..5664e303 --- /dev/null +++ b/distro/depends/deploy-cci @@ -0,0 +1 @@ +git -- 2.23.0

1 0

Re: [PATCH compass-ci 1/2] add job result url with mail-job
by Lu Weitao 14 Oct '20

14 Oct '20

On Tue, Oct 13, 2020 at 06:12:50PM +0800, Lu Kaiyi wrote: >On Tue, Oct 13, 2020 at 05:36:00PM +0800, Lu Weitao wrote: >>sample: mail-job crystal.92144 >>Date: Mon, Oct 12 2020 17:30:56PM +0800 >>From: team(a)crystal.ci >>To: lwt(a)crystal.ci >>Subject: [Compass-ci] job: crystal.92144 result >> >>Hi, >> Thanks for your participation in Kunpeng and software ecosystem! >> Your Job: crystal.92144 had finished. > ^ > maybe remove ":" will better for a complete sentence. 去掉也可以的，但是加上更好。这个场景就像：联系人： xxx 联系电话：xxx-xxxxxxxx 显然，加上：效果好一些(冒号在中英文的作用基本是一样的) Thanks, Weitao > Thanks, > Kaiyi >> Please check job result: http://172.17.0.1:11300/result/iperf/vm-hi1620-2p8g--lwt/2020-10-12/crystal… >> >>Regards

1 0

[PATCH compass-ci 1/2] add job result url with mail-job
by Lu Weitao 14 Oct '20

14 Oct '20

sample: mail-job crystal.92144 Date: Mon, Oct 12 2020 17:30:56PM +0800 From: team(a)crystal.ci To: lwt(a)crystal.ci Subject: [Compass-ci] job: crystal.92144 result Hi, Thanks for your participation in Kunpeng and software ecosystem! Your Job: crystal.92144 had finished. Please check job result: http://172.17.0.1:11300/result/iperf/vm-hi1620-2p8g--lwt/2020-10-12/crystal… Regards Compass-ci https://gitee.com/openeuler/compass-ci Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/constants.rb | 3 +++ lib/mail_job_result.rb | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/constants.rb b/lib/constants.rb index 3a4f083..5c42466 100644 --- a/lib/constants.rb +++ b/lib/constants.rb @@ -10,3 +10,6 @@ ES_PORT = config['ES_PORT'] || 9200 MAIL_HOST = config['MAIL_HOST'] || '172.17.0.1' MAIL_PORT = config['MAIL_PORT'] || 11_311 + +SRV_HTTP_HOST = config['SRV_HTTP_HOST'] || ENV['SRV_HTTP_HOST'] || '172.17.0.1' +SRV_HTTP_PORT = config['SRV_HTTP_PORT'] || ENV['SRV_HTTP_PORT'] || 11_300 diff --git a/lib/mail_job_result.rb b/lib/mail_job_result.rb index 9202b81..29a9c1a 100644 --- a/lib/mail_job_result.rb +++ b/lib/mail_job_result.rb @@ -9,8 +9,10 @@ require 'json' # compose and send email for job result class MailJobResult - def initialize(job_id) + def initialize(job_id, result_host = SRV_HTTP_HOST, result_port = SRV_HTTP_PORT) @job_id = job_id + @result_host = result_host + @result_port = result_port end def send_mail @@ -25,7 +27,7 @@ class MailJobResult body = "Hi, Thanks for your participation in Kunpeng and software ecosystem! Your Job: #{@job_id} had finished. - Please check job result: \n\n#{signature}" + Please check job result: http://#{@result_host}:#{@result_port}#{@result_root}\n\n#{signature}" { 'to' => @submitter_email, 'body' => body, 'subject' => subject } end @@ -34,6 +36,7 @@ class MailJobResult exit unless job['email'] @submitter_email = job['email'] + @result_root = job['result_root'] end def query_job -- 2.23.0

3 4

[PATCH lkp-tests] lib/job.rb: check pp key
by Wei Jihui 13 Oct '20

13 Oct '20

next when check key is nil, donot add it to pp Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/job.rb b/lib/job.rb index 3c555e13..c3966546 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -568,7 +568,9 @@ class Job init_program_options() for_each_in(@job, @referenced_programs.keys) do |_pk, h, p_n, p_args| k = hash_key_re_string(@job, p_n, @job['pp'].keys) - if k && !(a)job[k].is_a?(Hash) + next if k.nil? + + unless @job[k].is_a?(Hash) @job['pp'][k] = @job[k] next end -- 2.23.0

1 0

[PATCH lkp-tests] /lkp-tests/test: add test-tools
by Li Ping 13 Oct '20

13 Oct '20

Signed-off-by: Li Ping <15396232681(a)163.com> --- tests/test-tools | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 tests/test-tools diff --git a/tests/test-tools b/tests/test-tools new file mode 100755 index 00000000..9ca5d228 --- /dev/null +++ b/tests/test-tools @@ -0,0 +1,37 @@ +#!/bin/bash +# - testsuite +# - testcase +# - all + +cd $BENCHMARK_ROOT/test-tools/mugen || exit + +set_for_env() +{ + bash runoet.sh -c + source ~/.bash_profile +} + +test_one_case() +{ + + bash runoet.sh -f $testsuite -r $testcase -x +} + +test_all_cases() +{ + bash runoet.sh -a +} + +run_test() +{ + set_for_env + [ -n "$all" ] && { + test_all_cases + return + } + [ -n "$testsuite" ] || testsuite=smoke-testing + [ -n "$testcase" ] || testcase=oe_test_dd_001 + test_one_case +} + +run_test -- 2.23.0

4 4

[PATCH lkp-tests] add PKGBUILD for test-tools
by Li Ping 13 Oct '20

13 Oct '20

Signed-off-by: Li Ping <15396232681(a)163.com> --- pkg/test-tools/PKGBUILD | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkg/test-tools/PKGBUILD diff --git a/pkg/test-tools/PKGBUILD b/pkg/test-tools/PKGBUILD new file mode 100644 index 00000000..6908c193 --- /dev/null +++ b/pkg/test-tools/PKGBUILD @@ -0,0 +1,19 @@ +pkgname=test-tools +pkgver=git +pkgrel=1 +pkgdesc="smoke test" +url="https://gitee.com/openeuler/test-tools.git" +arch=aarch64 +license=('GPL') +source=("https://gitee.com/openeuler/test-tools.git" + "https://gitee.com/openeuler/integration-test.git" +) +md5sums=('SKIP' 'SKIP') + +package() { + test_tools_path="${pkgdir}/lkp/benchmarks/${pkgname}" + mkdir -p "${test_tools_path}" + cp -af "${srcdir}/test-tools/"* "${test_tools_path}" + cp -af "${srcdir}/integration-test/testcases"* "${test_tools_path}/mugen" + cp -af "${srcdir}/integration-test/suite2cases"* "${test_tools_path}/mugen" +} -- 2.23.0

2 1

[PATCH compass-ci] user-client/maintain: use tbox to test os rootfs
by Liu Yinsi 13 Oct '20

13 Oct '20

1. vm-hi1620-2p8g--USER -> vm-2p8g--taishan200-2280-2s48p-256g--a71 2. test in tbox, so remove my-qemu.sh 3. get job run time by es-find Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- .../maintain/walk-os-test/iperf-walk-os.yaml | 2 +- .../maintain/walk-os-test/walk-os-iperf-test | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/user-client/maintain/walk-os-test/iperf-walk-os.yaml b/user-client/maintain/walk-os-test/iperf-walk-os.yaml index 2991743..b215730 100644 --- a/user-client/maintain/walk-os-test/iperf-walk-os.yaml +++ b/user-client/maintain/walk-os-test/iperf-walk-os.yaml @@ -7,7 +7,7 @@ if role server: if role client: iperf: protocol: tcp -testbox: vm-hi1620-2p8g--USER +testbox: vm-2p8g--taishan200-2280-2s48p-256g--a71 os: OS os_arch: OS_ARCH os_version: OS_VER diff --git a/user-client/maintain/walk-os-test/walk-os-iperf-test b/user-client/maintain/walk-os-test/walk-os-iperf-test index 21e1428..9c2b612 100755 --- a/user-client/maintain/walk-os-test/walk-os-iperf-test +++ b/user-client/maintain/walk-os-test/walk-os-iperf-test @@ -43,12 +43,23 @@ create_test_yaml() { echo "$hwarch $os/$os_arch/$os_ver" } +get_job_state() { + job_state='' + until [ -n "$job_state" ] + do + job_state=$(es-find id=$job_id| grep job_state) + sleep 5 + done +} + job_test() { local job_id bef aft - job_id=$(submit test.yaml |awk '{print $NF}') - bef=$(date +%s) - ./my-qemu.sh - aft=$(date +%s) + job_id=$(submit test.yaml |awk -F '=' '{print $NF}') + get_job_state + start_time=$(es-find id=$job_id| grep start_time| awk -F '"' '{print $4}') + end_time=$(es-find id=$job_id| grep end_time| awk -F '"' '{print $4}') + bef=$(date -d "$start_time" +%s) + aft=$(date -d "$end_time" +%s) logging "$1" "$2" "$3" "$(sec2date $bef)" "$(sec2date $aft)" "$((aft - bef))" "$job_id" } -- 2.23.0

2 1

[PATCH compass-ci] sched: when os_mount is container no need initrd.lkp
by Cao Xueliang 13 Oct '20

13 Oct '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/lib/job.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index be3446e..70f2505 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -324,7 +324,7 @@ class Job if "#{os_mount}" == "initramfs" temp_initrds.concat(initramfs_initrds()) - else + elsif "#{os_mount}" == "nfs" or "#{os_mount}" == "cifs" temp_initrds.concat(nfs_cifs_initrds()) end -- 2.23.0

1 0