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

[PATCH v2 compass-ci] lib/job.cr: fix repeated setting job
by Wu Zhende 25 Nov '20

25 Nov '20

Only first time should full initialize the job. Next time function "initialized?" will return true, just to use job_content, don't need to set default values. But now, "kernel_version" will let "initialized?" return false. Fix this. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/job.cr | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index b533665..e56f248 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -67,6 +67,8 @@ class Job set_defaults() end + # Each key must exist after the job is initialized + # Otherwise "initialized?" will return false METHOD_KEYS = %w( id os @@ -95,7 +97,6 @@ class Job kernel_append_root kernel_params docker_image - kernel_version linux_vmlinuz_path linux_modules_initrd linux_headers_initrd @@ -358,7 +359,7 @@ class Job private def set_kernel_version boot_dir = "#{SRV_OS}/#{os_dir}/boot" - suffix = "-#{kernel_version}" if self["kernel_version"]? + suffix = "-#{self["kernel_version"]}" if self["kernel_version"]? self["linux_vmlinuz_path"] = File.real_path("#{boot_dir}/vmlinuz#{suffix}") if "#{os_mount}" == "initramfs" self["linux_modules_initrd"] = File.real_path("#{boot_dir}/modules#{suffix}.cgz") -- 2.23.0

1 0

[PATCH v2 lkp-tests 1/2] sbin/submit: add job into my queue
by Xiao Shenwei 25 Nov '20

25 Nov '20

add --my-queue parameter the job will be add into your own queue usage: submit --my-queue testbox=vm-2p8g ../jobs/borrow-1h.yaml Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- sbin/submit | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sbin/submit b/sbin/submit index 9bba1018..be588bed 100755 --- a/sbin/submit +++ b/sbin/submit @@ -16,6 +16,7 @@ opt_output_dir = nil opt_auto_define_files = false opt_monitor = false opt_monitor_query = {} +opt_my_queue = false actions = ['output', 'stop'] options = OptionParser.new do |opts| @@ -54,6 +55,11 @@ options = OptionParser.new do |opts| ARGV.shift end end + + opts.on('--my-queue', 'add to my queue') do + opt_my_queue = true + end + end options.parse!(ARGV) @@ -93,6 +99,10 @@ def find_jobfile(jobfile) exit 1 end +def add_my_queue(job) + job['queue'] = "#{job['tbox_group']}~#{ENV['USER']}" +end + ARGV.each do |jobfile| jobfile = find_jobfile(jobfile) jobs = Job2sh.new @@ -134,6 +144,7 @@ ARGV.each do |jobfile| job_hash_list << job_hash job_hash = job_hash.merge(sh_hash) + add_my_queue(job_hash) if opt_my_queue # save job to yaml if opt_output_dir prefix = File.join(opt_output_dir, File.basename(jobfile, '.yaml')) -- 2.23.0

2 1

[PATCH v2 compass-ci] doc/job/: add os_fields.md
by Zhang Yu 25 Nov '20

25 Nov '20

Add a document for introducing the os, os_version, os_arch fields Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- doc/job/os_fields.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/job/os_fields.md diff --git a/doc/job/os_fields.md b/doc/job/os_fields.md new file mode 100644 index 0000000..942f4b4 --- /dev/null +++ b/doc/job/os_fields.md @@ -0,0 +1,16 @@ +# os, os_version, os_arch + +Meaning: +- Each test tells which os it needs, and the os_version, os_arch are also need to be specified, + then the machine will run an os according to these three fields. +- These os, os_version, os_arch are the key for users to specify the os related parameters. +- If os, os_version, os_arch are not given by users, it will use the default openeuler os related parameters. +- Here are some examples: + os os_version os_arch + openeuler 20.03, 1.0 aarch64, x86_64 + debian sid, 10 aarch64, x86_64 + centos 7.6, 7.8 aarch64, x86_64 + ... + +Usage example: +- submit iperf.yaml testbox=vm-2p8g queue=vm-2p8g~$USER os=openeuler os_arch=aarch64 os_version=20.03 -- 2.23.0

1 0

[PATCH compass-ci] lib/job.cr: add my_ssh_pubkey
by Wu Zhende 25 Nov '20

25 Nov '20

Because pub_key is in sshd, and sshd is a hash. Hash will skip in "sh_export_top_env", So job.sh can't get the array pub_key to do password-free login. Add a new key "my_ssh_pubkey" in job to solve this problem. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/job.cr | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/job.cr b/src/lib/job.cr index 785daea..b533665 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -206,6 +206,7 @@ class Job sshd["pub_key"] = @account_info["my_ssh_pubkey"] @hash["sshd"] = JSON.parse(sshd.to_json) + @hash["my_ssh_pubkey"] = @account_info["my_ssh_pubkey"] end private def update_account_my_pub_key(pub_key) -- 2.23.0

1 0

[PATCH v2 compass-ci] add-software: add reminders
by Wang Chenglong 25 Nov '20

25 Nov '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/add-software/run | 2 ++ 1 file changed, 2 insertions(+) diff --git a/container/add-software/run b/container/add-software/run index 089efd2..62d4eff 100755 --- a/container/add-software/run +++ b/container/add-software/run @@ -9,6 +9,8 @@ 2> ./run /os/centos/aarch64/7.6.1810 $(show-depends-packages centos) centos is an adaption file contain packages mapping from debian to centos, the whole path is '$LKP_SRC/distro/adaptation/centos'. + [Remind] + This tool also works for openEuler. EOF exit } -- 2.23.0

1 0

[PATCH compass-ci] add-software: add reminders
by Wang Chenglong 25 Nov '20

25 Nov '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/add-software/run | 2 ++ 1 file changed, 2 insertions(+) diff --git a/container/add-software/run b/container/add-software/run index 089efd2..dcbb8f6 100755 --- a/container/add-software/run +++ b/container/add-software/run @@ -9,6 +9,8 @@ 2> ./run /os/centos/aarch64/7.6.1810 $(show-depends-packages centos) centos is an adaption file contain packages mapping from debian to centos, the whole path is '$LKP_SRC/distro/adaptation/centos'. + [Remind] + This tool also works for Openeuler. EOF exit } -- 2.23.0

2 2

[PATCH compass-ci] remove empty changes for metric compare result
by Lu Weitao 25 Nov '20

25 Nov '20

[Why] With template compare mode, it's useless return an empty changes for a metric like: { ... "tables": { "vmstat.system.cs": { ... "change": { "dimensions": [ "compare_dimension" ], "source": [ [ "8G", "16G" ] ] } } } [How] Skip assign metric change value, if the metric only have one dimension, the empty change will disappear automatically Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/compare_matrixes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compare_matrixes.rb b/lib/compare_matrixes.rb index 14c14cb..0b49e59 100644 --- a/lib/compare_matrixes.rb +++ b/lib/compare_matrixes.rb @@ -466,8 +466,8 @@ end def assign_metric_change(metrics_values) metrics_values.each do |metric, values| - metrics_values[metric]['change'] = {} next if values['average'].size < 2 + metrics_values[metric]['change'] = {} dimension_list = values['average'].keys dimension_groups = get_dimensions_combination(dimension_list) -- 2.23.0

1 0

[PATCH compass-ci] doc/job/: add os.md
by Zhang Yu 25 Nov '20

25 Nov '20

add a document for introducing the os field Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- doc/job/os.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/job/os.md diff --git a/doc/job/os.md b/doc/job/os.md new file mode 100644 index 0000000..0d0102c --- /dev/null +++ b/doc/job/os.md @@ -0,0 +1,14 @@ +# os + +Meaning: +- Each test tells which os is to be testing on, the vm will run a os according to different need. +- Os is a key for users to specify a os type. +- If os is not given by users, it will use the default debian. +- Here are the os type that we support: + openeuler + debian + centos + ... + +Usage example: +- submit iperf.yaml testbox=vm-2p8g queue=vm-2p8g~$USER os=openeuler os_arch=aarch64 os_version=20.03 os_mount=cifs -- 2.23.0

2 2

Re: [PATCH lkp-tests] stats/iperf: fix rubocop offenses
by Wei Jihui 25 Nov '20

25 Nov '20

hi, everyone, some lkp-tests's scripts is not our create, it is better not to modify them. Thanks, Jihui Reply-To: In-Reply-To: <20201125015157.2194483-1-2134782174(a)qq.com> On Wed, Nov 25, 2020 at 09:51:57AM +0800, Zhang Yu wrote: >Inspecting 1 file > >iperf:19:86: C: Style/IfUnlessModifier: Modifier form of if makes the line too long. >puts 'tcp.sender.bps: ' + obj['end']['streams'][0]['sender']['bits_per_second'].to_s if obj['end']['streams'][0]['sender'] > ^^ > >iperf:20:90: C: Style/IfUnlessModifier: Modifier form of if makes the line too long. >puts 'tcp.receiver.bps: ' + obj['end']['streams'][0]['receiver']['bits_per_second'].to_s if obj['end']['streams'][0]['receiver' > ^^ > >Signed-off-by: Zhang Yu <2134782174(a)qq.com> >--- > stats/iperf | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > >diff --git a/stats/iperf b/stats/iperf >index b5c6c403..f2521db6 100755 >--- a/stats/iperf >+++ b/stats/iperf >@@ -16,6 +16,12 @@ end > > exit if obj['end'].empty? > >-puts 'tcp.sender.bps: ' + obj['end']['streams'][0]['sender']['bits_per_second'].to_s if obj['end']['streams'][0]['sender'] >-puts 'tcp.receiver.bps: ' + obj['end']['streams'][0]['receiver']['bits_per_second'].to_s if obj['end']['streams'][0]['receiver'] >-puts 'udp.bps: ' + obj['end']['streams'][0]['udp']['bits_per_second'].to_s if obj['end']['streams'][0]['udp'] >+if obj['end']['streams'][0]['sender'] >+ puts 'tcp.sender.bps: ' + obj['end']['streams'][0]['sender']['bits_per_second'].to_s >+end >+if obj['end']['streams'][0]['receiver'] >+ puts 'tcp.receiver.bps: ' + obj['end']['streams'][0]['receiver']['bits_per_second'].to_s >+end >+if obj['end']['streams'][0]['udp'] >+ puts 'udp.bps: ' + obj['end']['streams'][0]['udp']['bits_per_second'].to_s >+end >-- >2.23.0 >

1 0

[PATCH lkp-tests] stats/iperf: fix rubocop offenses
by Zhang Yu 25 Nov '20

25 Nov '20

Inspecting 1 file iperf:19:86: C: Style/IfUnlessModifier: Modifier form of if makes the line too long. puts 'tcp.sender.bps: ' + obj['end']['streams'][0]['sender']['bits_per_second'].to_s if obj['end']['streams'][0]['sender'] ^^ iperf:20:90: C: Style/IfUnlessModifier: Modifier form of if makes the line too long. puts 'tcp.receiver.bps: ' + obj['end']['streams'][0]['receiver']['bits_per_second'].to_s if obj['end']['streams'][0]['receiver' ^^ Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- stats/iperf | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/stats/iperf b/stats/iperf index b5c6c403..f2521db6 100755 --- a/stats/iperf +++ b/stats/iperf @@ -16,6 +16,12 @@ end exit if obj['end'].empty? -puts 'tcp.sender.bps: ' + obj['end']['streams'][0]['sender']['bits_per_second'].to_s if obj['end']['streams'][0]['sender'] -puts 'tcp.receiver.bps: ' + obj['end']['streams'][0]['receiver']['bits_per_second'].to_s if obj['end']['streams'][0]['receiver'] -puts 'udp.bps: ' + obj['end']['streams'][0]['udp']['bits_per_second'].to_s if obj['end']['streams'][0]['udp'] +if obj['end']['streams'][0]['sender'] + puts 'tcp.sender.bps: ' + obj['end']['streams'][0]['sender']['bits_per_second'].to_s +end +if obj['end']['streams'][0]['receiver'] + puts 'tcp.receiver.bps: ' + obj['end']['streams'][0]['receiver']['bits_per_second'].to_s +end +if obj['end']['streams'][0]['udp'] + puts 'udp.bps: ' + obj['end']['streams'][0]['udp']['bits_per_second'].to_s +end -- 2.23.0

1 1