- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci 3/3] lib/stats_wrapper.rb support handle $result_root/$script.yaml
by Lu Weitao 28 Jan '21

28 Jan '21

[Example] iperf.yaml: { tcp.sender.bps: 34804801216.197174 tcp.receiver.bps: 34804762215.18231 } iperf.json: { "iperf.tcp.sender.bps": [ 34804801216.197174 ], "iperf.tcp.receiver.bps": [ 34804762215.18231 ] } Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/stats_wrapper.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/stats_wrapper.rb b/lib/stats_wrapper.rb index 5bde4ab..40647c4 100644 --- a/lib/stats_wrapper.rb +++ b/lib/stats_wrapper.rb @@ -24,7 +24,7 @@ module StatsWrapper @stats_group = program_time || program @log = "#{RESULT_ROOT}/#{@stats_group}" - return unless pretreatment + return unless File.exist?("#{(a)log}.yaml") || pretreatment return unless create_tmpfile check_tmpfile @@ -180,6 +180,13 @@ module StatsWrapper system "xzcat #{(a)dmesg_log}.xz > #{@dmesg_log}" if File.exist?("#{(a)dmesg_log}.xz") end + def self.create_yaml_tmpfile(file) + File.readlines(file).each do |line| + next if line =~ %r{({|})} + line.lstrip! + File.write(@tmpfile, line, mode: 'a') + end + end def self.create_tmpfile tmp = Tempfile.new('lkp-stats.', '/tmp') @tmpfile = tmp.path @@ -191,6 +198,8 @@ module StatsWrapper check #{@tmpfile}") create_status = false end + elsif File.exist?("#{(a)log}.yaml") + create_yaml_tmpfile("#{(a)log}.yaml") else %x(#{PROGRAM_DIR}/#{@program} < /dev/null > #{@tmpfile}) unless $CHILD_STATUS.exitstatus.zero? -- 2.23.0

1 1

[PATCH compass-ci 2/3] translate lkp-tests/stats/wrapper to compass-ci/lib/stats_wrapper.rb
by Lu Weitao 28 Jan '21

28 Jan '21

translate lkp-tests/stats/wrapper(shell) to compass-ci/lib/stats_wrapper.rb(ruby) [Why] we need reduce calls between processes to improve performance Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/stats_wrapper.rb | 252 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 252 insertions(+) create mode 100644 lib/stats_wrapper.rb diff --git a/lib/stats_wrapper.rb b/lib/stats_wrapper.rb new file mode 100644 index 0000000..5bde4ab --- /dev/null +++ b/lib/stats_wrapper.rb @@ -0,0 +1,252 @@ +# SPDX-License-Identifier: GPL-2.0-only + +# frozen_string_literal: true + +LKP_SRC ||= ENV['LKP_SRC'] || '/c/lkp-tests' +require "#{LKP_SRC}/lib/log.rb" +require 'tempfile' +require 'English' + +PROGRAM_DIR = "#{LKP_SRC}/stats" + +# exit processing the stats if the program is not in the program_list. +# program_list is a file that records all the programs(setups, monitors, tests, +# daemons) being executed during the test. +# this is to solve the problem for cluster test jobs running on the server node +# where no program's log file is generated for running server daemons but the +# stats processing for the program running on client node will also be handled +# on server node due to the current Job2sh algorithm. + +# default stats are not in the program_list +module StatsWrapper + def self.wrapper(program, program_time = nil) + @program = program + @stats_group = program_time || program + @log = "#{RESULT_ROOT}/#{@stats_group}" + + return unless pretreatment + return unless create_tmpfile + + check_tmpfile + warn_empty_stats + return unless create_stat + + check_empty_json + delete_log_package + end + + def self.pretreatment + return unless available_program? + return unless unzip_log + + extract_kmsg_dmesg + check_incomplete_run(@log) + check_soft_timeout + return if check_empty_output + return if check_binary_output + + true + end + + def self.available_program? + yaml_data = File.read("#{LKP_SRC}/etc/default_stats.yaml") + return true if yaml_data =~ /^#{@program}:/ + + return unless File.exist?("#{RESULT_ROOT}/program_list") + + pro_list = File.read("#{RESULT_ROOT}/program_list") + pro_list =~ /#{@program}/ + end + + def self.check_incomplete_run(file) + return if File.size?(file) + return unless File.exist?("#{LKP_SRC}/tests/#{@program}") + + data = "# missing #{@program} #{file}\nis_incomplete_run: 1" + File.write("#{RESULT_ROOT}/last_state", data, mode: 'a') + end + + def self.check_soft_timeout + return unless File.exist?("#{RESULT_ROOT}/soft_timeout") + + last_state = File.readlines("#{RESULT_ROOT}/last_state") + last_state.map!(&:chomp!) + data = 'soft_timeout: 1' + return if last_state.indlude?(data) + + File.write("#{RESULT_ROOT}/last_state", data, mode: 'a') + end + + def self.delete_log + File.delete(@log) if File.exist?(@log) + File.delete("#{(a)log}.gz") if File.exist?("#{(a)log}.gz") + end + + def self.check_empty_output + return if File.size?(@log) + return if %w[tcrypt kernel-size perf-profile].include?(@program) + return if @program == 'dmesg' && File.size?("#{RESULT_ROOT}/kmsg") + return if @program == 'kmsg' && File.size?("#{RESULT_ROOT}/dmesg") + + delete_log + true + end + + def self.check_binary_output + return if %w[dmesg kmsg mpstat iostat].include?(@program) + + # kmsg may actually read the dmesg file + # refer to the exception cases in check_empty_output() + return unless File.exist?(@log) + return unless File.read(@log) =~ /\x0/ + + log_warn "skip binary file #{@log}" + + true + end + + def self.warn_empty_stats + return if File.size?(@tmpfile) + return if %w[dmesg ftrace turbostat perf-profile].include?(@program) + return unless File.size?("#{RESULT_ROOT}/time") + return if File.size?("#{RESULT_ROOT}/last_state") + return if File.read("#{LKP_SRC}/etc/failure") =~ /^#{(a)program}\./ + return if File.read("#{LKP_SRC}/etc/pass") =~ /^#{(a)program}\./ + + log_warn "empty stats for #{@log}" + end + + def self.check_exist_json + return if File.exist?("#{RESULT_ROOT}/#{(a)stats_group}.json") || File.exist?("#{RESULT_ROOT}/#{(a)stats_group}.json.gz") + return if File.exist?("#{RESULT_ROOT}/last_stat") && File.read("#{RESULT_ROOT}/last_state") =~ /is_incomplete_run/ + + log_warn "no generate json file for #{@stats_group}, check #{RESULT_ROOT}" + data = "# no json file for #{@stats_group}\nis_incomplete_run: 1" + File.write("#{RESULT_ROOT}/last_state", data, mode: 'a') + end + + def self.check_empty_json + testcase = RESULT_ROOT.split('/')[2] + testcase[4, testcase.length] if testcase =~ /^kvm:/ + + return if %w[borrow boot].include?(testcase) + return unless File.exist?("#{RESULT_ROOT}/job.sh") + + # testcase maybe different with run_case + # take fio-basic-1hdd-write.yaml job as example: + # - testcase will be fio-basc + # - run_case will be fio + + run_case = nil + job_data = File.readlines("#{RESULT_ROOT}/job.sh") + job_data.each do |line| + next unless line.chomp! =~ %r{LKP_SRC/tests/wrapper} + + parse = line.split(' ')[-1] + run_case = parse + break + end + + return unless run_case == @stats_group + + check_exist_json + end + + def self.unzip_log + if File.exist?("#{(a)log}.gz") + return unless File.size?("#{(a)log}.gz") + + system "zcat #{(a)log}.gz > #{@log}" + elsif File.exist?("#{(a)log}.xz") + return unless File.size?("#{(a)log}.xz") + + system "xzcat #{(a)log}.xz > #{@log}" + end + + true + end + + def self.extract_kmsg_dmesg + @kmsg_log = "#{RESULT_ROOT}/kmsg" + # extract kmsg for kmsg related stats + if @log =~ %r{^#{RESULT_ROOT}/(boot-memory|boot-time|tcrypt|dmesg)$} + system "xzcat #{(a)kmsg_log}.xz" if File.exist?("#{(a)kmsg_log}.xz") + end + + @dmesg_log = "#{RESULT_ROOT}/dmesg" + # extract dmesg for dmesg related stats + return unless @log =~ %r{^#{RESULT_ROOT}/kmsg$} + + system "xzcat #{(a)dmesg_log}.xz > #{@dmesg_log}" if File.exist?("#{(a)dmesg_log}.xz") + end + + def self.create_tmpfile + tmp = Tempfile.new('lkp-stats.', '/tmp') + @tmpfile = tmp.path + create_status = true + if File.exist?(@log) + %x(#{PROGRAM_DIR}/#{@program} #{@log} < #{@log} > #{@tmpfile}) + unless $CHILD_STATUS.exitstatus.zero? + log_error("#{PROGRAM_DIR}/#{@program} #{@log} < #{@log} exit code #{$CHILD_STATUS.exitstatus}, + check #{@tmpfile}") + create_status = false + end + else + %x(#{PROGRAM_DIR}/#{@program} < /dev/null > #{@tmpfile}) + unless $CHILD_STATUS.exitstatus.zero? + log_error("#{PROGRAM_DIR}/#{@program} < /dev/null exit code #{$CHILD_STATUS.exitstatus}, check #{@tmpfile}") + create_status = false + end + end + + create_status + end + + def self.check_tmpfile + str = File.read("#{LKP_SRC}/etc/failure") + str += File.read("#{LKP_SRC}/etc/pass") + + str =~ /^#{(a)program}\./ || check_incomplete_run(@tmpfile) + end + + def self.dump_stat(stats_group, file) + %x(#{LKP_SRC}/sbin/dump-stat #{stats_group} < #{file}) + unless $CHILD_STATUS.exitstatus.zero? + log_error("#{LKP_SRC}/sbin/dump-stat #{@program} exit code #{$CHILD_STATUS.exitstatus}, check #{file}") + return nil + end + + File.delete(file) + + true + end + + def self.create_stat + if @program == 'ftrace' + Dir.foreach(RESULT_ROOT) do |file| + if file =~ /^#{@program}\..*\.yaml/ + stats_group = File.basename(file, '.yaml') + dump_stat(stats_group, file) + end + end + else + dump_stat(@stats_group, @tmpfile) + end + end + + def self.delete_log_package + if File.exist?("#{(a)log}.gz") + File.delete(@log) + elsif File.exist?("#{(a)log}.xz") + File.delete(@log) + end + + # delete temporarily extracted kmsg above + File.delete(@kmsg_log) if File.exist?("#{(a)kmsg_log}.xz") + + # delete temporarily extracted dmesg above + File.delete(@dmesg_log) if File.exist?("#{(a)dmesg_log}.xz") + + File.delete(@tmpfile) if File.exist?(@tmpfile) + end +end -- 2.23.0

1 0

[PATCH compass-ci 1/3] sbin/result2stats: get stats_program_list from job.yaml
by Lu Weitao 28 Jan '21

28 Jan '21

[Why] Get rid of dependence on job.sh [How] stats_program_list include: - stat-programs from job[key] which matched with lkp-tests/stats* - job[$suite] - time job[$suite].time - stderr - default stats: lkp-tests/etc/default_stats.yaml Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/matrix2.rb | 2 +- lib/stats.rb | 63 +++++++++++++++++++++++++++++++++++++++++++++++ sbin/result2stats | 15 ++++------- 3 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 lib/stats.rb diff --git a/lib/matrix2.rb b/lib/matrix2.rb index 4dd03b4..526fadf 100644 --- a/lib/matrix2.rb +++ b/lib/matrix2.rb @@ -2,7 +2,7 @@ # frozen_string_literal: true -LKP_SRC = ENV['LKP_SRC'] || '/c/lkp-tests' +LKP_SRC ||= ENV['LKP_SRC'] || '/c/lkp-tests' require "#{LKP_SRC}/lib/stats" require "#{LKP_SRC}/lib/yaml" diff --git a/lib/stats.rb b/lib/stats.rb new file mode 100644 index 0000000..1ef6656 --- /dev/null +++ b/lib/stats.rb @@ -0,0 +1,63 @@ +# SPDX-License-Identifier: GPL-2.0-only + +# frozen_string_literal: true + +require_relative './stats_wrapper' + +CCI_SRC ||= ENV['CCI_SRC'] || '/c/compass-ci' + +# extract each result from the script output +# format each result as $script.json +class Stats + def initialize(result_root) + @result_root = result_root + @job = load_yaml(result_root + '/job.yaml') + end + + def extract_stats + ENV['RESULT_ROOT'] = @result_root + stats_list = assign_stats_list + stats_list.each do |stat| + StatsWrapper.wrapper(*stat) + end + end + + def assign_stats_list + stats_list = [] + @available_stats = available_stats + + stats_list << @job['suite'] + stats_list << ['time', @job['suite'] + '.time'] + stats_list << 'stderr' + @job.each_key do |k| + if @available_stats.include?(k) + stats_list << k + end + end + assign_default_stats(stats_list) + + stats_list + end +end + +def load_yaml(path) + unless File.file?(path) + warn "#{path} does not exist" + exit + end + YAML.load_file(path) +end + +def available_stats + vailable_stats = [] + Dir.open(LKP_SRC + '/stats').each do |file| + vailable_stats << file unless file.start_with?('.') + end + + vailable_stats +end + +def assign_default_stats(stats_list) + default_stats = YAML.load_file(LKP_SRC + '/etc/default_stats.yaml').keys + default_stats.each { |stat| stats_list << stat } +end diff --git a/sbin/result2stats b/sbin/result2stats index 6229b3c..fb7c18e 100755 --- a/sbin/result2stats +++ b/sbin/result2stats @@ -7,16 +7,10 @@ CCI_SRC = File.dirname(__dir__) require 'optparse' require "#{CCI_SRC}/lib/matrix2" +require_relative '../lib/stats.rb' File.umask 0o002 -def extract_stats(result_root) - ENV['RESULT_ROOT'] = result_root - job_script = result_root + '/job.sh' - - system job_script, 'extract_stats' -end - opt_parser = OptionParser.new do |opts| opts.banner = 'Usage: result2stats result_root' opts.separator 'eg: result2stats /srv/result/iperf/vm-1p1g/2020-09-30/crystal.91198' @@ -36,7 +30,8 @@ argv = if ARGV == [] end opt_parser.parse!(argv) +RESULT_ROOT = argv[0] || ENV['RESULT_ROOT'] -result_root = argv[0] || ENV['RESULT_ROOT'] -extract_stats result_root -create_stats result_root +stats = Stats.new(RESULT_ROOT) +stats.extract_stats +create_stats RESULT_ROOT -- 2.23.0

1 0

[PATCH compass-ci] container/dracut-initrd: add rsync module to docker image debian:dracut
by Xu Xijian 28 Jan '21

28 Jan '21

Local disk boot scheme need to add rsync module into initrd, docker image debian:dracut is used to make initrd, so add rsync to it. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- container/dracut-initrd/bin/setup-dracut.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/dracut-initrd/bin/setup-dracut.sh b/container/dracut-initrd/bin/setup-dracut.sh index 2e676de..7e2bf51 100755 --- a/container/dracut-initrd/bin/setup-dracut.sh +++ b/container/dracut-initrd/bin/setup-dracut.sh @@ -6,7 +6,7 @@ export DEBIAN_FRONTEND=noninteractive apt-get update apt-get install -y --no-install-recommends apt-utils >/dev/null 2>&1 -apt-get install -y nfs-common netbase cifs-utils kmod +apt-get install -y nfs-common netbase cifs-utils kmod rsync apt-get install -y dracut dracut-network dracut-config-generic apt-get clean -- 2.23.0

1 0

[PATCH v3 compass-ci] sbin/auto-submit: config account yaml
by Liu Yinsi 28 Jan '21

28 Jan '21

before: define my_name, my_email, lab, then store into ES and config yaml after: query my_name, my_email, lab, my_token from ES, then config yaml [why] store account info into ES, this part will do in other registry service, so when start auto-submit service, no need to store data, only query ES and config yaml. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sbin/auto_submit | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sbin/auto_submit b/sbin/auto_submit index 5648d59..359a462 100755 --- a/sbin/auto_submit +++ b/sbin/auto_submit @@ -86,15 +86,26 @@ class AutoSubmit end end -option = { - my_name: 'Auto Submit Robot', - my_email: 'autosubmit@localhost', - lab: `awk '/^lab:\s/ {print $2; exit}' /etc/compass-ci/defaults/*.yaml`.chomp -} +def query_account_info + my_email = 'auto-submit@localhost' + + option = ESQuery.new(index: 'accounts').query_by_id(my_email) + raise "query auto-submit account info failed: #{my_email}" unless option + + option +end + +def config_yaml + option = query_account_info + + build_my_info = BuildMyInfo.new(option['my_email'], option['my_name'], option['lab'], option['my_token']) + build_my_info.config_default_yaml + build_my_info.config_lab_yaml +end # fix verification problems when submit jobs by auto-submit service -build_my_info = BuildMyInfo.new(option[:my_email], option[:my_name], option[:lab]) -build_my_info.config_my_info +query_account_info +config_yaml auto_submitter = AutoSubmit.new auto_submitter.listen -- 2.23.0

3 3

[PATCH v2 compass-ci 3/4] container: add start and register-accounts script for register-accounts container
by Cao Xueliang 28 Jan '21

28 Jan '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- .../register-accounts}/register-accounts | 1 + container/register-accounts/start | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+) rename {sparrow/5-build => container/register-accounts}/register-accounts (98%) create mode 100755 container/register-accounts/start diff --git a/sparrow/5-build/register-accounts b/container/register-accounts/register-accounts similarity index 98% rename from sparrow/5-build/register-accounts rename to container/register-accounts/register-accounts index 41126f9..ff69032 100755 --- a/sparrow/5-build/register-accounts +++ b/container/register-accounts/register-accounts @@ -12,3 +12,4 @@ content.each do |key, value| build_my_info = BuildMyInfo.new(value['my_email'], value['my_name'], ENV['lab']) build_my_info.store_account_info end +sleep diff --git a/container/register-accounts/start b/container/register-accounts/start new file mode 100755 index 0000000..b1ebe98 --- /dev/null +++ b/container/register-accounts/start @@ -0,0 +1,35 @@ +#!/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 'set' +require_relative '../defconfig.rb' + +names = Set.new %w[ + ES_HOST + ES_PORT +] + +defaults = relevant_defaults(names) +env = docker_env(defaults) + +DEFAULT_CCI = '/c/compass-ci' +docker_rm 'register-accounts' + +cmd = %w[ + docker run + --name register-accounts + -d +] + env + %W[ + -e CCI_SRC=#{DEFAULT_CCI} + -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} + -v /etc/compass-ci/register:/etc/compass-ci/register:ro + -v /etc/localtime:/etc/localtime:ro + -w #{DEFAULT_CCI}/container/register-accounts + register-accounts +] + +cmd += ['sh', '-c', 'umask 002 && ./register-accounts'] + +system(*cmd) -- 2.23.0

2 2

[PATCH v2 compass-ci 1/4] sparrow: delete register-accounts in install-tiny
by Cao Xueliang 28 Jan '21

28 Jan '21

We will use a container to register accounts. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- sparrow/install-tiny | 1 - 1 file changed, 1 deletion(-) diff --git a/sparrow/install-tiny b/sparrow/install-tiny index eb9b3cb..a291549 100755 --- a/sparrow/install-tiny +++ b/sparrow/install-tiny @@ -19,5 +19,4 @@ cd $CCI_SRC/sparrow || exit . /etc/profile.d/compass.sh 4-docker/buildall 5-build/ipxe -5-build/register-accounts 7-systemd/systemd-setup -- 2.23.0

2 2

[PATCH lab-z9] modify the directory and files about idle
by Zhang Dewan 28 Jan '21

28 Jan '21

wo don't need so much multi-qemu, and reorganize the directory like this: dewan@crystal ~/tmp/lab-z9/allot/idle% tree . ├── multi-docker └── multi-qemu ├── taishan200-2280-2s48p-256g--a60 └── multi-qemu.yaml ├── taishan200-2280-2s48p-256g--a61 -> taishan200-2280-2s48p-256g--a60 ├── taishan200-2280-2s48p-256g--a62 -> taishan200-2280-2s48p-256g--a60 ├── taishan200-2280-2s48p-256g--a63 -> taishan200-2280-2s48p-256g--a60 └── taishan200-2280-2s48p-256g--a64 -> taishan200-2280-2s48p-256g--a60 7 directories, 1 file Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- .../taishan200-2280-2s48p-256g--a60/multi-qemu.yaml | 0 allot/idle/{ => multi-qemu}/taishan200-2280-2s48p-256g--a61 | 0 allot/idle/{ => multi-qemu}/taishan200-2280-2s48p-256g--a62 | 0 allot/idle/{ => multi-qemu}/taishan200-2280-2s48p-256g--a63 | 0 allot/idle/{ => multi-qemu}/taishan200-2280-2s48p-256g--a64 | 0 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 - 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 - 36 files changed, 31 deletions(-) rename allot/idle/{ => multi-qemu}/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml (100%) rename allot/idle/{ => multi-qemu}/taishan200-2280-2s48p-256g--a61 (100%) rename allot/idle/{ => multi-qemu}/taishan200-2280-2s48p-256g--a62 (100%) rename allot/idle/{ => multi-qemu}/taishan200-2280-2s48p-256g--a63 (100%) rename allot/idle/{ => multi-qemu}/taishan200-2280-2s48p-256g--a64 (100%) delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a11 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a12 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a13 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a14 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a15 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a16 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a17 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a18 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a19 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a20 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a21 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a22 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a24 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a25 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a26 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a27 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a28 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a29 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a30 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a31 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a32 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a33 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a34 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a35 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a65 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a66 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a67 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a68 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a69 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a70 delete mode 120000 allot/idle/taishan200-2280-2s48p-256g--a71 diff --git a/allot/idle/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml b/allot/idle/multi-qemu/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml similarity index 100% rename from allot/idle/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml rename to allot/idle/multi-qemu/taishan200-2280-2s48p-256g--a60/multi-qemu.yaml diff --git a/allot/idle/taishan200-2280-2s48p-256g--a61 b/allot/idle/multi-qemu/taishan200-2280-2s48p-256g--a61 similarity index 100% rename from allot/idle/taishan200-2280-2s48p-256g--a61 rename to allot/idle/multi-qemu/taishan200-2280-2s48p-256g--a61 diff --git a/allot/idle/taishan200-2280-2s48p-256g--a62 b/allot/idle/multi-qemu/taishan200-2280-2s48p-256g--a62 similarity index 100% rename from allot/idle/taishan200-2280-2s48p-256g--a62 rename to allot/idle/multi-qemu/taishan200-2280-2s48p-256g--a62 diff --git a/allot/idle/taishan200-2280-2s48p-256g--a63 b/allot/idle/multi-qemu/taishan200-2280-2s48p-256g--a63 similarity index 100% rename from allot/idle/taishan200-2280-2s48p-256g--a63 rename to allot/idle/multi-qemu/taishan200-2280-2s48p-256g--a63 diff --git a/allot/idle/taishan200-2280-2s48p-256g--a64 b/allot/idle/multi-qemu/taishan200-2280-2s48p-256g--a64 similarity index 100% rename from allot/idle/taishan200-2280-2s48p-256g--a64 rename to allot/idle/multi-qemu/taishan200-2280-2s48p-256g--a64 diff --git a/allot/idle/taishan200-2280-2s48p-256g--a11 b/allot/idle/taishan200-2280-2s48p-256g--a11 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a11 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a12 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a13 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a14 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a15 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a16 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a17 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a18 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a19 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a20 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a21 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a22 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a24 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a25 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a26 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a27 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a28 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a29 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a30 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a31 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a32 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a33 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a34 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a35 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a65 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a66 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a67 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a68 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a69 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a70 +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 120000 index 479a75a..0000000 --- a/allot/idle/taishan200-2280-2s48p-256g--a71 +++ /dev/null @@ -1 +0,0 @@ -taishan200-2280-2s48p-256g--a60 \ No newline at end of file -- 2.23.0

4 6

[PATCH compass-ci] lib/es_jobs.rb: more accurate matching summary info
by Wu Zhende 28 Jan '21

28 Jan '21

1. The fail/error/warning cases should not take input from stderr.* stderr is rather chaotic -- let it stay in any_stderr. 2. The warning match should be more exact. Avoid matching nr_warning So does error Don't use stderr.* as examples for them. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- lib/es_jobs.rb | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/es_jobs.rb b/lib/es_jobs.rb index e367a91..9e0c671 100644 --- a/lib/es_jobs.rb +++ b/lib/es_jobs.rb @@ -33,29 +33,30 @@ class ESJobs def set_job_summary(stats, job) summary_result = '' stats.each_key do |stat| - # "stderr.warning:rubygems_will_be_installed_before_its_ruby_dependency": 1, - # "stderr._#warning_FORTIFY_SOURCE_requires_compiling_with_optimization(-O)": 1, - # "stderr.disk_src.c:#:#:warning:incompatible_implicit_declaration_of_built-in_function'strcpy'": 1, - if stat.match(/warning/i) - job['summary.any_warning'] = 1 - summary_result = 'warning' - end # "stderr.linux-perf": 1, # "stderr.error:target_not_found:ruby-dev": 1, # "stderr.error:could_not_open_file/var/lib/pacman/local/ldb-#:#-#/desc:Not_a_directory": 1, if stat.match(/stderr\./i) job['summary.any_stderr'] = 1 summary_result = 'stderr' + next end - # "stderr.::Proceed_with_installation?[Y/n]error:target_not_found:liblzma-dev": 1, - # "stderr.==>ERROR:Failure_while_downloading_apache-cassandra": 1, - # "stderr.ftq.h:#:#:error:unknown_type_name'ticks'": 1, + + # sum.stats.build-pkg.mb_cache.c:warning:‘read_cache’defined-but-not-used[-Wunused-function]: 1 + # sum.stats.build-pkg.mb_cache.c:warning:control-reaches-end-of-non-void-function[-Wreturn-type]: 1 + if stat.match(/warning/i) && !stat.match(/nr_warning/i) + job['summary.any_warning'] = 1 + summary_result = 'warning' + end + # "last_state.test.iperf.exit_code.127": 1, # "last_state.test.cci-makepkg.exit_code.1": 1, - if stat.match(/error|\.exit_code\./i) + # sum.stats.build-pkg.cc1plus:error:unrecognized-command-line-option‘-Wno-unknown-warning-option’[-Werror]: 2 + if stat.match(/error|\.exit_code\./i) && !stat.match(/nr_error/i) job['summary.any_error'] = 1 summary_result = 'error' end + if stat.match(/\.fail$/i) job['summary.any_fail'] = 1 summary_result = 'fail' -- 2.23.0

1 0

[PATCH v3 compass-ci 2/2] providers/libvirt: split common elements of domain.xml
by Xiao Shenwei 28 Jan '21

28 Jan '21

[why] some elements can be specifies by user. case 1: a complete domain.xml we should replace some elements of user's xml like os name ... case 2: default domain.xml generate a default domain.xml case 3: only specifies a cpu templates use user's cpu template replace default cpu template case 4: composition template user can specifies different tempaltes like cpu, disk, ... [how] split domain.xml then template combination based on user requirements Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/libvirt/templates/active.xml | 3 +++ providers/libvirt/templates/clock.xml | 6 ++++++ providers/libvirt/templates/cpu.xml | 6 ++++++ providers/libvirt/templates/devices.xml | 3 +++ providers/libvirt/templates/disk.xml | 7 +++++++ providers/libvirt/templates/domain.xml | 10 ++++++++++ providers/libvirt/templates/emulator.xml | 1 + providers/libvirt/templates/interface.xml | 6 ++++++ providers/libvirt/templates/memory.xml | 1 + providers/libvirt/templates/name.xml | 1 + providers/libvirt/templates/os.xml | 8 ++++++++ providers/libvirt/templates/seclabel.xml | 4 ++++ providers/libvirt/templates/serial.xml | 4 ++++ 13 files changed, 60 insertions(+) create mode 100644 providers/libvirt/templates/active.xml create mode 100644 providers/libvirt/templates/clock.xml create mode 100644 providers/libvirt/templates/cpu.xml create mode 100644 providers/libvirt/templates/devices.xml create mode 100644 providers/libvirt/templates/disk.xml create mode 100644 providers/libvirt/templates/domain.xml create mode 100644 providers/libvirt/templates/emulator.xml create mode 100644 providers/libvirt/templates/interface.xml create mode 100644 providers/libvirt/templates/memory.xml create mode 100644 providers/libvirt/templates/name.xml create mode 100644 providers/libvirt/templates/os.xml create mode 100644 providers/libvirt/templates/seclabel.xml create mode 100644 providers/libvirt/templates/serial.xml diff --git a/providers/libvirt/templates/active.xml b/providers/libvirt/templates/active.xml new file mode 100644 index 0000000..8ed7ee4 --- /dev/null +++ b/providers/libvirt/templates/active.xml @@ -0,0 +1,3 @@ +<on_poweroff>destroy</on_poweroff> +<on_reboot>destroy</on_reboot> +<on_crash>destroy</on_crash> diff --git a/providers/libvirt/templates/clock.xml b/providers/libvirt/templates/clock.xml new file mode 100644 index 0000000..7646c91 --- /dev/null +++ b/providers/libvirt/templates/clock.xml @@ -0,0 +1,6 @@ +<clock offset='utc'> + <timer name='rtc' tickpolicy='catchup' track='guest'/> + <timer name='hpet' present='no'/> + <timer name='pit' tickpolicy='delay'/> +</clock> + diff --git a/providers/libvirt/templates/cpu.xml b/providers/libvirt/templates/cpu.xml new file mode 100644 index 0000000..6991457 --- /dev/null +++ b/providers/libvirt/templates/cpu.xml @@ -0,0 +1,6 @@ +<vcpu placement='static'><%= nr_cpu %></vcpu> +<cpu mode='host-passthrough' check='none'> +  +</cpu> diff --git a/providers/libvirt/templates/devices.xml b/providers/libvirt/templates/devices.xml new file mode 100644 index 0000000..83cd847 --- /dev/null +++ b/providers/libvirt/templates/devices.xml @@ -0,0 +1,3 @@ +<devices> + <graphics type='vnc' autoport='yes' listen='0.0.0.0'><graphics> +</devices> diff --git a/providers/libvirt/templates/disk.xml b/providers/libvirt/templates/disk.xml new file mode 100644 index 0000000..7aecef0 --- /dev/null +++ b/providers/libvirt/templates/disk.xml @@ -0,0 +1,7 @@ +<% if disk %> +<disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='<%= disk %>'/> + <target dev='vda' bus='virtio'/> +</disk> +<% end %> diff --git a/providers/libvirt/templates/domain.xml b/providers/libvirt/templates/domain.xml new file mode 100644 index 0000000..a3fdb63 --- /dev/null +++ b/providers/libvirt/templates/domain.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" character="utf-8"?> +<domain type='kvm'> + <resource> + <partition>/machine</partition> + </resource> + <features> + <acpi/> + <gic version='3'/> + </features> +</domain> diff --git a/providers/libvirt/templates/emulator.xml b/providers/libvirt/templates/emulator.xml new file mode 100644 index 0000000..e915215 --- /dev/null +++ b/providers/libvirt/templates/emulator.xml @@ -0,0 +1 @@ +<emulator><%=qemu_path%></emulator> diff --git a/providers/libvirt/templates/interface.xml b/providers/libvirt/templates/interface.xml new file mode 100644 index 0000000..5d4c04f --- /dev/null +++ b/providers/libvirt/templates/interface.xml @@ -0,0 +1,6 @@ +<interface type='bridge'> + <source bridge='br0'/> + <mac address='<%= mac %>'/> + <target dev='vnet0'/> + <model type='virtio'/> +</interface> diff --git a/providers/libvirt/templates/memory.xml b/providers/libvirt/templates/memory.xml new file mode 100644 index 0000000..34aec49 --- /dev/null +++ b/providers/libvirt/templates/memory.xml @@ -0,0 +1 @@ +<memory unit='GiB'><%= memory.to_i %></memory> diff --git a/providers/libvirt/templates/name.xml b/providers/libvirt/templates/name.xml new file mode 100644 index 0000000..5dc98f4 --- /dev/null +++ b/providers/libvirt/templates/name.xml @@ -0,0 +1 @@ +<name><%= job_id %></name> diff --git a/providers/libvirt/templates/os.xml b/providers/libvirt/templates/os.xml new file mode 100644 index 0000000..317866d --- /dev/null +++ b/providers/libvirt/templates/os.xml @@ -0,0 +1,8 @@ +<os> + <type arch='<%= arch %>' machine='virt'>hvm</type> + <loader readonly='yes' type='pflash'><%= loader %></loader> + <kernel><%= kernel %></kernel> + <initrd><%= initrd %></initrd> + <cmdline><%= cmdline %></cmdline> + <nvram>/var/lib/libvirt/qemu/nvram/<%= job_id %>.fd</nvram> +</os> diff --git a/providers/libvirt/templates/seclabel.xml b/providers/libvirt/templates/seclabel.xml new file mode 100644 index 0000000..5c10a77 --- /dev/null +++ b/providers/libvirt/templates/seclabel.xml @@ -0,0 +1,4 @@ +<seclabel type='dynamic' model='dac' relabel='yes'> + <label>+0:+0</label> + <imagelabel>+0:+0</imagelabel> +</seclabel> diff --git a/providers/libvirt/templates/serial.xml b/providers/libvirt/templates/serial.xml new file mode 100644 index 0000000..2edc882 --- /dev/null +++ b/providers/libvirt/templates/serial.xml @@ -0,0 +1,4 @@ +<serial type='file'> + <source path="<%= log_file %>"/> + <target port="0"/> +</serial> -- 2.23.0

1 0

[PATCH v3 compass-ci 1/2] providers/lib: introduce context.rb
by Xiao Shenwei 28 Jan '21

28 Jan '21

[why] expand erb templates need a class to save context [how] Context class provider a readable property @info, it will save the context required by erb, and a expand_erb method, it can expand a erb templates based on @info. Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/lib/context.rb | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 providers/lib/context.rb diff --git a/providers/lib/context.rb b/providers/lib/context.rb new file mode 100644 index 0000000..6f9f579 --- /dev/null +++ b/providers/lib/context.rb @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'erb' +require_relative "#{ENV['LKP_SRC']}/lib/hashugar" + +# saves the context required by expand erb templates +class Context + attr_reader :info + + def initialize(mac, hostname, queues) + @info = { + 'mac' => mac, + 'hostname' => hostname, + 'queues' => queues + } + end + + def merge!(hash) + @info.merge!(hash) + end + + # existing variables of @info, can be used by erb + # @info: { 'name' => 'xxx' } + # Templates: + # This is <%= name %> + # After expanding: + # This is xxx + def expand_erb(template, context_hash = {}) + @info.merge!(context_hash) + context = Hashugar.new((a)info).instance_eval { binding } + ERB.new(template, nil, '%').result(context) + end +end -- 2.23.0

1 0

[PATCH v1 compass-ci 1/2] providers/lib: introduce context.rb
by Xiao Shenwei 28 Jan '21

28 Jan '21

[why] expand erb templates need a class to save context [how] Context class provider a readable property @info, it will save the context required by erb, and a expand_erb method, it can expand a erb templates based on @info. Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/lib/context.rb | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 providers/lib/context.rb diff --git a/providers/lib/context.rb b/providers/lib/context.rb new file mode 100644 index 0000000..6f9f579 --- /dev/null +++ b/providers/lib/context.rb @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'erb' +require_relative "#{ENV['LKP_SRC']}/lib/hashugar" + +# saves the context required by expand erb templates +class Context + attr_reader :info + + def initialize(mac, hostname, queues) + @info = { + 'mac' => mac, + 'hostname' => hostname, + 'queues' => queues + } + end + + def merge!(hash) + @info.merge!(hash) + end + + # existing variables of @info, can be used by erb + # @info: { 'name' => 'xxx' } + # Templates: + # This is <%= name %> + # After expanding: + # This is xxx + def expand_erb(template, context_hash = {}) + @info.merge!(context_hash) + context = Hashugar.new((a)info).instance_eval { binding } + ERB.new(template, nil, '%').result(context) + end +end -- 2.23.0

2 2

[PATCH v2 compass-ci] sparrow/0-package: set umask and selinux
by Liu Yinsi 28 Jan '21

28 Jan '21

[why] some container services need umask 002 to work normally, cci-network.service need disabled or permissive selinux, or will have permission denied questions. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/common | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 2d7c9e3..01c32b2 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -27,6 +27,14 @@ cat >> /etc/modules-load.d/cifs <<EOF cifs EOF +cat >> /etc/bashrc <<EOF +umask 002 +EOF + +source /etc/bashrc + +setenforce 0 + server_ip=$(ip route get 1.2.3.4 | awk '{print $7; exit}') : ${DOCKER_REGISTRY_HOST:=$server_ip} -- 2.23.0

2 1

[PATCH v2 compass-ci 4/4] container: add start-depends for register-accounts container
by Cao Xueliang 28 Jan '21

28 Jan '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/register-accounts/start-depends | 1 + 1 file changed, 1 insertion(+) create mode 100755 container/register-accounts/start-depends diff --git a/container/register-accounts/start-depends b/container/register-accounts/start-depends new file mode 100755 index 0000000..8357fca --- /dev/null +++ b/container/register-accounts/start-depends @@ -0,0 +1 @@ +es -- 2.23.0

1 0

[PATCH v2 compass-ci 2/4] container: add register-accounts container build and Dockerfile
by Cao Xueliang 28 Jan '21

28 Jan '21

This container will register some default accounts which will be used in others service. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/register-accounts/Dockerfile | 15 +++++++++++++++ container/register-accounts/build | 5 +++++ 2 files changed, 20 insertions(+) create mode 100644 container/register-accounts/Dockerfile create mode 100755 container/register-accounts/build diff --git a/container/register-accounts/Dockerfile b/container/register-accounts/Dockerfile new file mode 100644 index 0000000..71b7386 --- /dev/null +++ b/container/register-accounts/Dockerfile @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM alpine:3.13 + +MAINTAINER Cao Xueliang <caoxl78320(a)163.com> + +RUN sed -ri.origin 's|^https?://dl-cdn.alpinelinux.org|http://mirrors.huaweicloud.com|g' /etc/apk/repositories && \ + apk update && \ + apk add --no-cache 'ruby-dev' \ + 'g++' 'gcc' 'pcre' 'libevent' 'make' 'git' 'bash' 'grep' 'coreutils' 'curl' 'util-linux' + +RUN umask 002 && \ + gem sources -r https://rubygems.org/ -a https://gems.ruby-china.com/ && \ + gem install rest-client activesupport json yaml elasticsearch io-console diff --git a/container/register-accounts/build b/container/register-accounts/build new file mode 100755 index 0000000..e1dcfa4 --- /dev/null +++ b/container/register-accounts/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 register-accounts . -- 2.23.0

1 0

[PATCH compass-ci 3/4] container: add start and register-accounts script for register-accounts container
by Cao Xueliang 28 Jan '21

28 Jan '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- .../register-accounts}/register-accounts | 0 container/register-accounts/start | 36 +++++++++++++++++++ 2 files changed, 36 insertions(+) rename {sparrow/5-build => container/register-accounts}/register-accounts (100%) create mode 100755 container/register-accounts/start diff --git a/sparrow/5-build/register-accounts b/container/register-accounts/register-accounts similarity index 100% rename from sparrow/5-build/register-accounts rename to container/register-accounts/register-accounts diff --git a/container/register-accounts/start b/container/register-accounts/start new file mode 100755 index 0000000..36042b3 --- /dev/null +++ b/container/register-accounts/start @@ -0,0 +1,36 @@ +#!/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 'set' +require_relative '../defconfig.rb' + +names = Set.new %w[ + ES_HOST + ES_PORT +] + +defaults = relevant_defaults(names) +env = docker_env(defaults) + +DEFAULT_CCI = '/c/compass-ci' +docker_rm 'register-accounts' + +cmd = %w[ + docker run + --name register-accounts + -d + --rm +] + env + %W[ + -e CCI_SRC=#{DEFAULT_CCI} + -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} + -v /etc/compass-ci/register:/etc/compass-ci/register:ro + -v /etc/localtime:/etc/localtime:ro + -w #{DEFAULT_CCI}/container/register-accounts + register-accounts +] + +cmd += ['sh', '-c', 'umask 002 && ./register-accounts'] + +system(*cmd) -- 2.23.0

2 2

[PATCH v2 compass-ci] doc/manual: optimize borrow-machine.en.md
by Luan Shengde 28 Jan '21

28 Jan '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- doc/manual/borrow-machine.en.md | 341 +++++++++----------------------- 1 file changed, 98 insertions(+), 243 deletions(-) diff --git a/doc/manual/borrow-machine.en.md b/doc/manual/borrow-machine.en.md index 6a1fe19..921fa35 100644 --- a/doc/manual/borrow-machine.en.md +++ b/doc/manual/borrow-machine.en.md @@ -1,246 +1,101 @@ -# Prerequisites - -Ensure that you have performed the following operations according to the [apply-account.md](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc…: - -- Send an email to apply for an account. -- Receive an email from compass-ci-robot(a)qq.com. -- Configure the local environment. - -# Applying for a Test Machine (VM) - -1. Generate a local RSA private-public key pair. - - ```shell - hi684@account-vm ~% ssh-keygen -t rsa - Generating public/private rsa key pair. - Enter file in which to save the key (/home/hi684/.ssh/id_rsa): - Created directory '/home/hi684/.ssh'. - Enter passphrase (empty for no passphrase): - Enter same passphrase again: - Your identification has been saved in /home/hi684/.ssh/id_rsa. - Your public key has been saved in /home/hi684/.ssh/id_rsa.pub. - The key fingerprint is: - SHA256:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx hi684@account-vm - The key's randomart image is: - +---[RSA 2048]----+ - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - +----[SHA256]-----+ - hi684@account-vm ~% ls -hla .ssh - total 16K - drwx------. 2 hi684 hi684 4.0K Nov 26 16:37 . - drwx------. 7 hi684 hi684 4.0K Nov 26 16:37 .. - -rw-------. 1 hi684 hi684 1.8K Nov 26 16:37 id_rsa - -rw-r--r--. 1 hi684 hi684 398 Nov 26 16:37 id_rsa.pub - ``` - -2. Select the YAML file as required. - - A **lkp-tests** folder is stored in each user directory `/home/${USER}`. - - ```shell - hi684@account-vm ~% cd lkp-tests/jobs - hi684@account-vm ~/lkp-tests/jobs% ls -hl borrow-* - -rw-r--r--. 1 root root 53 Nov 2 14:54 borrow-10d.yaml - -rw-r--r--. 1 root root 64 Nov 2 14:54 borrow-1d.yaml - -rw-r--r--. 1 root root 235 Nov 19 15:27 borrow-1h.yaml - ``` - -3. Submit the YAML file and connect to the test machine (VM). - - ```shell - hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=vm-2p8g borrow-1h.yaml - submit borrow-1h.yaml, got job_id=z9.170593 - query=>{"job_id":["z9.170593"]} - connect to ws://172.168.131.2:11310/filter - {"job_id":"z9.170593","message":"","job_state":"submit","result_root":"/srv/result/borrow/2020-11-26/vm-2p8g/openeuler-20.03-aarch64/3600/z9.170593"} - {"job_id": "z9.170593", "result_root": "/srv/result/borrow/2020-11-26/vm-2p8g/openeuler-20.03-aarch64/3600/z9.170593", "job_state": "set result root"} - {"job_id": "z9.170593", "job_state": "boot"} - {"job_id": "z9.170593", "job_state": "download"} - {"time":"2020-11-26 14:45:06","mac":"0a-1f-0d-3c-91-5c","ip":"172.18.156.13","job_id":"z9.170593","state":"running","testbox":"vm-2p8g.taishan200-2280-2s64p-256g--a38-12"} - {"job_state":"running","job_id":"z9.170593"} - {"job_id": "z9.170593", "state": "set ssh port", "ssh_port": "51840", "tbox_name": "vm-2p8g.taishan200-2280-2s64p-256g--a38-12"} - Host 172.168.131.2 not found in /home/hi684/.ssh/known_hosts - Warning: Permanently added '[172.168.131.2]:51840' (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 06:44:18 CST 2020 - - System load: 0.83 - Processes: 107 - Memory used: 6.1% - Swap used: 0.0% - Usage On: 89% - IP address: 172.18.156.13 - Users online: 1 - - - - root@vm-2p8g ~# - ``` - - For more information about how to use the **submit** command, testbox options, and how to borrow the specified operating system, see the FAQ at the end of this document. - -4. Return the test machine (VM) after use. - - ```shell - root@vm-2p8g ~# reboot - Connection to 172.168.131.2 closed by remote host. - Connection to 172.168.131.2 closed. - hi684@account-vm ~/lkp-tests/jobs% - ``` - -# Applying for a Test Machine (Physical Machine) - -1. Generate a local RSA private-public key pair. - - ```shell - hi684@account-vm ~% ssh-keygen -t rsa - Generating public/private rsa key pair. - Enter file in which to save the key (/home/hi684/.ssh/id_rsa): - Created directory '/home/hi684/.ssh'. - Enter passphrase (empty for no passphrase): - Enter same passphrase again: - Your identification has been saved in /home/hi684/.ssh/id_rsa. - Your public key has been saved in /home/hi684/.ssh/id_rsa.pub. - The key fingerprint is: - SHA256:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx hi684@account-vm - The key's randomart image is: - +---[RSA 2048]----+ - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - |xxxxxxxxxxxxxxxxx| - +----[SHA256]-----+ - hi684@account-vm ~% ls -hla .ssh - total 16K - drwx------. 2 hi684 hi684 4.0K Nov 26 16:37 . - drwx------. 7 hi684 hi684 4.0K Nov 26 16:37 .. - -rw-------. 1 hi684 hi684 1.8K Nov 26 16:37 id_rsa - -rw-r--r--. 1 hi684 hi684 398 Nov 26 16:37 id_rsa.pub - ``` - -2. Select the YAML file as required. - - A **lkp-tests** folder is stored in each user directory `/home/${USER}`. - - ```shell - hi684@account-vm ~% cd lkp-tests/jobs - hi684@account-vm ~/lkp-tests/jobs% ls -hl borrow-* - -rw-r--r--. 1 root root 53 Nov 2 14:54 borrow-10d.yaml - -rw-r--r--. 1 root root 64 Nov 2 14:54 borrow-1d.yaml - -rw-r--r--. 1 root root 235 Nov 19 15:27 borrow-1h.yaml - ``` - -3. Submit the YAML file and connect to the test machine (physical machine). - - ```shell - hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=taishan200-2280-2s64p-256g borrow-1h.yaml - submit borrow-1h.yaml, got job_id=z9.170594 - query=>{"job_id":["z9.170594"]} - connect to ws://172.168.131.2:11310/filter - {"job_id":"z9.170594","message":"","job_state":"submit","result_root":"/srv/result/borrow/2020-11-26/taishan200-2280-2s64p-256g/openeuler-20.03-aarch64/3600/z9.170594"} - {"job_id": "z9.170594", "result_root": "/srv/result/borrow/2020-11-26/taishan200-2280-2s64p-256g/openeuler-20.03-aarch64/3600/z9.170594", "job_state": "set result root"} - {"job_id": "z9.170594", "job_state": "boot"} - {"job_id": "z9.170594", "job_state": "download"} - {"time":"2020-11-26 14:51:56","mac":"84-46-fe-26-d3-47","ip":"172.168.178.48","job_id":"z9.170594","state":"running","testbox":"taishan200-2280-2s64p-256g--a5"} - {"job_state":"running","job_id":"z9.170594"} - {"job_id": "z9.170594", "state": "set ssh port", "ssh_port": "50420", "tbox_name": "taishan200-2280-2s64p-256g--a5"} - Host 172.168.131.2 not found in /home/hi684/.ssh/known_hosts - Warning: Permanently added '[172.168.131.2]:50420' (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 14:51:59 CST 2020 - - System load: 1.31 - Processes: 1020 - Memory used: 5.1% - Swap used: 0.0% - Usage On: 3% - IP address: 172.168.178.48 - Users online: 1 - - - - root@taishan200-2280-2s64p-256g--a5 ~# - ``` - - For more information about how to use the **submit** command, testbox options, and how to borrow the specified operating system, see the FAQ at the end of this document. - -4. Return the test machine (physical machine) after use. - - ```shell - root@taishan200-2280-2s64p-256g--a5 ~# reboot - Connection to 172.168.131.2 closed by remote host. - Connection to 172.168.131.2 closed. - hi684@account-vm ~/lkp-tests/jobs% - ``` +# Prepare + +- Apply account +- Config default yaml files + +If have not completed above works, reference to [apply-account.md](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc… to finish it. + +# Apply testbox + +## 1. Generate local ssh pub key + + Use the command below to check the pub key exists: + + ls ~/.ssh/*.pub + + Generate one if you don't have one now: + + ssh-keygen + +## 2. Select the job yaml + + We have provided various examples for you in dir ~/lkp-tests/jobs: + + You can filtrate examples for borrowing machine with command below: + + cd ~/lkp-tests/jobs + ls borrow* + +## 3. Submit job + + Command to submit jobs: + + for DCs: + + submit -c -m testbox=dc-2g os_mount=container docker_image=centos:8 borrow-1h.yaml + + for VMs: + + submit -c -m testbox=vm-2p8g borrow-1h.yaml + + for HWs: + + submit -c -m testbox=taishan200-2280-2s48p-256g borrow-1h.yaml + + - You can view the logs in real time for the job with the command above。 + - You will directly login the testbox if the job runs successfully. + - And you will receive an email that contains login command and server configuration information. + - Only within the period of borrowing machine, you can access the textbox with the login command. + +## 4. Return testbox + + Retuan manually(recommended): + + Manually execute 'reboot' in time to return the testbox. + Avoid a waste of computer resource with no-load running. + + Return automatically on maturity: + + The testbox will be returned automatically if it has expired its service life. + + - All testboxes will be returned if it has been executed command 'reboot'. + - The testbox cannot be accessed any more after it has been returned. + - Apply a new one if you want continue to use it. # FAQ -* How Do I Change the Duration of Keeping the Test Machine when Applying for It? - - ```shell - hi684@account-vm ~/lkp-tests/jobs% cat borrow-1h.yaml - suite: borrow - testcase: borrow - - runtime: 1h - ssh_pub_key: <%= - begin - File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp - rescue - nil - end - %> - sshd: - # sleep at the bottom - sleep: - hi684@account-vm ~/lkp-tests/jobs% grep runtime: borrow-1h.yaml - sleep: 1h - # Use the VIM editor to change the value of the runtime field. - hi684@account-vm ~/lkp-tests/jobs% vim borrow-1h.yaml - # After changing the value, submit the request again. - hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=vm-2p8g borrow-1h.yaml - ``` - -* Guide to the **submit** Command - - Reference: [submit-job.md](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/ma… - -* What Are the testbox Options? - - For details about the testbox options, visit https://gitee.com/wu_fengguang/lab-z9/tree/master/hosts. - - > ![](./../public_sys-resources/icon-note.gif) **Note** - > - > VM testbox: vm-xxx - > - > PM testbox: taishan200-2280-xxx - - > ![](./../public_sys-resources/icon-notice.gif) **Notice** - > -> - If the testbox of a physical machine ends with `--axx`, a physical machine is specified. If a task is already in the task queue of the physical machine, the borrow task you submitted will not be processed until the previous task in the queue is completed. - > - If the testbox of a physical machine does not end with `-axx`, no physical machine is specified. In this case, the borrow task you submitted will be immediately allocated to idle physical machines in the cluster for execution. - -* How Do I Borrow the Specified Operating System? - - For details about the supported `os`, `os_arch`, and `os_version`, see [os-os\_verison-os\_arch.md](https://gitee.com/wu_fengguang/compass-ci/blob/…. +## Customize the borrowing time + + Find key in the yaml file and edit its value according to your requirement. + + - The borrowing period can be calculated in days and hours. + - The maximum period is no more than 10 day. + +## Guidance for command submit + + See the usage and options for command 'submit' the command below: + + submit -h + + Reference the following line to learn the advanced usage for command 'submit': + + [submit detailed usage](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/manual/sub… + +## Available testbox + + For a full list of testbox, reference to https://gitee.com/wu_fengguang/lab-z9/tree/master/hosts + + >![](./../public_sys-resources/icon-note.gif) **instruction:** + > + > - DCs: dc-xxx + > - VMs: vm-xxx + > - HWs: taishan200-2280-xxx + + >![](./../public_sys-resources/icon-notice.gif) **attention:** + > - It means that you choosed a specified physical machine if the testbox name is end with `--axx`. + > - You will need to wait if there are already tasks in the task queue for the machine. + > - Your job will be randomly assigned to a machine that meets the requirements if the testbox name is not end with '-axx'. + +## Specify the OS + + About supportted `os`, `os_arch`, `os_version`, reference to [os-os_verison-os_arch.md](https://gitee.com/wu_fengguang/compass-ci/blob/ma… -- 2.23.0

1 0

[PATCH compass-ci] sparrow/0-package: set umask and selinux
by Liu Yinsi 27 Jan '21

27 Jan '21

[why] some container services need umask 002 to work normally, cci-network.service need disabled or permissive selinux, or will have permission denied questions. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/common | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 2d7c9e3..01c32b2 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -27,6 +27,14 @@ cat >> /etc/modules-load.d/cifs <<EOF cifs EOF +cat >> /etc/bashrc <<EOF +umask 002 +EOF + +source /etc/bashrc + +setenforce 0 + server_ip=$(ip route get 1.2.3.4 | awk '{print $7; exit}') : ${DOCKER_REGISTRY_HOST:=$server_ip} -- 2.23.0

2 1

[PATCH compass-ci 3/4] sparrow/5-build: download rootfs
by Liu Yinsi 27 Jan '21

27 Jan '21

[why] for locally deploy compass-ci, call $CCI_SRC/sbin/download-rootfs to download default os rootfs openeuler aarch64 20.03 in deploy script. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/5-build/sources | 5 +++++ sparrow/install-tiny | 1 + 2 files changed, 6 insertions(+) create mode 100755 sparrow/5-build/sources diff --git a/sparrow/5-build/sources b/sparrow/5-build/sources new file mode 100755 index 0000000..48a740b --- /dev/null +++ b/sparrow/5-build/sources @@ -0,0 +1,5 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +$CCI_SRC/sbin/download-rootfs diff --git a/sparrow/install-tiny b/sparrow/install-tiny index eb9b3cb..a5e314a 100755 --- a/sparrow/install-tiny +++ b/sparrow/install-tiny @@ -20,4 +20,5 @@ cd $CCI_SRC/sparrow || exit 4-docker/buildall 5-build/ipxe 5-build/register-accounts +5-build/sources 7-systemd/systemd-setup -- 2.23.0

2 1

[PATCH compass-ci 1/4] sbin: add script for download os rootfs
by Liu Yinsi 27 Jan '21

27 Jan '21

[why] for user deploy compass-ci at their local server, need to download os rootfs to run a qemu kvm or physical machine test. deploy script will call it to download one os rootfs openeuler aarch64 20.03, user can also use this script to download other os rootfs if they want. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sbin/download-rootfs | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 sbin/download-rootfs diff --git a/sbin/download-rootfs b/sbin/download-rootfs new file mode 100755 index 0000000..5ab427b --- /dev/null +++ b/sbin/download-rootfs @@ -0,0 +1,36 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +# download os rootfs. +# 1. download default os rootfs openeuler aarch64 20.03 +# example usage: +# ./download-rootfs + +# 2. download os rootfs you want by add params $os, $os_arch, $os_version. +# example usage: +# ./download-rootfs debian aarch64 sid + +: ${os:=openeuler} +: ${os_arch:=aarch64} +: ${os_version:=20.03} + +. ${CCI_SRC}/container/defconfig.sh + +load_cci_defaults + +rootfs_dir=/${os}/${os_arch}/${os_version} + +download_rootfs_file() +{ + mkdir -p /srv/os/${rootfs_dir} + + cd /srv/os/$rootfs_dir || exit + + wget http://api.compass-ci.openeuler.org:${SRV_HTTP_PORT}/os/${rootfs_dir}.cgz + + gzip -dc ${os_version}.cgz |cpio -id + rm -rf ${os_version}.cgz +} + +download_rootfs_file -- 2.23.0

2 1

[PATCH compass-ci 4/4] container: add start-depends for register-accounts container
by Cao Xueliang 27 Jan '21

27 Jan '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/register-accounts/start-depends | 1 + 1 file changed, 1 insertion(+) create mode 100755 container/register-accounts/start-depends diff --git a/container/register-accounts/start-depends b/container/register-accounts/start-depends new file mode 100755 index 0000000..8357fca --- /dev/null +++ b/container/register-accounts/start-depends @@ -0,0 +1 @@ +es -- 2.23.0

1 0

[PATCH compass-ci 2/4] container: add register-accounts container build and Dockerfile
by Cao Xueliang 27 Jan '21

27 Jan '21

This container will register some default accounts which will be used in others service. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/register-accounts/Dockerfile | 15 +++++++++++++++ container/register-accounts/build | 6 ++++++ 2 files changed, 21 insertions(+) create mode 100644 container/register-accounts/Dockerfile create mode 100755 container/register-accounts/build diff --git a/container/register-accounts/Dockerfile b/container/register-accounts/Dockerfile new file mode 100644 index 0000000..933c543 --- /dev/null +++ b/container/register-accounts/Dockerfile @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM alpine:3.13 + +MAINTAINER Cao Xueliang <caoxl78320(a)163.com> + +RUN sed -ri.origin 's|^https?://dl-cdn.alpinelinux.org|http://mirrors.huaweicloud.com|g' /etc/apk/repositories && \ + apk update && \ + apk add --no-cache 'ruby-dev' \ + 'g++' 'gcc' 'pcre' 'libevent' 'make' 'git' 'bash' 'grep' 'coreutils' 'curl' 'util-linux' + +RUN umask 002 && \ + gem sources -r https://rubygems.org/ -a https://gems.ruby-china.com/ && \ + gem install rest-client activesupport json yaml elasticsearch io-console diff --git a/container/register-accounts/build b/container/register-accounts/build new file mode 100755 index 0000000..11ac01e --- /dev/null +++ b/container/register-accounts/build @@ -0,0 +1,6 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +docker build -t register-accounts . + -- 2.23.0

1 0

[PATCH compass-ci 1/4] sparrow: delete register-accounts in install-tiny
by Cao Xueliang 27 Jan '21

27 Jan '21

We will use a container to register accounts. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- sparrow/install-tiny | 1 - 1 file changed, 1 deletion(-) diff --git a/sparrow/install-tiny b/sparrow/install-tiny index eb9b3cb..a291549 100755 --- a/sparrow/install-tiny +++ b/sparrow/install-tiny @@ -19,5 +19,4 @@ cd $CCI_SRC/sparrow || exit . /etc/profile.d/compass.sh 4-docker/buildall 5-build/ipxe -5-build/register-accounts 7-systemd/systemd-setup -- 2.23.0

1 0

[PATCH compass-ci] container/auto-submit: add start depends
by Liu Yinsi 27 Jan '21

27 Jan '21

[why] in Dockerfile and build script, all not depends es, so delete, but in start script, need to query es to get account info, so add start depends es. refer: [PATCH v3 compass-ci] sbin/auto-submit: config account yaml Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- container/auto-submit/build-depends | 1 - container/auto-submit/start-depends | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 container/auto-submit/build-depends diff --git a/container/auto-submit/build-depends b/container/auto-submit/build-depends deleted file mode 100644 index 8357fca..0000000 --- a/container/auto-submit/build-depends +++ /dev/null @@ -1 +0,0 @@ -es diff --git a/container/auto-submit/start-depends b/container/auto-submit/start-depends index 5232abf..38fc696 100755 --- a/container/auto-submit/start-depends +++ b/container/auto-submit/start-depends @@ -1 +1,2 @@ rabbitmq +es -- 2.23.0

1 0

[PATCH lab-z9] add host-file of a7 and a20
by Zhang Dewan 27 Jan '21

27 Jan '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- hosts/taishan200-2280-2s48p-256g--a20 | 21 +++++++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a7 | 25 +++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 hosts/taishan200-2280-2s48p-256g--a20 create mode 100644 hosts/taishan200-2280-2s64p-256g--a7 diff --git a/hosts/taishan200-2280-2s48p-256g--a20 b/hosts/taishan200-2280-2s48p-256g--a20 new file mode 100644 index 0000000..21bf8e1 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a20 @@ -0,0 +1,21 @@ +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b888f2dd + - /dev/disk/by-id/scsi-350000399b888f705 + - /dev/disk/by-id/scsi-350000399b88906f5 + - /dev/disk/by-id/scsi-350000399b8890141 +mac_addr: + - 84:46:fe:3d:a7:d5 + - 84:46:fe:3d:a7:d6 + - 84:46:fe:3d:a7:d7 + - 84:46:fe:3d:a7:d8 + - 84:46:fe:3d:a7:d9 + - 84:46:fe:3d:a7:da + - 84:46:fe:3d:a7:db + - 84:46:fe:3d:a7:dc +arch: aarch64 +nr_node: 4 +nr_cpu: 96 +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.10 diff --git a/hosts/taishan200-2280-2s64p-256g--a7 b/hosts/taishan200-2280-2s64p-256g--a7 new file mode 100644 index 0000000..07701d3 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a7 @@ -0,0 +1,25 @@ +memory: 256G +nr_hdd_partitions: 1 +nr_ssd_partitions: 1 +hdd_partitions: + - /dev/disk/by-id/scsi-35000039998134611 +ssd_partitions: + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43104 +mac_addr: + - 84:46:fe:89:be:20 + - 84:46:fe:89:be:21 + - 84:46:fe:89:be:22 + - 84:46:fe:89:be:23 + - ac:b3:b5:1e:d6:eb + - ac:b3:b5:1e:d6:ec + - ac:b3:b5:1e:d6:ed + - ac:b3:b5:1e:d6:ee + - ac:b3:b5:1e:d7:7b + - ac:b3:b5:1e:d7:7c + - ac:b3:b5:1e:d7:7d + - ac:b3:b5:1e:d7:7e +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.1.7 -- 2.23.0

1 0

2024

2023

2022

2021

2020

Compass-ci