- Compass-ci - mailweb.openeuler.org

[PATCH v2 lkp-tests] jobs/: add os-arch-version-mount.yaml for multi-dimension test
by Li Ping 23 Feb '21

23 Feb '21

1 1

[PATCH compass-ci] container/scheduler/start: fix read config
by Wei Jihui 23 Feb '21

23 Feb '21

scheduler service need read config from /etc/compass-ci/[service|scheduler], not only /etc/compass-ci/default. Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- container/scheduler/start | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/container/scheduler/start b/container/scheduler/start index c32a7a8..4aaa71d 100755 --- a/container/scheduler/start +++ b/container/scheduler/start @@ -46,7 +46,6 @@ DEFAULT_CCI = "#{CCI_REPOS}/compass-ci" LAB = defaults['lab'] || 'z9' SCHED_PORT = defaults['SCHED_PORT'] SCHED_HOST = defaults['SCHED_HOST'] -DEFAULT_CONFIG_DIR = '/etc/compass-ci/defaults' docker_rm "s001-alpine-#{SCHED_PORT}" @@ -68,9 +67,9 @@ cmd = %W[ -e CCI_SRC=#{DEFAULT_CCI} -v #{ENV['LKP_SRC']}:#{DEFAULT_LKP} -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} - -v #{DEFAULT_CONFIG_DIR}:#{DEFAULT_CONFIG_DIR}:ro -v #{CCI_REPOS}/lab-#{LAB}:#{CCI_REPOS}/lab-#{LAB} -v /srv/cci/scheduler/alpine:/srv/cci/scheduler + -v /etc/compass-ci:/etc/compass-ci:ro -v /etc/localtime:/etc/localtime:ro -v /srv/result:/srv/result -v /srv/initrd:/srv/initrd:ro -- 2.23.0

1 0

[PATCH compass-ci] container/assign-account: optimize account login permission
by Luan Shengde 23 Feb '21

23 Feb '21

[why] the mail robot sets no keyword 'enable_login' when assigning account. the applied account via sending 'apply account' email was set no permission to login. before: set enable login: has key: enable_login key value: true set disable login has key: enable_login key value: false or has no key: enable_login now: set enable login: has key: enable_login key value: true set disable login: has key: enable_login key value: false keep the default: has no key: enable_login Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/assign-account/get_account_info.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/assign-account/get_account_info.rb b/container/assign-account/get_account_info.rb index 7e0a5a7..228d468 100755 --- a/container/assign-account/get_account_info.rb +++ b/container/assign-account/get_account_info.rb @@ -136,7 +136,7 @@ class AccountStorage def permit_login_config(login_name) if @data.key?('enable_login') && @data['enable_login'] %x(usermod -s /usr/bin/zsh #{login_name}) - else + elsif @data.key?('enable_login') && ! @data['enable_login'] %x(usermod -s /sbin/nologin #{login_name}) end end -- 2.23.0

1 0

[PATCH lab-z9] idle/*/multi-qemu.yaml: raid the added disk
by Cui Yili 23 Feb '21

23 Feb '21

Signed-off-by: Cui Yili <2268260388(a)qq.com> --- .../multi-qemu.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/multi-qemu.yaml b/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/multi-qemu.yaml index 8182a97..ed55c08 100644 --- a/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/multi-qemu.yaml +++ b/allot/idle/taishan200-2280-2s48p-256g--multi-qemu/multi-qemu.yaml @@ -1,8 +1,14 @@ suite: multi-qemu category: functional -disk: 1HDD -fs: ext4 +nr_hdd: {{nr_hdd_partitions}} +disk: + +md: + - RAID0 + +fs: + - ext4 simplify-ci: multi-qemu-0: -- 2.23.0

2 1

[PATCH compass-ci] sched: delete job.cgz from result root dir
by Cao Xueliang 22 Feb '21

22 Feb '21

We has the job.yaml and job.sh in result root dir, no need to save the job.cgz. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/scheduler/create_job_cpio.cr | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/scheduler/create_job_cpio.cr b/src/scheduler/create_job_cpio.cr index 1101a0f..51d79f7 100644 --- a/src/scheduler/create_job_cpio.cr +++ b/src/scheduler/create_job_cpio.cr @@ -134,8 +134,7 @@ class Sched # the job.yaml is not final version files = ["#{src_dir}/job.sh", - "#{src_dir}/job.yaml", - "#{src_dir}/job.cgz"] + "#{src_dir}/job.yaml"] FileUtils.cp(files, dst_dir) end end -- 2.23.0

1 0

[PATCH lkp-tests 2/2] spec/submit/link_jobs: replace latency_stats to perf-sched
by Wei Jihui 22 Feb '21

22 Feb '21

commit 4b1eaa97a0d7dd2455929c0734ed88631b1aa263: include/category/benchmark: replace latency_stats to perf-ddsched Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- ...4-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/submit/link_jobs1/job-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml b/spec/submit/link_jobs1/job-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml index 5457a131..0c3eb69d 100644 --- a/spec/submit/link_jobs1/job-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml +++ b/spec/submit/link_jobs1/job-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml @@ -51,7 +51,7 @@ meminfo: slabinfo: interrupts: lock_stat: -latency_stats: +perf-sched: softirqs: bdi_dev_mapping: diskstats: @@ -103,7 +103,7 @@ monitors: slabinfo: interrupts: lock_stat: - latency_stats: + perf-sched: softirqs: bdi_dev_mapping: diskstats: -- 2.23.0

1 0

[PATCH lkp-tests 1/2] spec/submit: update submit spec result
by Wei Jihui 22 Feb '21

22 Feb '21

all vm testboxs add hdd_partitions Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- spec/submit/job_on_fail/job-3000.yaml | 1 + ...1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml | 1 + spec/submit/link_jobs2/job-1000-2-100000ss-add.yaml | 1 + spec/submit/link_jobs2/job-10000-2-100000ss-add.yaml | 1 + spec/submit/link_jobs2/job-20-2-6000ss-cache.yaml | 1 + spec/submit/matrix/job-1-300-whetstone-double.yaml | 1 + spec/submit/matrix/job-3-300-shell1.yaml | 1 + spec/submit/merge_yaml/job-defaults.yaml | 1 + spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml | 1 + spec/submit/separate_yaml/job-10000-2-100000ss-add.yaml | 1 + spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml | 1 + 11 files changed, 11 insertions(+) diff --git a/spec/submit/job_on_fail/job-3000.yaml b/spec/submit/job_on_fail/job-3000.yaml index 11d89b2b..5d766ba0 100644 --- a/spec/submit/job_on_fail/job-3000.yaml +++ b/spec/submit/job_on_fail/job-3000.yaml @@ -11,6 +11,7 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 8G +hdd_partitions: "/dev/vda" arch: aarch64 cpufreq_governor: need_kconfig: diff --git a/spec/submit/link_jobs1/job-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml b/spec/submit/link_jobs1/job-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml index 466a2054..5457a131 100644 --- a/spec/submit/link_jobs1/job-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml +++ b/spec/submit/link_jobs1/job-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml @@ -34,6 +34,7 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 8G +hdd_partitions: "/dev/vda" arch: aarch64 kmsg: boot-time: diff --git a/spec/submit/link_jobs2/job-1000-2-100000ss-add.yaml b/spec/submit/link_jobs2/job-1000-2-100000ss-add.yaml index 9a613c00..d20eed7e 100644 --- a/spec/submit/link_jobs2/job-1000-2-100000ss-add.yaml +++ b/spec/submit/link_jobs2/job-1000-2-100000ss-add.yaml @@ -15,6 +15,7 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 8G +hdd_partitions: "/dev/vda" arch: aarch64 cpufreq_governor: need_kconfig: diff --git a/spec/submit/link_jobs2/job-10000-2-100000ss-add.yaml b/spec/submit/link_jobs2/job-10000-2-100000ss-add.yaml index 8bf52d0f..8df242aa 100644 --- a/spec/submit/link_jobs2/job-10000-2-100000ss-add.yaml +++ b/spec/submit/link_jobs2/job-10000-2-100000ss-add.yaml @@ -15,6 +15,7 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 8G +hdd_partitions: "/dev/vda" arch: aarch64 cpufreq_governor: need_kconfig: diff --git a/spec/submit/link_jobs2/job-20-2-6000ss-cache.yaml b/spec/submit/link_jobs2/job-20-2-6000ss-cache.yaml index 8cb78287..cf3a162b 100644 --- a/spec/submit/link_jobs2/job-20-2-6000ss-cache.yaml +++ b/spec/submit/link_jobs2/job-20-2-6000ss-cache.yaml @@ -15,6 +15,7 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 8G +hdd_partitions: "/dev/vda" arch: aarch64 cpufreq_governor: need_kconfig: diff --git a/spec/submit/matrix/job-1-300-whetstone-double.yaml b/spec/submit/matrix/job-1-300-whetstone-double.yaml index 78f79fa7..4ba40ba5 100644 --- a/spec/submit/matrix/job-1-300-whetstone-double.yaml +++ b/spec/submit/matrix/job-1-300-whetstone-double.yaml @@ -12,6 +12,7 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 8G +hdd_partitions: "/dev/vda" arch: aarch64 cpufreq_governor: need_kconfig: diff --git a/spec/submit/matrix/job-3-300-shell1.yaml b/spec/submit/matrix/job-3-300-shell1.yaml index afe5a953..294cbdd3 100644 --- a/spec/submit/matrix/job-3-300-shell1.yaml +++ b/spec/submit/matrix/job-3-300-shell1.yaml @@ -12,6 +12,7 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 8G +hdd_partitions: "/dev/vda" arch: aarch64 cpufreq_governor: need_kconfig: diff --git a/spec/submit/merge_yaml/job-defaults.yaml b/spec/submit/merge_yaml/job-defaults.yaml index f72fd6ac..ae2f3c39 100644 --- a/spec/submit/merge_yaml/job-defaults.yaml +++ b/spec/submit/merge_yaml/job-defaults.yaml @@ -9,6 +9,7 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 8G +hdd_partitions: "/dev/vda" arch: aarch64 cpufreq_governor: need_kconfig: diff --git a/spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml b/spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml index a2355b50..b7b0ef0e 100644 --- a/spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml +++ b/spec/submit/separate_yaml/job-1000-2-100000ss-add.yaml @@ -13,6 +13,7 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 8G +hdd_partitions: "/dev/vda" arch: aarch64 cpufreq_governor: need_kconfig: diff --git a/spec/submit/separate_yaml/job-10000-2-100000ss-add.yaml b/spec/submit/separate_yaml/job-10000-2-100000ss-add.yaml index 8a6317cb..144fba5a 100644 --- a/spec/submit/separate_yaml/job-10000-2-100000ss-add.yaml +++ b/spec/submit/separate_yaml/job-10000-2-100000ss-add.yaml @@ -13,6 +13,7 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 8G +hdd_partitions: "/dev/vda" arch: aarch64 cpufreq_governor: need_kconfig: diff --git a/spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml b/spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml index 15701ad0..74c4e380 100644 --- a/spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml +++ b/spec/submit/separate_yaml/job-20-2-6000ss-cache.yaml @@ -13,6 +13,7 @@ template: kvm nr_node: 1 nr_cpu: 2 memory: 8G +hdd_partitions: "/dev/vda" arch: aarch64 cpufreq_governor: need_kconfig: -- 2.23.0

1 0

[PATCH compass-ci] lib/git_mirror.rb: only store necessary info to es
by Li Yuanchao 22 Feb '21

22 Feb '21

As the config become more, the old way will store more and more info to es, and they are not all necessary, and their changes sometimes will cause conflict with old data in es. So only store necessary info now. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 346352b..76cdd1b 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -288,8 +288,8 @@ class MirrorMain end def es_repo_update(git_repo) - repo_info = @git_info[git_repo].merge(@fork_stat[git_repo]) - repo_info.delete(:cur_refs) if repo_info.key?(:cur_refs) + repo_info = { 'git_repo' => git_repo, 'url' => @git_info[git_repo]['url'] } + repo_info = repo_info.merge(@fork_stat[git_repo]) body = { "doc": repo_info, "doc_as_upsert": true -- 2.23.0

1 0

[PATCH v3 compass-ci 4/4] container/mail-robot: update mail model
by Luan Shengde 22 Feb '21

22 Feb '21

[why] key work is renamed: 'my oss commit' => 'my_oss_commit' Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/mail-robot/lib/assign-account-fail-eamil.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container/mail-robot/lib/assign-account-fail-eamil.rb b/container/mail-robot/lib/assign-account-fail-eamil.rb index 3597159..3169235 100755 --- a/container/mail-robot/lib/assign-account-fail-eamil.rb +++ b/container/mail-robot/lib/assign-account-fail-eamil.rb @@ -11,17 +11,17 @@ def email_err_message(message) You should add a commit url for the 'apply account' email. For example: - my oss commit: https://github.com/torvalds/linux/commit/7be74942f184fdfba34ddd19a0d995deb3… + my_oss_commit: https://github.com/torvalds/linux/commit/7be74942f184fdfba34ddd19a0d995deb3… EMAIL_MESSAGE when 'URL_PREFIX_ERR' err_message = <<~EMAIL_MESSAGE Please add a correct prefix for the commit url. - my oss commit + my_oss_commit For example: - my oss commit: https://github.com/torvalds/linux/commit/7be74942f184fdfba34ddd19a0d995deb3… + my_oss_commit: https://github.com/torvalds/linux/commit/7be74942f184fdfba34ddd19a0d995deb3… EMAIL_MESSAGE when 'NOT_REGISTERED' err_message = <<~EMAIL_MESSAGE -- 2.23.0

1 0

[PATCH v3 compass-ci 3/4] container/mail-robot: add login message
by Luan Shengde 22 Feb '21

22 Feb '21

add login command for account VM server. case forwarded user info has key account_vm with value: yes/true, the email will send the login command. Signed-off-by: Luan Shengde <shdluan(a)163.com> --- .../mail-robot/lib/assign-account-email.rb | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/container/mail-robot/lib/assign-account-email.rb b/container/mail-robot/lib/assign-account-email.rb index b71b3fe..2171de7 100755 --- a/container/mail-robot/lib/assign-account-email.rb +++ b/container/mail-robot/lib/assign-account-email.rb @@ -3,13 +3,26 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. # frozen_string_literal: true -def build_apply_account_email(my_info) +def build_apply_account_email(my_info, account_info, assign_account_vm) email_greeting = if my_info['bisect'] 'We have automatically created the following information for you.' else 'Thank you for joining us.' end + login_msg = <<~LOGIN_MSG + + You can use the following command to login the jumper server: + + Login command: + ssh -p #{account_info['jumper_port']} #{account_info['my_login_name']}@#{account_info['jumper_host']} + + Account password: + #{account_info['my_password']} + LOGIN_MSG + + login_account_vm = assign_account_vm ? login_msg : '' + email_msg = <<~EMAIL_MESSAGE To: #{my_info['my_email']} Subject: [compass-ci] Account Ready @@ -17,8 +30,8 @@ def build_apply_account_email(my_info) Dear #{my_info['my_name']}, #{email_greeting} - - You can use the following info to submit jobs: + #{login_account_vm} + You need to do the following configurations before submitting a job: notice: (1-2) are ONE-TIME setup -- 2.23.0

1 0