- Compass-ci - mailweb.openeuler.org

[PATCH v2 lkp-tests] jobs: add send email yaml
by Wei Jihui 28 Jan '21

28 Jan '21

[usage] submit job.yaml -i send-email.yaml send_email.subject=$subject submit job.yaml -i send-email-on-fail.yaml on_fail.send_email.subject=$subject values of subject are limited to: job_failed/job_debug/borrow_success/borrow_failed Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- jobs/send-email-on-fail.yaml | 7 +++++++ jobs/send-email.yaml | 6 ++++++ 2 files changed, 13 insertions(+) create mode 100644 jobs/send-email-on-fail.yaml create mode 100644 jobs/send-email.yaml diff --git a/jobs/send-email-on-fail.yaml b/jobs/send-email-on-fail.yaml new file mode 100644 index 00000000..a38eb52d --- /dev/null +++ b/jobs/send-email-on-fail.yaml @@ -0,0 +1,7 @@ +# use this send-email-on-fail.yaml by: +# submit job.yaml -i send-email-on-fail.yaml on_fail.send_email.subject=$subject +# values of $subject are limited to job_failed/job_debug/borrow_success/borrow_failed. + +on_fail: + send_email: + subject: job_failed diff --git a/jobs/send-email.yaml b/jobs/send-email.yaml new file mode 100644 index 00000000..8f8b48b9 --- /dev/null +++ b/jobs/send-email.yaml @@ -0,0 +1,6 @@ +# use this send_email.yaml by: +# submit job.yaml -i send-email.yaml send_email.subject=$subject +# values of $subject are limited to job_failed/job_debug/borrow_success/borrow_failed. + +send_email: + subject: job_failed -- 2.23.0

1 0

[PATCH lkp-tests] jobs: add send email yaml
by Wei Jihui 28 Jan '21

28 Jan '21

[usage] submit job.yaml -i send-email.yaml send_email.subject=xx submit job.yaml -i send-email-on-fail.yaml on_fail.send_email.subject=xx subject value limited at: job_failed/job_debug/borrow_success/borrow_failed Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- jobs/send-email-on-fail.yaml | 7 +++++++ jobs/send-email.yaml | 6 ++++++ 2 files changed, 13 insertions(+) create mode 100644 jobs/send-email-on-fail.yaml create mode 100644 jobs/send-email.yaml diff --git a/jobs/send-email-on-fail.yaml b/jobs/send-email-on-fail.yaml new file mode 100644 index 00000000..c81f756f --- /dev/null +++ b/jobs/send-email-on-fail.yaml @@ -0,0 +1,7 @@ +# use this job yaml by: +# submit job.yaml -i send-email-on-fail.yaml on_fail.send_email.subject=xx ... +# subject value limited at job_failed/job_debug/borrow_success/borrow_failed. + +on_fail: + send_email: + subject: job_failed diff --git a/jobs/send-email.yaml b/jobs/send-email.yaml new file mode 100644 index 00000000..e6e767ba --- /dev/null +++ b/jobs/send-email.yaml @@ -0,0 +1,6 @@ +# use this job yaml by: +# submit job.yaml -i send-email.yaml send_email.subject=xx ... +# subject value limited at job_failed/job_debug/borrow_success/borrow_failed. + +send_email: + subject: job_failed -- 2.23.0

2 1

[PATCH v2 compass-ci] 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 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/stats_wrapper.rb b/lib/stats_wrapper.rb index 5bde4ab..c0406ad 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,15 @@ 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 =~ /{|}/ + + 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 +200,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 0

[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