- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] container/fluentd: renamed master-fluentd
by Wu Zhende 28 Oct '20

28 Oct '20

[Why] Now, we have "sub-fluentd" and "fluentd". "fluentd" doesn't show the relationship well. Use "sub-fluentd" and "master-fluentd" can ben better. "sub-fluentd" send logs to "master-fluentd". And use MASTER_FLUENTD_HOST(PORT) replace FLUENTD_SERVER_HOST(PORT). When we see MASTER_FLUENTD_HOST can know it means master-fluentd's host Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/{fluentd => master-fluentd}/Dockerfile | 0 container/{fluentd => master-fluentd}/build | 0 container/{fluentd => master-fluentd}/build-depends | 0 .../{fluentd => master-fluentd}/docker-fluentd.conf | 0 container/{fluentd => master-fluentd}/start | 0 container/scheduler/start | 10 +++++----- container/sub-fluentd/docker-fluentd.conf | 8 ++++---- container/sub-fluentd/start | 8 ++++---- sparrow/3-code/dev-env | 8 ++++---- src/lib/sched.cr | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) rename container/{fluentd => master-fluentd}/Dockerfile (100%) rename container/{fluentd => master-fluentd}/build (100%) rename container/{fluentd => master-fluentd}/build-depends (100%) rename container/{fluentd => master-fluentd}/docker-fluentd.conf (100%) rename container/{fluentd => master-fluentd}/start (100%) diff --git a/container/fluentd/Dockerfile b/container/master-fluentd/Dockerfile similarity index 100% rename from container/fluentd/Dockerfile rename to container/master-fluentd/Dockerfile diff --git a/container/fluentd/build b/container/master-fluentd/build similarity index 100% rename from container/fluentd/build rename to container/master-fluentd/build diff --git a/container/fluentd/build-depends b/container/master-fluentd/build-depends similarity index 100% rename from container/fluentd/build-depends rename to container/master-fluentd/build-depends diff --git a/container/fluentd/docker-fluentd.conf b/container/master-fluentd/docker-fluentd.conf similarity index 100% rename from container/fluentd/docker-fluentd.conf rename to container/master-fluentd/docker-fluentd.conf diff --git a/container/fluentd/start b/container/master-fluentd/start similarity index 100% rename from container/fluentd/start rename to container/master-fluentd/start diff --git a/container/scheduler/start b/container/scheduler/start index 8ca12f0..6898d4b 100755 --- a/container/scheduler/start +++ b/container/scheduler/start @@ -20,8 +20,8 @@ names = Set.new %w[ TASKQUEUE_PORT TASKQUEUE_HOST GIT_SERVER - FLUENTD_SERVER_HOST - FLUENTD_SERVER_PORT + MASTER_FLUENTD_HOST + MASTER_FLUENTD_PORT SSHR_PORT SSHR_PORT_BASE SSHR_PORT_LEN @@ -40,7 +40,7 @@ DEFAULT_CCI = "#{CCI_REPOS}/compass-ci" LAB = defaults['lab'] || 'z9' SCHED_PORT = defaults['SCHED_PORT'] || '3000' SCHED_HOST = defaults['SCHED_HOST'] || '172.17.0.1' -FLUENTD_SERVER_PORT = defaults['FLUENTD_SERVER_PORT'] || '24224' +MASTER_FLUENTD_PORT = defaults['MASTER_FLUENTD_PORT'] || '24224' DEFAULT_CONFIG_DIR = '/etc/compass-ci/defaults' docker_rm "s001-alpine-#{SCHED_PORT}" @@ -64,8 +64,8 @@ cmd = %W[ -e SCHED_HOST=#{SCHED_HOST} -e SCHED_PORT=#{SCHED_PORT} -e GIT_SERVER=#{defaults["GIT_SERVER"]} - -e FLUENTD_SERVER_HOST=#{defaults["FLUENTD_SERVER_HOST"]} - -e FLUENTD_SERVER_PORT=#{FLUENTD_SERVER_PORT} + -e MASTER_FLUENTD_HOST=#{defaults["MASTER_FLUENTD_HOST"]} + -e MASTER_FLUENTD_PORT=#{MASTER_FLUENTD_PORT} -v #{ENV['LKP_SRC']}:#{DEFAULT_LKP} -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} -v #{DEFAULT_CONFIG_DIR}:#{DEFAULT_CONFIG_DIR}:ro diff --git a/container/sub-fluentd/docker-fluentd.conf b/container/sub-fluentd/docker-fluentd.conf index 0092982..c674fb1 100644 --- a/container/sub-fluentd/docker-fluentd.conf +++ b/container/sub-fluentd/docker-fluentd.conf @@ -21,8 +21,8 @@ keepalive true <server> name myserver - host "#{ENV['FLUENTD_SERVER_HOST']}" - port "#{ENV['FLUENTD_SERVER_PORT']}" + host "#{ENV['MASTER_FLUENTD_HOST']}" + port "#{ENV['MASTER_FLUENTD_PORT']}" </server> <buffer tag> chunk_limit_size 1M @@ -62,8 +62,8 @@ hard_timeout 60 <server> master-fluentd - host "#{ENV['FLUENTD_SERVER_HOST']}" - port "#{ENV['FLUENTD_SERVER_PORT']}" + host "#{ENV['MASTER_FLUENTD_HOST']}" + port "#{ENV['MASTER_FLUENTD_PORT']}" </server> </store> </match> diff --git a/container/sub-fluentd/start b/container/sub-fluentd/start index 53a74c4..adbfbc3 100755 --- a/container/sub-fluentd/start +++ b/container/sub-fluentd/start @@ -7,14 +7,14 @@ require 'set' require_relative '../defconfig.rb' names = Set.new %w[ - FLUENTD_SERVER_HOST - FLUENTD_SERVER_PORT + MASTER_FLUENTD_HOST + MASTER_FLUENTD_PORT ] defaults = relevant_defaults(names) -defaults['FLUENTD_SERVER_PORT'] ||= '24224' +defaults['MASTER_FLUENTD_PORT'] ||= '24224' env = docker_env(defaults) -raise 'must config FLUENTD_SERVER_HOST' unless defaults['FLUENTD_SERVER_HOST'] +raise 'must config MASTER_FLUENTD_HOST' unless defaults['MASTER_FLUENTD_HOST'] docker_rm 'sub-fluentd' diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 11c7fb0..87431be 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -8,8 +8,8 @@ server_ip=$(ip route get 1.2.3.4 | awk '{print $7; exit}') : ${sched_port:=3000} : ${gitcache_host:=$server_ip} : ${gitcache_port:=5000} -: ${FLUENTD_SERVER_HOST:=$server_ip} -: ${FLUENTD_SERVER_PORT:=24224} +: ${MASTER_FLUENTD_HOST:=$server_ip} +: ${MASTER_FLUENTD_PORT:=24224} : ${DOCKER_REGISTRY_HOST:=$server_ip} : ${DOCKER_REGISTRY_PORT:=5001} @@ -22,8 +22,8 @@ INITRD_HTTP_HOST: $initrd_http_host INITRD_HTTP_PORT: $initrd_http_port GITCACHE_HOST: $gitcache_host GITCACHE_PORT: $gitcache_port -FLUENTD_SERVER_HOST: $FLUENTD_SERVER_HOST -FLUENTD_SERVER_PORT: $FLUENTD_SERVER_PORT +MASTER_FLUENTD_HOST: $MASTER_FLUENTD_HOST +MASTER_FLUENTD_PORT: $MASTER_FLUENTD_PORT DOCKER_REGISTRY_HOST: $DOCKER_REGISTRY_HOST DOCKER_REGISTRY_PORT: $DOCKER_REGISTRY_PORT EOF diff --git a/src/lib/sched.cr b/src/lib/sched.cr index c32091f..feedef3 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -488,8 +488,8 @@ class Sched full_path_patterns = "#{ENV["CCI_REPOS"]}/lab-#{ENV["lab"]}/allot/idle/#{tbox_group}/*.yaml" extra_job_fields = [ "idle_job=true", - "FLUENTD_SERVER_HOST=#{ENV["FLUENTD_SERVER_HOST"]}", - "FLUENTD_SERVER_PORT=#{ENV["FLUENTD_SERVER_PORT"]}", + "MASTER_FLUENTD_HOST=#{ENV["MASTER_FLUENTD_HOST"]}", + "MASTER_FLUENTD_PORT=#{ENV["MASTER_FLUENTD_PORT"]}", ] Jobfile::Operate.auto_submit_job( -- 2.23.0

1 0

[PATCH compass-ci] lib/sched.cr: fix ameba warning
by Wu Zhende 28 Oct '20

28 Oct '20

[Why] fix ameba warning. def submit_job() begin xxx rescue xxx end end [How] def submit_job() xxx rescue xxx end [warning info] /code/compass-ci/src/lib/sched.cr:162:3 [C] Style/RedundantBegin: Redundant `begin` block detected > def submit_job(env : HTTP::Server::Context) ^ Finished in 132.19 milliseconds 1 inspected, 1 failure. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/lib/sched.cr | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index c32091f..f3a7b1c 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -160,32 +160,30 @@ class Sched end def submit_job(env : HTTP::Server::Context) - begin - body = env.request.body.not_nil!.gets_to_end - - job_content = JSON.parse(body) - job = Job.new(job_content, job_content["id"]?) - job["commit_date"] = get_commit_date(job) - - # it is not a cluster job if cluster field is empty or - # field's prefix is 'cs-localhost' - cluster_file = job["cluster"] - if cluster_file.empty? || cluster_file.starts_with?("cs-localhost") - return submit_single_job(job) - else - cluster_config = get_cluster_config(cluster_file, - job.lkp_initrd_user, - job.os_arch) - return submit_cluster_job(job, cluster_config) - end - rescue ex - puts ex.inspect_with_backtrace - return [{ - "job_id" => "0", - "message" => ex.to_s, - "job_state" => "submit", - }] + body = env.request.body.not_nil!.gets_to_end + + job_content = JSON.parse(body) + job = Job.new(job_content, job_content["id"]?) + job["commit_date"] = get_commit_date(job) + + # it is not a cluster job if cluster field is empty or + # field's prefix is 'cs-localhost' + cluster_file = job["cluster"] + if cluster_file.empty? || cluster_file.starts_with?("cs-localhost") + return submit_single_job(job) + else + cluster_config = get_cluster_config(cluster_file, + job.lkp_initrd_user, + job.os_arch) + return submit_cluster_job(job, cluster_config) end + rescue ex + puts ex.inspect_with_backtrace + return [{ + "job_id" => "0", + "message" => ex.to_s, + "job_state" => "submit", + }] end # return: -- 2.23.0

3 3

[PATCH compass-ci] sparrow/0-package/os: skip when intsall failed
by Xu Xijian 28 Oct '20

28 Oct '20

[why] When install several packages, if one of them is installed failed, should go ahead to install next packages. [how] Add "--skip-broken" for "yum install" cmd. Add "--fix-missing" for "apt-get install" cmd. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- sparrow/0-package/os/centos | 2 +- sparrow/0-package/os/debian | 2 +- sparrow/0-package/os/openEuler | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sparrow/0-package/os/centos b/sparrow/0-package/os/centos index 261592c..4243f99 100755 --- a/sparrow/0-package/os/centos +++ b/sparrow/0-package/os/centos @@ -22,4 +22,4 @@ pkgs=( busybox ) -yum install -y "${pkgs[@]}" +yum install -y --skip-broken "${pkgs[@]}" diff --git a/sparrow/0-package/os/debian b/sparrow/0-package/os/debian index 020c34a..16ef0a9 100755 --- a/sparrow/0-package/os/debian +++ b/sparrow/0-package/os/debian @@ -20,4 +20,4 @@ pkgs=( busybox ) -apt-get install -y "${pkgs[@]}" +apt-get install -y --fix-missing "${pkgs[@]}" diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index 5c64fe8..ba298c8 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -21,7 +21,7 @@ pkgs=( busybox ) -yum install -y "${pkgs[@]}" +yum install -y --skip-broken "${pkgs[@]}" wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… -- 2.23.0

1 0

[PATCH lab-z9 2/2] change rollback to no << format, until lkp support.
by Zhang Dewan 28 Oct '20

28 Oct '20

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- hosts/taishan200-2280-2s48p-256g--a101 | 4 +++- hosts/taishan200-2280-2s48p-256g--a103 | 4 +++- hosts/taishan200-2280-2s48p-256g--a104 | 4 +++- hosts/taishan200-2280-2s48p-256g--a106 | 4 +++- hosts/taishan200-2280-2s48p-256g--a107 | 4 +++- hosts/taishan200-2280-2s48p-256g--a11 | 4 +++- hosts/taishan200-2280-2s48p-256g--a13 | 4 +++- hosts/taishan200-2280-2s48p-256g--a14 | 4 +++- hosts/taishan200-2280-2s48p-256g--a15 | 4 +++- hosts/taishan200-2280-2s48p-256g--a16 | 4 +++- hosts/taishan200-2280-2s48p-256g--a17 | 4 +++- hosts/taishan200-2280-2s48p-256g--a18 | 4 +++- hosts/taishan200-2280-2s48p-256g--a19 | 4 +++- hosts/taishan200-2280-2s48p-256g--a21 | 4 +++- hosts/taishan200-2280-2s48p-256g--a22 | 4 +++- hosts/taishan200-2280-2s48p-256g--a24 | 4 +++- hosts/taishan200-2280-2s48p-256g--a25 | 4 +++- hosts/taishan200-2280-2s48p-256g--a26 | 4 +++- hosts/taishan200-2280-2s48p-256g--a27 | 4 +++- hosts/taishan200-2280-2s48p-256g--a28 | 4 +++- hosts/taishan200-2280-2s48p-256g--a29 | 4 +++- hosts/taishan200-2280-2s48p-256g--a30 | 4 +++- hosts/taishan200-2280-2s48p-256g--a31 | 4 +++- hosts/taishan200-2280-2s48p-256g--a32 | 4 +++- hosts/taishan200-2280-2s48p-256g--a33 | 4 +++- hosts/taishan200-2280-2s48p-256g--a34 | 4 +++- hosts/taishan200-2280-2s48p-256g--a35 | 4 +++- hosts/taishan200-2280-2s48p-256g--a52 | 4 +++- hosts/taishan200-2280-2s48p-256g--a53 | 4 +++- hosts/taishan200-2280-2s48p-256g--a60 | 4 +++- hosts/taishan200-2280-2s48p-256g--a61 | 4 +++- hosts/taishan200-2280-2s48p-256g--a62 | 4 +++- hosts/taishan200-2280-2s48p-256g--a63 | 4 +++- hosts/taishan200-2280-2s48p-256g--a66 | 4 +++- hosts/taishan200-2280-2s48p-256g--a67 | 4 +++- hosts/taishan200-2280-2s48p-256g--a68 | 4 +++- hosts/taishan200-2280-2s48p-256g--a69 | 4 +++- hosts/taishan200-2280-2s48p-256g--a70 | 4 +++- hosts/taishan200-2280-2s48p-256g--a71 | 4 +++- hosts/taishan200-2280-2s48p-256g--a87 | 4 +++- hosts/taishan200-2280-2s48p-512g--a102 | 4 +++- hosts/taishan200-2280-2s48p-512g--a105 | 4 +++- hosts/taishan200-2280-2s48p-512g--a95 | 4 +++- hosts/taishan200-2280-2s64p-256g--a10 | 4 +++- hosts/taishan200-2280-2s64p-256g--a3 | 4 +++- hosts/taishan200-2280-2s64p-256g--a36 | 4 +++- hosts/taishan200-2280-2s64p-256g--a4 | 4 +++- hosts/taishan200-2280-2s64p-256g--a40 | 4 +++- hosts/taishan200-2280-2s64p-256g--a41 | 4 +++- hosts/taishan200-2280-2s64p-256g--a42 | 4 +++- hosts/taishan200-2280-2s64p-256g--a8 | 4 +++- hosts/taishan200-2280-2s64p-256g--a9 | 4 +++- 52 files changed, 156 insertions(+), 52 deletions(-) diff --git a/hosts/taishan200-2280-2s48p-256g--a101 b/hosts/taishan200-2280-2s48p-256g--a101 index b84e555..e085dea 100644 --- a/hosts/taishan200-2280-2s48p-256g--a101 +++ b/hosts/taishan200-2280-2s48p-256g--a101 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 2 nr_ssd_partitions: 1 hdd_partitions: diff --git a/hosts/taishan200-2280-2s48p-256g--a103 b/hosts/taishan200-2280-2s48p-256g--a103 index c0685c2..cd49a09 100644 --- a/hosts/taishan200-2280-2s48p-256g--a103 +++ b/hosts/taishan200-2280-2s48p-256g--a103 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bdc69 diff --git a/hosts/taishan200-2280-2s48p-256g--a104 b/hosts/taishan200-2280-2s48p-256g--a104 index 51f0f8c..27fac67 100644 --- a/hosts/taishan200-2280-2s48p-256g--a104 +++ b/hosts/taishan200-2280-2s48p-256g--a104 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8892431 diff --git a/hosts/taishan200-2280-2s48p-256g--a106 b/hosts/taishan200-2280-2s48p-256g--a106 index 1219bcc..0e4787e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a106 +++ b/hosts/taishan200-2280-2s48p-256g--a106 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883bf99 diff --git a/hosts/taishan200-2280-2s48p-256g--a107 b/hosts/taishan200-2280-2s48p-256g--a107 index 3ec9f39..e62298c 100644 --- a/hosts/taishan200-2280-2s48p-256g--a107 +++ b/hosts/taishan200-2280-2s48p-256g--a107 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8917c39 diff --git a/hosts/taishan200-2280-2s48p-256g--a11 b/hosts/taishan200-2280-2s48p-256g--a11 index 142b44e..db79d95 100644 --- a/hosts/taishan200-2280-2s48p-256g--a11 +++ b/hosts/taishan200-2280-2s48p-256g--a11 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8891431-part1 diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 index 173a2bf..24fe52f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a13 +++ b/hosts/taishan200-2280-2s48p-256g--a13 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500c2799bb3 diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 index 3e70159..e8f3f53 100644 --- a/hosts/taishan200-2280-2s48p-256g--a14 +++ b/hosts/taishan200-2280-2s48p-256g--a14 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4475 diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 index 8ac1654..0a945f1 100644 --- a/hosts/taishan200-2280-2s48p-256g--a15 +++ b/hosts/taishan200-2280-2s48p-256g--a15 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b841fff5 diff --git a/hosts/taishan200-2280-2s48p-256g--a16 b/hosts/taishan200-2280-2s48p-256g--a16 index 1355932..30caaca 100644 --- a/hosts/taishan200-2280-2s48p-256g--a16 +++ b/hosts/taishan200-2280-2s48p-256g--a16 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf271 diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 index 5d4fe01..9bfeea4 100644 --- a/hosts/taishan200-2280-2s48p-256g--a17 +++ b/hosts/taishan200-2280-2s48p-256g--a17 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b44cd diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 index 3e36555..c3f9288 100644 --- a/hosts/taishan200-2280-2s48p-256g--a18 +++ b/hosts/taishan200-2280-2s48p-256g--a18 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b891b4d1 diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 index f7233e4..9113f7e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a19 +++ b/hosts/taishan200-2280-2s48p-256g--a19 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8923939 diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 index 8331e55..0156a85 100644 --- a/hosts/taishan200-2280-2s48p-256g--a21 +++ b/hosts/taishan200-2280-2s48p-256g--a21 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf2d5 diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 index 94549a9..0c3e0cb 100644 --- a/hosts/taishan200-2280-2s48p-256g--a22 +++ b/hosts/taishan200-2280-2s48p-256g--a22 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919069 diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 index df8bd3c..cf6f0ea 100644 --- a/hosts/taishan200-2280-2s48p-256g--a24 +++ b/hosts/taishan200-2280-2s48p-256g--a24 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8917d59 diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 index eb0ba8e..3d81057 100644 --- a/hosts/taishan200-2280-2s48p-256g--a25 +++ b/hosts/taishan200-2280-2s48p-256g--a25 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4499 diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 index 1f8136a..cf18490 100644 --- a/hosts/taishan200-2280-2s48p-256g--a26 +++ b/hosts/taishan200-2280-2s48p-256g--a26 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf131 diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 index 25b076f..4ae374a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a27 +++ b/hosts/taishan200-2280-2s48p-256g--a27 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918ea9 diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 index 2901c3e..c62b080 100644 --- a/hosts/taishan200-2280-2s48p-256g--a28 +++ b/hosts/taishan200-2280-2s48p-256g--a28 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500cdf1eb07 diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 index f1fdd6b..f189981 100644 --- a/hosts/taishan200-2280-2s48p-256g--a29 +++ b/hosts/taishan200-2280-2s48p-256g--a29 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918425 diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 index 2dbc84f..7d02b00 100644 --- a/hosts/taishan200-2280-2s48p-256g--a30 +++ b/hosts/taishan200-2280-2s48p-256g--a30 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883b881 diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 index 085a150..838ce10 100644 --- a/hosts/taishan200-2280-2s48p-256g--a31 +++ b/hosts/taishan200-2280-2s48p-256g--a31 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883b929 diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 index 0f3396c..b9439e5 100644 --- a/hosts/taishan200-2280-2s48p-256g--a32 +++ b/hosts/taishan200-2280-2s48p-256g--a32 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf141 diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 index dba4da1..9e27a1b 100644 --- a/hosts/taishan200-2280-2s48p-256g--a33 +++ b/hosts/taishan200-2280-2s48p-256g--a33 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919555 diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 index f32c952..67ebf3e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a34 +++ b/hosts/taishan200-2280-2s48p-256g--a34 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be219 diff --git a/hosts/taishan200-2280-2s48p-256g--a35 b/hosts/taishan200-2280-2s48p-256g--a35 index 7eb3c79..fcc4816 100644 --- a/hosts/taishan200-2280-2s48p-256g--a35 +++ b/hosts/taishan200-2280-2s48p-256g--a35 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 4 hdd_partitions: - /dev/disk/by-id/scsi-350000399886a71a5 diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 index be10a77..4245b1e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a52 +++ b/hosts/taishan200-2280-2s48p-256g--a52 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500cdefd89b diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 index 546e5ef..2ec92dd 100644 --- a/hosts/taishan200-2280-2s48p-256g--a53 +++ b/hosts/taishan200-2280-2s48p-256g--a53 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6aa4e3 diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 index 0bf91a1..fc565a2 100644 --- a/hosts/taishan200-2280-2s48p-256g--a60 +++ b/hosts/taishan200-2280-2s48p-256g--a60 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd67640b diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 index 48f4251..9bbbadb 100644 --- a/hosts/taishan200-2280-2s48p-256g--a61 +++ b/hosts/taishan200-2280-2s48p-256g--a61 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399886a7869 diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 index 9c1218f..f4eac99 100644 --- a/hosts/taishan200-2280-2s48p-256g--a62 +++ b/hosts/taishan200-2280-2s48p-256g--a62 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b892d131 diff --git a/hosts/taishan200-2280-2s48p-256g--a63 b/hosts/taishan200-2280-2s48p-256g--a63 index cab9044..3101584 100644 --- a/hosts/taishan200-2280-2s48p-256g--a63 +++ b/hosts/taishan200-2280-2s48p-256g--a63 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399886b0431 diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 index 081ec02..e906139 100644 --- a/hosts/taishan200-2280-2s48p-256g--a66 +++ b/hosts/taishan200-2280-2s48p-256g--a66 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c5009a671773 diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 index 2009165..3439715 100644 --- a/hosts/taishan200-2280-2s48p-256g--a67 +++ b/hosts/taishan200-2280-2s48p-256g--a67 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88aed21 diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 index 5bc660a..529ed02 100644 --- a/hosts/taishan200-2280-2s48p-256g--a68 +++ b/hosts/taishan200-2280-2s48p-256g--a68 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8909f81 diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 index 4a5ad9a..475c8df 100644 --- a/hosts/taishan200-2280-2s48p-256g--a69 +++ b/hosts/taishan200-2280-2s48p-256g--a69 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be92d diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 index 75d114d..efd3c33 100644 --- a/hosts/taishan200-2280-2s48p-256g--a70 +++ b/hosts/taishan200-2280-2s48p-256g--a70 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b890931d diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 index cc20212..041edb7 100644 --- a/hosts/taishan200-2280-2s48p-256g--a71 +++ b/hosts/taishan200-2280-2s48p-256g--a71 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 mac_addr: - 44:67:47:d7:6d:e6 - 44:67:47:d7:6d:e7 diff --git a/hosts/taishan200-2280-2s48p-256g--a87 b/hosts/taishan200-2280-2s48p-256g--a87 index 381d8bf..1a307ba 100644 --- a/hosts/taishan200-2280-2s48p-256g--a87 +++ b/hosts/taishan200-2280-2s48p-256g--a87 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-256g +nr_node: 4 +nr_cpu: 96 +memory: 256 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399886a6b55 diff --git a/hosts/taishan200-2280-2s48p-512g--a102 b/hosts/taishan200-2280-2s48p-512g--a102 index 2e1ad9a..696990a 100644 --- a/hosts/taishan200-2280-2s48p-512g--a102 +++ b/hosts/taishan200-2280-2s48p-512g--a102 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-512g +nr_node: 4 +nr_cpu: 96 +memory: 512 nr_hdd_partitions: 1 nr_ssd_partitions: 3 hdd_partitions: diff --git a/hosts/taishan200-2280-2s48p-512g--a105 b/hosts/taishan200-2280-2s48p-512g--a105 index b164f04..e8f93eb 100644 --- a/hosts/taishan200-2280-2s48p-512g--a105 +++ b/hosts/taishan200-2280-2s48p-512g--a105 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-512g +nr_node: 4 +nr_cpu: 96 +memory: 512 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b891945d diff --git a/hosts/taishan200-2280-2s48p-512g--a95 b/hosts/taishan200-2280-2s48p-512g--a95 index 0e88e91..f1484ef 100644 --- a/hosts/taishan200-2280-2s48p-512g--a95 +++ b/hosts/taishan200-2280-2s48p-512g--a95 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s48p-512g +nr_node: 4 +nr_cpu: 96 +memory: 512 nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000039988792e31 diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 index f34dc96..bd65c59 100644 --- a/hosts/taishan200-2280-2s64p-256g--a10 +++ b/hosts/taishan200-2280-2s64p-256g--a10 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_ssd_partitions: 1 rootfs_partition: - /dev/disk/by-id/scsi-350000399c8030fd5 diff --git a/hosts/taishan200-2280-2s64p-256g--a3 b/hosts/taishan200-2280-2s64p-256g--a3 index f372df5..c363a13 100644 --- a/hosts/taishan200-2280-2s64p-256g--a3 +++ b/hosts/taishan200-2280-2s64p-256g--a3 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_ssd_partitions: 3 ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43895-part1 diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 index 4fa59e0..d11c173 100644 --- a/hosts/taishan200-2280-2s64p-256g--a36 +++ b/hosts/taishan200-2280-2s64p-256g--a36 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_ssd_partitions: 2 rootfs_partition: - /dev/disk/by-id/scsi-3500003999813487d diff --git a/hosts/taishan200-2280-2s64p-256g--a4 b/hosts/taishan200-2280-2s64p-256g--a4 index d00ac8a..b475b9a 100644 --- a/hosts/taishan200-2280-2s64p-256g--a4 +++ b/hosts/taishan200-2280-2s64p-256g--a4 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_ssd_partitions: 3 ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43892-part1 diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 index a914a29..59a79f5 100644 --- a/hosts/taishan200-2280-2s64p-256g--a40 +++ b/hosts/taishan200-2280-2s64p-256g--a40 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-3500003999812ed81 diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 index 6291741..d173c47 100644 --- a/hosts/taishan200-2280-2s64p-256g--a41 +++ b/hosts/taishan200-2280-2s64p-256g--a41 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919495 diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 index 32b9b00..6eed801 100644 --- a/hosts/taishan200-2280-2s64p-256g--a42 +++ b/hosts/taishan200-2280-2s64p-256g--a42 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918a11 diff --git a/hosts/taishan200-2280-2s64p-256g--a8 b/hosts/taishan200-2280-2s64p-256g--a8 index 582ee27..48cf470 100644 --- a/hosts/taishan200-2280-2s64p-256g--a8 +++ b/hosts/taishan200-2280-2s64p-256g--a8 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 rootfs_partition: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43325 mac_addr: diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 index 876c586..55e4a1e 100644 --- a/hosts/taishan200-2280-2s64p-256g--a9 +++ b/hosts/taishan200-2280-2s64p-256g--a9 @@ -1,4 +1,6 @@ -<<: taishan200-2280-2s64p-256g +nr_node: 4 +nr_cpu: 128 +memory: 256 nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6a1347 -- 2.23.0

1 0

[PATCH lab-z9 1/2] add and modify host-file, file change as "<<: $testbox_group"
by Zhang Dewan 28 Oct '20

28 Oct '20

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- hosts/taishan200-2280-2s48p-256g--a101 | 8 +++---- hosts/taishan200-2280-2s48p-256g--a103 | 23 +++++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a104 | 23 +++++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a106 | 23 +++++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a107 | 23 +++++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a11 | 5 +--- hosts/taishan200-2280-2s48p-256g--a13 | 5 +--- hosts/taishan200-2280-2s48p-256g--a14 | 5 +--- hosts/taishan200-2280-2s48p-256g--a15 | 5 +--- hosts/taishan200-2280-2s48p-256g--a16 | 19 +++++++++++++++ hosts/taishan200-2280-2s48p-256g--a17 | 5 +--- hosts/taishan200-2280-2s48p-256g--a18 | 5 +--- hosts/taishan200-2280-2s48p-256g--a19 | 5 +--- hosts/taishan200-2280-2s48p-256g--a21 | 5 +--- hosts/taishan200-2280-2s48p-256g--a22 | 5 +--- hosts/taishan200-2280-2s48p-256g--a24 | 5 +--- hosts/taishan200-2280-2s48p-256g--a25 | 5 +--- hosts/taishan200-2280-2s48p-256g--a26 | 5 +--- hosts/taishan200-2280-2s48p-256g--a27 | 5 +--- hosts/taishan200-2280-2s48p-256g--a28 | 5 +--- hosts/taishan200-2280-2s48p-256g--a29 | 5 +--- hosts/taishan200-2280-2s48p-256g--a30 | 5 +--- hosts/taishan200-2280-2s48p-256g--a31 | 5 +--- hosts/taishan200-2280-2s48p-256g--a32 | 5 +--- hosts/taishan200-2280-2s48p-256g--a33 | 5 +--- hosts/taishan200-2280-2s48p-256g--a34 | 5 +--- hosts/taishan200-2280-2s48p-256g--a35 | 20 ++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a52 | 5 +--- hosts/taishan200-2280-2s48p-256g--a53 | 5 +--- hosts/taishan200-2280-2s48p-256g--a60 | 5 +--- hosts/taishan200-2280-2s48p-256g--a61 | 5 +--- hosts/taishan200-2280-2s48p-256g--a62 | 5 +--- hosts/taishan200-2280-2s48p-256g--a63 | 19 +++++++++++++++ hosts/taishan200-2280-2s48p-256g--a66 | 5 +--- hosts/taishan200-2280-2s48p-256g--a67 | 5 +--- hosts/taishan200-2280-2s48p-256g--a68 | 5 +--- hosts/taishan200-2280-2s48p-256g--a69 | 5 +--- hosts/taishan200-2280-2s48p-256g--a70 | 5 +--- hosts/taishan200-2280-2s48p-256g--a71 | 5 +--- hosts/taishan200-2280-2s48p-256g--a87 | 19 +++++++++++++++ ...-a102 => taishan200-2280-2s48p-512g--a102} | 8 +++---- hosts/taishan200-2280-2s48p-512g--a105 | 23 +++++++++++++++++++ ...g--a95 => taishan200-2280-2s48p-512g--a95} | 9 ++++---- hosts/taishan200-2280-2s64p-256g--a10 | 5 +--- hosts/taishan200-2280-2s64p-256g--a3 | 5 +--- hosts/taishan200-2280-2s64p-256g--a36 | 7 ++---- hosts/taishan200-2280-2s64p-256g--a4 | 5 +--- hosts/taishan200-2280-2s64p-256g--a40 | 5 +--- hosts/taishan200-2280-2s64p-256g--a41 | 5 +--- hosts/taishan200-2280-2s64p-256g--a42 | 5 +--- hosts/taishan200-2280-2s64p-256g--a8 | 5 +--- hosts/taishan200-2280-2s64p-256g--a9 | 5 +--- 52 files changed, 243 insertions(+), 176 deletions(-) create mode 100644 hosts/taishan200-2280-2s48p-256g--a103 create mode 100644 hosts/taishan200-2280-2s48p-256g--a104 create mode 100644 hosts/taishan200-2280-2s48p-256g--a106 create mode 100644 hosts/taishan200-2280-2s48p-256g--a107 create mode 100644 hosts/taishan200-2280-2s48p-256g--a16 create mode 100644 hosts/taishan200-2280-2s48p-256g--a35 create mode 100644 hosts/taishan200-2280-2s48p-256g--a63 create mode 100644 hosts/taishan200-2280-2s48p-256g--a87 rename hosts/{taishan200-2280-2s48p-256g--a102 => taishan200-2280-2s48p-512g--a102} (90%) create mode 100644 hosts/taishan200-2280-2s48p-512g--a105 rename hosts/{taishan200-2280-2s48p-256g--a95 => taishan200-2280-2s48p-512g--a95} (81%) diff --git a/hosts/taishan200-2280-2s48p-256g--a101 b/hosts/taishan200-2280-2s48p-256g--a101 index f8a0429..b84e555 100644 --- a/hosts/taishan200-2280-2s48p-256g--a101 +++ b/hosts/taishan200-2280-2s48p-256g--a101 @@ -1,12 +1,10 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 2 nr_ssd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-350000399b89192e1 - /dev/disk/by-id/scsi-350000399b88bf66d +rootfs_partition: - /dev/disk/by-id/scsi-350000399b88bef85 ssd_partitions: - /dev/disk/by-id/ata-INTEL_SSDSC2KB480G8_BTYF94730FF4480BGN diff --git a/hosts/taishan200-2280-2s48p-256g--a103 b/hosts/taishan200-2280-2s48p-256g--a103 new file mode 100644 index 0000000..c0685c2 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a103 @@ -0,0 +1,23 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bdc69 + - /dev/disk/by-id/scsi-350000399b88bdd85 + - /dev/disk/by-id/scsi-350000399b88bdc4d +rootfs_partition: + - /dev/disk/by-id/scsi-350000399b88bdc7d +mac_addr: + - 44:67:47:c9:d8:b8 + - 44:67:47:c9:d8:b9 + - 44:67:47:c9:d8:ba + - 44:67:47:c9:d8:bb + - 44:67:47:c9:d8:bc + - 44:67:47:c9:d8:bd + - 44:67:47:c9:d8:be + - 44:67:47:c9:d8:bf + - cc:05:77:ee:b5:4f + - cc:05:77:ee:b5:50 + - cc:05:77:ee:b5:51 + - cc:05:77:ee:b5:52 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a104 b/hosts/taishan200-2280-2s48p-256g--a104 new file mode 100644 index 0000000..51f0f8c --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a104 @@ -0,0 +1,23 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8892431 + - /dev/disk/by-id/scsi-350000399b8892f81 + - /dev/disk/by-id/scsi-350000399b8891c49 +rootfs_partition: + - /dev/disk/by-id/scsi-350000399b88930d1 +mac_addr: + - 44:67:47:d7:6d:f0 + - 44:67:47:d7:6d:f1 + - 44:67:47:d7:6d:f2 + - 44:67:47:d7:6d:f3 + - 44:67:47:d7:6d:f4 + - 44:67:47:d7:6d:f5 + - 44:67:47:d7:6d:f6 + - 44:67:47:d7:6d:f7 + - cc:05:77:ee:b9:6f + - cc:05:77:ee:b9:70 + - cc:05:77:ee:b9:71 + - cc:05:77:ee:b9:72 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.9 diff --git a/hosts/taishan200-2280-2s48p-256g--a106 b/hosts/taishan200-2280-2s48p-256g--a106 new file mode 100644 index 0000000..1219bcc --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a106 @@ -0,0 +1,23 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b883bf99 + - /dev/disk/by-id/scsi-350000399b883ba89 + - /dev/disk/by-id/scsi-350000399b883b94d +rootfs_partition: + - /dev/disk/by-id/scsi-350000399b883b981 +mac_addr: + - 44:67:47:86:1c:30 + - 44:67:47:86:1c:31 + - 44:67:47:86:1c:32 + - 44:67:47:86:1c:33 + - 44:67:47:86:1c:34 + - 44:67:47:86:1c:35 + - 44:67:47:86:1c:36 + - 44:67:47:86:1c:37 + - cc:05:77:ee:b7:df + - cc:05:77:ee:b7:e0 + - cc:05:77:ee:b7:e1 + - cc:05:77:ee:b7:e2 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a107 b/hosts/taishan200-2280-2s48p-256g--a107 new file mode 100644 index 0000000..3ec9f39 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a107 @@ -0,0 +1,23 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8917c39 + - /dev/disk/by-id/scsi-350000399b8918005 + - /dev/disk/by-id/scsi-350000399b8900a4d +rootfs_partition: + - /dev/disk/by-id/scsi-350000399b8900799 +mac_addr: + - 84:46:fe:73:a2:71 + - 84:46:fe:73:a2:72 + - 84:46:fe:73:a2:73 + - 84:46:fe:73:a2:74 + - 84:46:fe:73:a2:75 + - 84:46:fe:73:a2:76 + - 84:46:fe:73:a2:77 + - 84:46:fe:73:a2:78 + - 44:a1:91:35:1a:70 + - 44:a1:91:35:1a:71 + - 44:a1:91:35:1a:72 + - 44:a1:91:35:1a:73 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.12 diff --git a/hosts/taishan200-2280-2s48p-256g--a11 b/hosts/taishan200-2280-2s48p-256g--a11 index 619dc06..142b44e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a11 +++ b/hosts/taishan200-2280-2s48p-256g--a11 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8891431-part1 diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 index 468c175..173a2bf 100644 --- a/hosts/taishan200-2280-2s48p-256g--a13 +++ b/hosts/taishan200-2280-2s48p-256g--a13 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500c2799bb3 diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 index 24ea9dc..3e70159 100644 --- a/hosts/taishan200-2280-2s48p-256g--a14 +++ b/hosts/taishan200-2280-2s48p-256g--a14 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4475 diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 index 9c28258..8ac1654 100644 --- a/hosts/taishan200-2280-2s48p-256g--a15 +++ b/hosts/taishan200-2280-2s48p-256g--a15 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b841fff5 diff --git a/hosts/taishan200-2280-2s48p-256g--a16 b/hosts/taishan200-2280-2s48p-256g--a16 new file mode 100644 index 0000000..1355932 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a16 @@ -0,0 +1,19 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf271 + - /dev/disk/by-id/scsi-350000399b88bf1a9 + - /dev/disk/by-id/scsi-350000399b88bf0d5 +rootfs_partition: + - /dev/disk/by-id/scsi-350000399b88bf385 +mac_addr: + - 84:46:fe:3d:a2:17 + - 84:46:fe:3d:a2:18 + - 84:46:fe:3d:a2:19 + - 84:46:fe:3d:a2:1a + - 84:46:fe:3d:a2:1b + - 84:46:fe:3d:a2:1c + - 84:46:fe:3d:a2:1d + - 84:46:fe:3d:a2:1e +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.6 diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 index 16b065d..5d4fe01 100644 --- a/hosts/taishan200-2280-2s48p-256g--a17 +++ b/hosts/taishan200-2280-2s48p-256g--a17 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b44cd diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 index 9d1ec01..3e36555 100644 --- a/hosts/taishan200-2280-2s48p-256g--a18 +++ b/hosts/taishan200-2280-2s48p-256g--a18 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b891b4d1 diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 index 217eaa9..f7233e4 100644 --- a/hosts/taishan200-2280-2s48p-256g--a19 +++ b/hosts/taishan200-2280-2s48p-256g--a19 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8923939 diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 index 738738d..8331e55 100644 --- a/hosts/taishan200-2280-2s48p-256g--a21 +++ b/hosts/taishan200-2280-2s48p-256g--a21 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf2d5 diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 index bb29d94..94549a9 100644 --- a/hosts/taishan200-2280-2s48p-256g--a22 +++ b/hosts/taishan200-2280-2s48p-256g--a22 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919069 diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 index 60ea1d2..df8bd3c 100644 --- a/hosts/taishan200-2280-2s48p-256g--a24 +++ b/hosts/taishan200-2280-2s48p-256g--a24 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8917d59 diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 index 916513e..eb0ba8e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a25 +++ b/hosts/taishan200-2280-2s48p-256g--a25 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4499 diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 index 4a5a0f3..1f8136a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a26 +++ b/hosts/taishan200-2280-2s48p-256g--a26 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf131 diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 index 129589c..25b076f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a27 +++ b/hosts/taishan200-2280-2s48p-256g--a27 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918ea9 diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 index f8a77f8..2901c3e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a28 +++ b/hosts/taishan200-2280-2s48p-256g--a28 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500cdf1eb07 diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 index 37814cc..f1fdd6b 100644 --- a/hosts/taishan200-2280-2s48p-256g--a29 +++ b/hosts/taishan200-2280-2s48p-256g--a29 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918425 diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 index f722edb..2dbc84f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a30 +++ b/hosts/taishan200-2280-2s48p-256g--a30 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883b881 diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 index 7d6c67c..085a150 100644 --- a/hosts/taishan200-2280-2s48p-256g--a31 +++ b/hosts/taishan200-2280-2s48p-256g--a31 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883b929 diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 index fb17e38..0f3396c 100644 --- a/hosts/taishan200-2280-2s48p-256g--a32 +++ b/hosts/taishan200-2280-2s48p-256g--a32 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf141 diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 index a3a6b03..dba4da1 100644 --- a/hosts/taishan200-2280-2s48p-256g--a33 +++ b/hosts/taishan200-2280-2s48p-256g--a33 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919555 diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 index 5a15949..f32c952 100644 --- a/hosts/taishan200-2280-2s48p-256g--a34 +++ b/hosts/taishan200-2280-2s48p-256g--a34 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be219 diff --git a/hosts/taishan200-2280-2s48p-256g--a35 b/hosts/taishan200-2280-2s48p-256g--a35 new file mode 100644 index 0000000..7eb3c79 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a35 @@ -0,0 +1,20 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a71a5 + - /dev/disk/by-id/scsi-350000399886b66dd-part1 + - /dev/disk/by-id/scsi-350000399886b66dd-part2 + - /dev/disk/by-id/scsi-350000399886b66dd-part3 +rootfs_partition: + - /dev/disk/by-id/scsi-362c97b1c6eedb00026e527a2b8b998f2 +mac_addr: + - 44:67:47:c9:ec:ec + - 44:67:47:c9:ec:ed + - 44:67:47:c9:ec:ee + - 44:67:47:c9:ec:ef + - 44:67:47:c9:ec:f0 + - 44:67:47:c9:ec:f1 + - 44:67:47:c9:ec:f2 + - 44:67:47:c9:ec:f3 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.12 diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 index 2bd7096..be10a77 100644 --- a/hosts/taishan200-2280-2s48p-256g--a52 +++ b/hosts/taishan200-2280-2s48p-256g--a52 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500cdefd89b diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 index bf0894b..546e5ef 100644 --- a/hosts/taishan200-2280-2s48p-256g--a53 +++ b/hosts/taishan200-2280-2s48p-256g--a53 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6aa4e3 diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 index 2255f2f..0bf91a1 100644 --- a/hosts/taishan200-2280-2s48p-256g--a60 +++ b/hosts/taishan200-2280-2s48p-256g--a60 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd67640b diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 index 73079cb..48f4251 100644 --- a/hosts/taishan200-2280-2s48p-256g--a61 +++ b/hosts/taishan200-2280-2s48p-256g--a61 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399886a7869 diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 index abaac6e..9c1218f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a62 +++ b/hosts/taishan200-2280-2s48p-256g--a62 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b892d131 diff --git a/hosts/taishan200-2280-2s48p-256g--a63 b/hosts/taishan200-2280-2s48p-256g--a63 new file mode 100644 index 0000000..cab9044 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a63 @@ -0,0 +1,19 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886b0431 + - /dev/disk/by-id/scsi-350000399886adc71 + - /dev/disk/by-id/scsi-350000399886b66f5 +rootfs_partition: + - /dev/disk/by-id/scsi-350000399886b6b75 +mac_addr: + - 44:67:47:c9:e5:44 + - 44:67:47:c9:e5:45 + - 44:67:47:c9:e5:46 + - 44:67:47:c9:e5:47 + - 44:67:47:c9:e5:48 + - 44:67:47:c9:e5:49 + - 44:67:47:c9:e5:4a + - 44:67:47:c9:e5:4b +model_name: Kunpeng-920 +ipmi_ip: 9.3.4.4 diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 index fce93d1..081ec02 100644 --- a/hosts/taishan200-2280-2s48p-256g--a66 +++ b/hosts/taishan200-2280-2s48p-256g--a66 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c5009a671773 diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 index 6b32609..2009165 100644 --- a/hosts/taishan200-2280-2s48p-256g--a67 +++ b/hosts/taishan200-2280-2s48p-256g--a67 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88aed21 diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 index 4bdd8f4..5bc660a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a68 +++ b/hosts/taishan200-2280-2s48p-256g--a68 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8909f81 diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 index 3d3be80..4a5ad9a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a69 +++ b/hosts/taishan200-2280-2s48p-256g--a69 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be92d diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 index 89c3c77..75d114d 100644 --- a/hosts/taishan200-2280-2s48p-256g--a70 +++ b/hosts/taishan200-2280-2s48p-256g--a70 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b890931d diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 index 3121212..cc20212 100644 --- a/hosts/taishan200-2280-2s48p-256g--a71 +++ b/hosts/taishan200-2280-2s48p-256g--a71 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g mac_addr: - 44:67:47:d7:6d:e6 - 44:67:47:d7:6d:e7 diff --git a/hosts/taishan200-2280-2s48p-256g--a87 b/hosts/taishan200-2280-2s48p-256g--a87 new file mode 100644 index 0000000..381d8bf --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a87 @@ -0,0 +1,19 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a6b55 + - /dev/disk/by-id/scsi-350000399886ad4a5 + - /dev/disk/by-id/scsi-350000399886a7139 +rootfs_partition: + - /dev/disk/by-id/scsi-350000399886acb21 +mac_addr: + - 44:67:47:c9:eb:66 + - 44:67:47:c9:eb:67 + - 44:67:47:c9:eb:68 + - 44:67:47:c9:eb:69 + - 44:67:47:c9:eb:6a + - 44:67:47:c9:eb:6b + - 44:67:47:c9:eb:6c + - 44:67:47:c9:eb:6d +model_name: Kunpeng-920 +ipmi_ip: 9.3.8.4 diff --git a/hosts/taishan200-2280-2s48p-256g--a102 b/hosts/taishan200-2280-2s48p-512g--a102 similarity index 90% rename from hosts/taishan200-2280-2s48p-256g--a102 rename to hosts/taishan200-2280-2s48p-512g--a102 index e1d3f10..2e1ad9a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a102 +++ b/hosts/taishan200-2280-2s48p-512g--a102 @@ -1,11 +1,9 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 512G -nr_hdd_partitions: 2 +<<: taishan200-2280-2s48p-512g +nr_hdd_partitions: 1 nr_ssd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bfbc9 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b8919395 ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH1T9HMLT-00005_S455NY0MB55506 diff --git a/hosts/taishan200-2280-2s48p-512g--a105 b/hosts/taishan200-2280-2s48p-512g--a105 new file mode 100644 index 0000000..b164f04 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-512g--a105 @@ -0,0 +1,23 @@ +<<: taishan200-2280-2s48p-512g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b891945d + - /dev/disk/by-id/scsi-350000399b8919135 + - /dev/disk/by-id/scsi-350000399b8919699 +rootfs_partition: + - /dev/disk/by-id/scsi-350000399b89190d5 +mac_addr: + - 44:67:47:d7:76:c4 + - 44:67:47:d7:76:c5 + - 44:67:47:d7:76:c6 + - 44:67:47:d7:76:c7 + - 44:67:47:d7:76:c8 + - 44:67:47:d7:76:c9 + - 44:67:47:d7:76:ca + - 44:67:47:d7:76:cb + - cc:05:77:ee:b2:8f + - cc:05:77:ee:b2:90 + - cc:05:77:ee:b2:91 + - cc:05:77:ee:b2:92 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.10 diff --git a/hosts/taishan200-2280-2s48p-256g--a95 b/hosts/taishan200-2280-2s48p-512g--a95 similarity index 81% rename from hosts/taishan200-2280-2s48p-256g--a95 rename to hosts/taishan200-2280-2s48p-512g--a95 index 213d10f..0e88e91 100644 --- a/hosts/taishan200-2280-2s48p-256g--a95 +++ b/hosts/taishan200-2280-2s48p-512g--a95 @@ -1,12 +1,10 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 512G -nr_hdd_partitions: 4 +<<: taishan200-2280-2s48p-512g +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000039988792e31 - /dev/disk/by-id/scsi-35000039988793705 - /dev/disk/by-id/scsi-35000039988792aa5 +rootfs_partition: - /dev/disk/by-id/scsi-350000399887932fd mac_addr: - cc:05:77:fd:fb:61 @@ -18,3 +16,4 @@ mac_addr: - cc:05:77:fd:fb:67 - cc:05:77:fd:fb:68 model_name: Kunpeng-920 +ipmi_ip: 9.3.8.12 diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 index cdb32f5..f34dc96 100644 --- a/hosts/taishan200-2280-2s64p-256g--a10 +++ b/hosts/taishan200-2280-2s64p-256g--a10 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_ssd_partitions: 1 rootfs_partition: - /dev/disk/by-id/scsi-350000399c8030fd5 diff --git a/hosts/taishan200-2280-2s64p-256g--a3 b/hosts/taishan200-2280-2s64p-256g--a3 index 8f34f3f..f372df5 100644 --- a/hosts/taishan200-2280-2s64p-256g--a3 +++ b/hosts/taishan200-2280-2s64p-256g--a3 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_ssd_partitions: 3 ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43895-part1 diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 index 9757144..4fa59e0 100644 --- a/hosts/taishan200-2280-2s64p-256g--a36 +++ b/hosts/taishan200-2280-2s64p-256g--a36 @@ -1,8 +1,5 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G -nr_ssd_partitions: 1 +<<: taishan200-2280-2s64p-256g +nr_ssd_partitions: 2 rootfs_partition: - /dev/disk/by-id/scsi-3500003999813487d ssd_partitions: diff --git a/hosts/taishan200-2280-2s64p-256g--a4 b/hosts/taishan200-2280-2s64p-256g--a4 index bcfaea7..d00ac8a 100644 --- a/hosts/taishan200-2280-2s64p-256g--a4 +++ b/hosts/taishan200-2280-2s64p-256g--a4 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_ssd_partitions: 3 ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43892-part1 diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 index d9a9937..a914a29 100644 --- a/hosts/taishan200-2280-2s64p-256g--a40 +++ b/hosts/taishan200-2280-2s64p-256g--a40 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-3500003999812ed81 diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 index 91531fd..6291741 100644 --- a/hosts/taishan200-2280-2s64p-256g--a41 +++ b/hosts/taishan200-2280-2s64p-256g--a41 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919495 diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 index ed1f188..32b9b00 100644 --- a/hosts/taishan200-2280-2s64p-256g--a42 +++ b/hosts/taishan200-2280-2s64p-256g--a42 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918a11 diff --git a/hosts/taishan200-2280-2s64p-256g--a8 b/hosts/taishan200-2280-2s64p-256g--a8 index e515306..582ee27 100644 --- a/hosts/taishan200-2280-2s64p-256g--a8 +++ b/hosts/taishan200-2280-2s64p-256g--a8 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g rootfs_partition: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43325 mac_addr: diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 index ce3aa0a..876c586 100644 --- a/hosts/taishan200-2280-2s64p-256g--a9 +++ b/hosts/taishan200-2280-2s64p-256g--a9 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6a1347 -- 2.23.0

1 0

[PATCH lkp-tests] sbin/submit: fix bug when use 'submit -m -a'
by Wu Zhende 28 Oct '20

28 Oct '20

[Why] When use 'submit -m -a' may get error. Because -a add 'define_file' may include ' xxxx', this causes 'monitor -j' parsing errors. [Error info] Traceback (most recent call last): 11: from /code/lkp-tests/sbin/monitor:59:in `<main>' 10: from /usr/share/ruby/optparse.rb:1648:in `parse!' 9: from /usr/share/ruby/optparse.rb:1626:in `permute!' 8: from /usr/share/ruby/optparse.rb:1532:in `order!' 7: from /usr/share/ruby/optparse.rb:1538:in `parse_in_order' 6: from /usr/share/ruby/optparse.rb:1538:in `catch' 5: from /usr/share/ruby/optparse.rb:1584:in `block in parse_in_order' 4: from /home/wuzhende/code/lkp-tests/sbin/monitor:51:in `block (2 levels) in <main>' 3: from /usr/share/ruby/psych.rb:263:in `load' 2: from /usr/share/ruby/psych.rb:350:in `parse' 1: from /usr/share/ruby/psych.rb:402:in `parse_stream' /usr/share/ruby/psych.rb:402:in `parse': (<unknown>): found unexpected end of stream while scanning a quoted scalar at line 1 column 1595 (Psych::SyntaxError) Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- sbin/submit | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sbin/submit b/sbin/submit index c49e1e9a..4884ad63 100755 --- a/sbin/submit +++ b/sbin/submit @@ -79,7 +79,7 @@ if ARGV.size.zero? end job_ids = [] -job_json_list = [] +job_hash_list = [] def find_jobfile(jobfile) return jobfile if File.exist?(jobfile) @@ -126,7 +126,7 @@ ARGV.each do |jobfile| # merge job info job_hash = job.to_hash - job_json_list << job_hash.to_json + job_hash_list << job_hash job_hash = job_hash.merge(sh_hash) # save job to yaml @@ -156,7 +156,8 @@ ARGV.each do |jobfile| end if opt_monitor + job_hash_list[0].delete('define_files') opt_monitor_query.merge!({'job_id' => job_ids[0]}) - cmd = "#{LKP_SRC}/sbin/monitor -f '#{opt_monitor_query.to_json}' -j '#{job_json_list[0]}' -a #{actions.join(',')} -s 'job_state: extract_finished'" + cmd = "#{LKP_SRC}/sbin/monitor -f '#{opt_monitor_query.to_json}' -j '#{job_hash_list[0].to_json}' -a #{actions.join(',')} -s 'job_state: extract_finished'" exec cmd end -- 2.23.0

2 1

[PATCH v2 compass-ci] fix: sched: add 2 fields into cluster state
by Ren Wen 28 Oct '20

28 Oct '20

[Why] 1) Each node will report it's infos (roles, ip, direct_ips, direct_macs) when running cluster job, so also add these 2 parameters into node state: "direct_ips", "direct_macs". Cluster test scripts needs "direct_server_ips" as server client's ip to connect to server to do a test. When request state is "roles_ip", return clients two variables: server, direct_server_ips. Clients will export them. 2) Alter funtion "get_ip"'s name and it's return value to fit for changes. Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index c32091f..91c0820 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -99,24 +99,31 @@ class Sched when "write_state" node_roles = env.params.query["node_roles"] node_ip = env.params.query["ip"] + direct_ips = env.params.query["direct_ips"] + direct_macs = env.params.query["direct_macs"] + update_cluster_state(cluster_id, job_id, "roles", node_roles) update_cluster_state(cluster_id, job_id, "ip", node_ip) + update_cluster_state(cluster_id, job_id, "direct_ips", direct_ips) + update_cluster_state(cluster_id, job_id, "direct_macs", direct_macs) when "roles_ip" role = "server" - server_ip = get_ip(cluster_id, role) - return "server=#{server_ip}" + role_state = get_role_state(cluster_id, role) + raise "Missing #{role} state in cluster state" unless role_state + return "server=#{role_state["ip"]}\n" \ + "direct_server_ips=#{role_state["direct_server_ips"]}" end # show cluster state return @redis.hash_get("sched/cluster_state", cluster_id) end - # get the ip of role from cluster_state - def get_ip(cluster_id, role) + # get the node state of role from cluster_state + private def get_role_state(cluster_id, role) cluster_state = get_cluster_state(cluster_id) - cluster_state.each_value do |config| - if %(#{config["roles"]}) == role - return config["ip"] + cluster_state.each_value do |role_state| + if %(#{role_state["roles"]}) == role + return role_state end end end -- 2.23.0

1 1

[PATCH v3 lkp-tests 2/2] tests/iozone: add specified parameter for iozone test
by Lu Kaiyi 28 Oct '20

28 Oct '20

[why] need to test write, rewrite, read, reread, random write, random read for different block_size. [How] add judement for variable $block_size to execute iozone command with specificed parameter. Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- tests/iozone | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tests/iozone b/tests/iozone index 3095ce80..e69991fa 100755 --- a/tests/iozone +++ b/tests/iozone @@ -1,4 +1,9 @@ #!/bin/sh +# - block_size +# - file_size +# - write_rewrite +# - read_reread +# - random_read_write ## IOzone is a filesystem benchmark tool. The benchmark generates ## and measures a variety of file operations. @@ -7,7 +12,17 @@ for mnt in $mount_points do - cmd="iozone -a -f $mnt/iozonetest" + cmd="iozone" + if [ -n "$block_size" ]; then + cmd += " -r $block_size" + [ -n "$file_size" ] && cmd += " -s $file_size" + [ -n "$write_rewrite" ] && cmd += " -i $write_rewrite" + [ -n "$read_reread" ] && cmd += " -i $read_reread" + [ -n "$random_read_write" ] && cmd += " -i $random_read_write" + else + cmd += " -a" + fi + cmd += " -f $mnt/iozonetest" log_echo "$cmd &" $cmd > $TMP/iozone-$i & i=$((i+1)) -- 2.23.0

3 3

[PATCH v2 compass-ci] sparrow/3-code: add centos in os file
by Zhang Yale 28 Oct '20

28 Oct '20

[Why] when run dev-env in centos system, error like this: ./dev-env:line 41: ./os/centos: No such file or directory. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- sparrow/3-code/os/centos | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 sparrow/3-code/os/centos diff --git a/sparrow/3-code/os/centos b/sparrow/3-code/os/centos new file mode 100644 index 0000000..b0669c0 --- /dev/null +++ b/sparrow/3-code/os/centos @@ -0,0 +1,8 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ + +cat > /etc/default/docker << EOF +DOCKER_OPTS="--dns 114.114.114.114" +EOF + +systemctl restart docker -- 2.23.0

1 0

[PATCH compass-ci] container/logging-es: optimize bulk write performance
by Wu Zhende 28 Oct '20

28 Oct '20

[Why] fluentd uses "bulk" to continuously write data to es. The es write capability needs to be optimized to adapt to high-concurrency scenarios. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/logging-es/Dockerfile | 12 ++++++++---- container/logging-es/start | 13 +++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/container/logging-es/Dockerfile b/container/logging-es/Dockerfile index 7f91f65..d32d10f 100644 --- a/container/logging-es/Dockerfile +++ b/container/logging-es/Dockerfile @@ -7,10 +7,14 @@ FROM gagara/elasticsearch-oss-arm64:7.6.2 MAINTAINER Wu Zhende <wuzhende666(a)163.com> -RUN sed -i 's:#network.host\: _site_:network.host\: 0.0.0.0:' /usr/share/elasticsearch/config/elasticsearch.yml; -RUN sed -i '$a path.data: /srv/es/logging-es' /usr/share/elasticsearch/config/elasticsearch.yml; -RUN sed -i '$a node.name: node-1' /usr/share/elasticsearch/config/elasticsearch.yml; -RUN sed -i '$a cluster.initial_master_nodes: ["node-1"]' /usr/share/elasticsearch/config/elasticsearch.yml; +RUN sed -i 's:#network.host\: _site_:network.host\: 0.0.0.0:' /usr/share/elasticsearch/config/elasticsearch.yml && \ + sed -i '$a path.data: /srv/es/logging-es' /usr/share/elasticsearch/config/elasticsearch.yml && \ + sed -i '$a node.name: node-1' /usr/share/elasticsearch/config/elasticsearch.yml && \ + sed -i '$a cluster.initial_master_nodes: ["node-1"]' /usr/share/elasticsearch/config/elasticsearch.yml && \ + sed -i '$a indices.memory.index_buffer_size: 30%' /usr/share/elasticsearch/config/elasticsearch.yml && \ + sed -i '$a thread_pool.write.queue_size: 2000' /usr/share/elasticsearch/config/elasticsearch.yml && \ + sed -i "s/-Xms1g/-Xms30g/g" /usr/share/elasticsearch/config/jvm.options && \ + sed -i "s/-Xmx1g/-Xmx30g/g" /usr/share/elasticsearch/config/jvm.options RUN mkdir /usr/share/elasticsearch/tmp && \ chown -R 1090:1090 /usr/share/elasticsearch diff --git a/container/logging-es/start b/container/logging-es/start index 9be7a5b..be9ac6d 100755 --- a/container/logging-es/start +++ b/container/logging-es/start @@ -19,3 +19,16 @@ cmd=( ) "${cmd[@]}" + +echo "Please wait 60s for setting index" +sleep 60 + +curl -H "Content-Type: application/json" -XPUT "localhost:9202/_settings" -d ' +{ + "index": { + "refresh_interval": "300s", + "translog.durability": "async", + "translog.sync_interval": "300s", + "translog.flush_threshold_size": "1024mb", + "merge.scheduler.max_thread_count": 1} +}' -- 2.23.0

1 0

[PATCH v3 compass-ci] container/debian: solve build error
by Cui Yili 28 Oct '20

28 Oct '20

[why] Executing "container/debian/build", error when apt-get installs the package: E: Could not configure 'libc6:arm64'. E: Could not perform immediate configuration on 'libnss-nis:arm64'. Please see man 5 apt.conf under APT::Immediate-Configure for details. (2) [how] Increase the parameter "-o APT::Immediate-Configure=false" when apt-get installs the package. reference: https://www.debian.org/releases/wheezy/armhf/release-notes/ch-upgrading.en.… Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/debian/Dockerfile b/container/debian/Dockerfile index 1d310da..7f86cee 100644 --- a/container/debian/Dockerfile +++ b/container/debian/Dockerfile @@ -12,6 +12,6 @@ COPY root / RUN sed -i "s/^exit [0-9]*/exit 0/" /usr/sbin/policy-rc.d RUN apt-get update && \ apt-get install -y --no-install-recommends apt-utils > /dev/null 2>&1 && \ - apt-get install -y runit openssh-server zsh vim rsync git make gcc g++ tzdata sudo && \ + apt-get install -y -o APT::Immediate-Configure=false runit openssh-server zsh vim rsync git make gcc g++ tzdata sudo && \ mkdir -p /run/sshd -- 2.23.0

1 0

[PATCH v2 lkp-tests] fix(distro/depends): add cci-depends/cci-makepkg file
by Wang Yong 28 Oct '20

28 Oct '20

[Why] prevent initramfs OS file from becoming too large [How] import packages from depends cgz file Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- distro/depends/cci-depends | 2 ++ distro/depends/cci-makepkg | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 distro/depends/cci-depends create mode 100644 distro/depends/cci-makepkg diff --git a/distro/depends/cci-depends b/distro/depends/cci-depends new file mode 100644 index 000000000..1f7f73ac3 --- /dev/null +++ b/distro/depends/cci-depends @@ -0,0 +1,2 @@ +cifs-utils +cpio diff --git a/distro/depends/cci-makepkg b/distro/depends/cci-makepkg new file mode 100644 index 000000000..a7ee67537 --- /dev/null +++ b/distro/depends/cci-makepkg @@ -0,0 +1,10 @@ +curl +libarchive-tools +bzip2 +fakeroot +gnupg +gettext +openssl +ncurses-bin +binutils +cifs-utils -- 2.23.0

2 2

[PATCH v5 compass-ci 1/2] add queue field into job.yaml
by Xiao Shenwei 28 Oct '20

28 Oct '20

queue field come from user's specify(job.yaml) or dafault Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- src/lib/job.cr | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/lib/job.cr b/src/lib/job.cr index 8f5dd36..7fbc414 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -73,6 +73,7 @@ class Job tbox_group testbox lab + queue initrd_pkg initrd_deps initrds_uri @@ -139,6 +140,7 @@ class Job set_kernel_params() set_lkp_server() set_sshr_port() + set_queue() end private def append_init_field @@ -199,6 +201,16 @@ class Job self["result_service"] = "raw_upload" end + private def set_queue + return if @hash.has_key?("queue") + + # set default value + self["queue"] = tbox_group + if tbox_group.to_s.starts_with?(/(vm|dc)-/) + self["queue"] = "#{tbox_group}.#{arch}" + end + end + # if not assign tbox_group, set it to a match result from testbox # ?if job special testbox, should we just set tbox_group=textbox private def update_tbox_group_from_testbox -- 2.23.0

1 1

[PATCH v2 compass-ci] specify the queues when the VM is started
by Xiao Shenwei 28 Oct '20

28 Oct '20

[why] specify the VM that need to consume the queues one job will added one queue, but one VM can consume job from multi queues. [how] to solve this problem, the scheduler should obtains which queues should be request. solution-1: register mac and queues relation before: mac=>hostname change to: mac=>hostname and mac=>queues then scheduler can get queues based on mac solution-2: /boot.ipxe/mac/${mac}?queues=xxx,yyy our HW and PXE-VM use /tftpboot/boot.ipxe to send request, unable to specify parameter, so use solution-1. Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/my-qemu.sh | 4 +++- providers/qemu.sh | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/providers/my-qemu.sh b/providers/my-qemu.sh index 954d3a0..7f3aa1b 100755 --- a/providers/my-qemu.sh +++ b/providers/my-qemu.sh @@ -4,6 +4,8 @@ [[ $tbox_group ]] || tbox_group=vm-2p8g -export hostname=$tbox_group--$USER-$$ +export hostname=$tbox_group.$USER-$$ +# specify which queues will be request, use " " to separate more than 2 values +export queues="vm-2p8g.aarch64 vm-2p8g~$USER" $CCI_SRC/providers/qemu.sh diff --git a/providers/qemu.sh b/providers/qemu.sh index d97fd85..6719e96 100755 --- a/providers/qemu.sh +++ b/providers/qemu.sh @@ -9,6 +9,7 @@ load_cci_defaults : ${hostname:="vm-1p1g-1"} +: ${queues:="vm-1p1g.$(arch)"} # unicast prefix: x2, x6, xA, xE export mac=$(echo $hostname | md5sum | sed 's/^$..$$..$$..$$..$$..$.*$/0a-\1-\2-\3-\4-\5/') echo hostname: $hostname @@ -17,7 +18,14 @@ echo $mac > mac echo "arp -n | grep ${mac//-/:}" > ip.sh chmod +x ip.sh -curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}" +set_mac2host() +{ + # use "," replace " " + queues=$(echo $queues | sed -r 's/ +/,/g') + echo $queues + curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}&queues=${queues}" +} +set_mac2host del_host_mac() { @@ -33,7 +41,7 @@ trap del_host_mac EXIT tbox_group=$hostname fi - host=${tbox_group%%--*} + host=${tbox_group%.*} create_yaml_variables "$LKP_SRC/hosts/${host}" -- 2.23.0

2 3

[PATCH v3 lkp-tests 1/2] jobs/iozone_with_block_size.yaml: add iozone_with_block_size.yaml
by Lu Kaiyi 28 Oct '20

28 Oct '20

[why] need test different block_size value Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- jobs/iozone_with_block_size.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 jobs/iozone_with_block_size.yaml diff --git a/jobs/iozone_with_block_size.yaml b/jobs/iozone_with_block_size.yaml new file mode 100644 index 00000000..f3937e9e --- /dev/null +++ b/jobs/iozone_with_block_size.yaml @@ -0,0 +1,27 @@ +suite: iozone +testcase: iozone +category: benchmark + +file_size: 4g +write_rewrite: 0 +read_reread: 1 +random_read_write: 2 + +block_size: +- 64k +- 256k +- 1m +- 4m +- 16m + +disk: 2HDD + +fs: +- xfs +- ext4 +- btrfs + +iosched: +- kyber + +iozone: -- 2.23.0

1 0

[PATCH lkp-tests] fix(distro/depends): add cci-depends/cci-makepkg file
by Wang Yong 28 Oct '20

28 Oct '20

[Why] prevent initramfs OS file from becoming too large [How] import packages from depends cgz file Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- distro/depends/cci-depends | 2 ++ distro/depends/cci-makepkg | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 distro/depends/cci-depends create mode 100644 distro/depends/cci-makepkg diff --git a/distro/depends/cci-depends b/distro/depends/cci-depends new file mode 100644 index 000000000..1f7f73ac3 --- /dev/null +++ b/distro/depends/cci-depends @@ -0,0 +1,2 @@ +cifs-utils +cpio diff --git a/distro/depends/cci-makepkg b/distro/depends/cci-makepkg new file mode 100644 index 000000000..aecd50e0f --- /dev/null +++ b/distro/depends/cci-makepkg @@ -0,0 +1,9 @@ +curl +libarchive-tools +bzip2 +fakeroot +gnupg +gettext +openssl +ncurses-bin +binutils -- 2.23.0

1 0

[PATCH v5 compass-ci 2/2] based on queue field add the job into specify queue
by Xiao Shenwei 28 Oct '20

28 Oct '20

Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- src/lib/sched.cr | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 692180f..b66c19d 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -30,12 +30,14 @@ class Sched mac.gsub(":", "-") end - def set_host_mac(mac : String, hostname : String) + def set_host_mac(mac : String, hostname : String, queues : String) @redis.hash_set("sched/mac2host", normalize_mac(mac), hostname) + @redis.hash_set("sched/mac2queues", normalize_mac(mac), queues) end def del_host_mac(mac : String) @redis.hash_del("sched/mac2host", normalize_mac(mac)) + @redis.hash_del("sched/mac2queues", normalize_mac(mac)) end # return: @@ -251,24 +253,24 @@ class Sched # success: [{"job_id" => job_id, "message" => "", job_state => "submit"}] # failure: [{"job_id" => "0", "message" => err_msg, job_state => "submit"}] def submit_single_job(job) - tbox_group = job.tbox_group + queue = job.queue return [{ "job_id" => "0", - "message" => "get tbox group failed", + "message" => "get queue failed", "job_state" => "submit", - }] unless tbox_group + }] unless queue # only single job will has "idle job" and "execute rate limiter" if job["idle_job"].empty? - tbox_group += "#{job.get_uuid_tag}" + queue += "#{job.get_uuid_tag}" else - tbox_group = "#{tbox_group}/idle" + queue = "#{queue}/idle" end - job_id = add_task(tbox_group, job.lab) + job_id = add_task(queue, job.lab) return [{ "job_id" => "0", - "message" => "add task queue sched/#{tbox_group} failed", + "message" => "add task queue sched/#{queue} failed", "job_state" => "submit", }] unless job_id @@ -372,7 +374,7 @@ class Sched hostname = @redis.hash_get("sched/mac2host", normalize_mac(api_param)) if hostname.nil? # auto name new/unknown machine hostname = "sut-#{api_param}" - set_host_mac(api_param, hostname) + set_host_mac(api_param, hostname, "") # auto submit a job to collect the host information # grub hostname is link with ":", like "00:01:02:03:04:05" -- 2.23.0

1 0

[PATCH v4 compass-ci] add queue field into job.yaml
by Xiao Shenwei 28 Oct '20

28 Oct '20

queue field come from user's specify(job.yaml) or dafault Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- src/lib/job.cr | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/lib/job.cr b/src/lib/job.cr index 8f5dd36..7fbc414 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -73,6 +73,7 @@ class Job tbox_group testbox lab + queue initrd_pkg initrd_deps initrds_uri @@ -139,6 +140,7 @@ class Job set_kernel_params() set_lkp_server() set_sshr_port() + set_queue() end private def append_init_field @@ -199,6 +201,16 @@ class Job self["result_service"] = "raw_upload" end + private def set_queue + return if @hash.has_key?("queue") + + # set default value + self["queue"] = tbox_group + if tbox_group.to_s.starts_with?(/(vm|dc)-/) + self["queue"] = "#{tbox_group}.#{arch}" + end + end + # if not assign tbox_group, set it to a match result from testbox # ?if job special testbox, should we just set tbox_group=textbox private def update_tbox_group_from_testbox -- 2.23.0

1 0

[PATCH v2 lab-z9] add and modify host-file, file change as "<<: $testbox_group"
by Zhang Dewan 28 Oct '20

28 Oct '20

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- hosts/taishan200-2280-2s48p-256g--a101 | 8 +++---- hosts/taishan200-2280-2s48p-256g--a103 | 23 +++++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a104 | 23 +++++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a106 | 23 +++++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a107 | 23 +++++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a11 | 5 +--- hosts/taishan200-2280-2s48p-256g--a13 | 5 +--- hosts/taishan200-2280-2s48p-256g--a14 | 5 +--- hosts/taishan200-2280-2s48p-256g--a15 | 5 +--- hosts/taishan200-2280-2s48p-256g--a16 | 19 +++++++++++++++ hosts/taishan200-2280-2s48p-256g--a17 | 5 +--- hosts/taishan200-2280-2s48p-256g--a18 | 5 +--- hosts/taishan200-2280-2s48p-256g--a19 | 5 +--- hosts/taishan200-2280-2s48p-256g--a21 | 5 +--- hosts/taishan200-2280-2s48p-256g--a22 | 5 +--- hosts/taishan200-2280-2s48p-256g--a24 | 5 +--- hosts/taishan200-2280-2s48p-256g--a25 | 5 +--- hosts/taishan200-2280-2s48p-256g--a26 | 5 +--- hosts/taishan200-2280-2s48p-256g--a27 | 5 +--- hosts/taishan200-2280-2s48p-256g--a28 | 5 +--- hosts/taishan200-2280-2s48p-256g--a29 | 5 +--- hosts/taishan200-2280-2s48p-256g--a30 | 5 +--- hosts/taishan200-2280-2s48p-256g--a31 | 5 +--- hosts/taishan200-2280-2s48p-256g--a32 | 5 +--- hosts/taishan200-2280-2s48p-256g--a33 | 5 +--- hosts/taishan200-2280-2s48p-256g--a34 | 5 +--- hosts/taishan200-2280-2s48p-256g--a35 | 20 ++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a52 | 5 +--- hosts/taishan200-2280-2s48p-256g--a53 | 5 +--- hosts/taishan200-2280-2s48p-256g--a60 | 5 +--- hosts/taishan200-2280-2s48p-256g--a61 | 5 +--- hosts/taishan200-2280-2s48p-256g--a62 | 5 +--- hosts/taishan200-2280-2s48p-256g--a63 | 19 +++++++++++++++ hosts/taishan200-2280-2s48p-256g--a66 | 5 +--- hosts/taishan200-2280-2s48p-256g--a67 | 5 +--- hosts/taishan200-2280-2s48p-256g--a68 | 5 +--- hosts/taishan200-2280-2s48p-256g--a69 | 5 +--- hosts/taishan200-2280-2s48p-256g--a70 | 5 +--- hosts/taishan200-2280-2s48p-256g--a71 | 5 +--- hosts/taishan200-2280-2s48p-256g--a87 | 19 +++++++++++++++ ...-a102 => taishan200-2280-2s48p-512g--a102} | 8 +++---- hosts/taishan200-2280-2s48p-512g--a105 | 23 +++++++++++++++++++ ...g--a95 => taishan200-2280-2s48p-512g--a95} | 9 ++++---- hosts/taishan200-2280-2s64p-256g--a10 | 5 +--- hosts/taishan200-2280-2s64p-256g--a3 | 5 +--- hosts/taishan200-2280-2s64p-256g--a36 | 7 ++---- hosts/taishan200-2280-2s64p-256g--a4 | 5 +--- hosts/taishan200-2280-2s64p-256g--a40 | 5 +--- hosts/taishan200-2280-2s64p-256g--a41 | 5 +--- hosts/taishan200-2280-2s64p-256g--a42 | 5 +--- hosts/taishan200-2280-2s64p-256g--a8 | 5 +--- hosts/taishan200-2280-2s64p-256g--a9 | 5 +--- 52 files changed, 243 insertions(+), 176 deletions(-) create mode 100644 hosts/taishan200-2280-2s48p-256g--a103 create mode 100644 hosts/taishan200-2280-2s48p-256g--a104 create mode 100644 hosts/taishan200-2280-2s48p-256g--a106 create mode 100644 hosts/taishan200-2280-2s48p-256g--a107 create mode 100644 hosts/taishan200-2280-2s48p-256g--a16 create mode 100644 hosts/taishan200-2280-2s48p-256g--a35 create mode 100644 hosts/taishan200-2280-2s48p-256g--a63 create mode 100644 hosts/taishan200-2280-2s48p-256g--a87 rename hosts/{taishan200-2280-2s48p-256g--a102 => taishan200-2280-2s48p-512g--a102} (90%) create mode 100644 hosts/taishan200-2280-2s48p-512g--a105 rename hosts/{taishan200-2280-2s48p-256g--a95 => taishan200-2280-2s48p-512g--a95} (81%) diff --git a/hosts/taishan200-2280-2s48p-256g--a101 b/hosts/taishan200-2280-2s48p-256g--a101 index f8a0429..b84e555 100644 --- a/hosts/taishan200-2280-2s48p-256g--a101 +++ b/hosts/taishan200-2280-2s48p-256g--a101 @@ -1,12 +1,10 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 3 +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 2 nr_ssd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-350000399b89192e1 - /dev/disk/by-id/scsi-350000399b88bf66d +rootfs_partition: - /dev/disk/by-id/scsi-350000399b88bef85 ssd_partitions: - /dev/disk/by-id/ata-INTEL_SSDSC2KB480G8_BTYF94730FF4480BGN diff --git a/hosts/taishan200-2280-2s48p-256g--a103 b/hosts/taishan200-2280-2s48p-256g--a103 new file mode 100644 index 0000000..c0685c2 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a103 @@ -0,0 +1,23 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bdc69 + - /dev/disk/by-id/scsi-350000399b88bdd85 + - /dev/disk/by-id/scsi-350000399b88bdc4d +rootfs_partition: + - /dev/disk/by-id/scsi-350000399b88bdc7d +mac_addr: + - 44:67:47:c9:d8:b8 + - 44:67:47:c9:d8:b9 + - 44:67:47:c9:d8:ba + - 44:67:47:c9:d8:bb + - 44:67:47:c9:d8:bc + - 44:67:47:c9:d8:bd + - 44:67:47:c9:d8:be + - 44:67:47:c9:d8:bf + - cc:05:77:ee:b5:4f + - cc:05:77:ee:b5:50 + - cc:05:77:ee:b5:51 + - cc:05:77:ee:b5:52 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a104 b/hosts/taishan200-2280-2s48p-256g--a104 new file mode 100644 index 0000000..51f0f8c --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a104 @@ -0,0 +1,23 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8892431 + - /dev/disk/by-id/scsi-350000399b8892f81 + - /dev/disk/by-id/scsi-350000399b8891c49 +rootfs_partition: + - /dev/disk/by-id/scsi-350000399b88930d1 +mac_addr: + - 44:67:47:d7:6d:f0 + - 44:67:47:d7:6d:f1 + - 44:67:47:d7:6d:f2 + - 44:67:47:d7:6d:f3 + - 44:67:47:d7:6d:f4 + - 44:67:47:d7:6d:f5 + - 44:67:47:d7:6d:f6 + - 44:67:47:d7:6d:f7 + - cc:05:77:ee:b9:6f + - cc:05:77:ee:b9:70 + - cc:05:77:ee:b9:71 + - cc:05:77:ee:b9:72 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.9 diff --git a/hosts/taishan200-2280-2s48p-256g--a106 b/hosts/taishan200-2280-2s48p-256g--a106 new file mode 100644 index 0000000..1219bcc --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a106 @@ -0,0 +1,23 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b883bf99 + - /dev/disk/by-id/scsi-350000399b883ba89 + - /dev/disk/by-id/scsi-350000399b883b94d +rootfs_partition: + - /dev/disk/by-id/scsi-350000399b883b981 +mac_addr: + - 44:67:47:86:1c:30 + - 44:67:47:86:1c:31 + - 44:67:47:86:1c:32 + - 44:67:47:86:1c:33 + - 44:67:47:86:1c:34 + - 44:67:47:86:1c:35 + - 44:67:47:86:1c:36 + - 44:67:47:86:1c:37 + - cc:05:77:ee:b7:df + - cc:05:77:ee:b7:e0 + - cc:05:77:ee:b7:e1 + - cc:05:77:ee:b7:e2 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a107 b/hosts/taishan200-2280-2s48p-256g--a107 new file mode 100644 index 0000000..3ec9f39 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a107 @@ -0,0 +1,23 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8917c39 + - /dev/disk/by-id/scsi-350000399b8918005 + - /dev/disk/by-id/scsi-350000399b8900a4d +rootfs_partition: + - /dev/disk/by-id/scsi-350000399b8900799 +mac_addr: + - 84:46:fe:73:a2:71 + - 84:46:fe:73:a2:72 + - 84:46:fe:73:a2:73 + - 84:46:fe:73:a2:74 + - 84:46:fe:73:a2:75 + - 84:46:fe:73:a2:76 + - 84:46:fe:73:a2:77 + - 84:46:fe:73:a2:78 + - 44:a1:91:35:1a:70 + - 44:a1:91:35:1a:71 + - 44:a1:91:35:1a:72 + - 44:a1:91:35:1a:73 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.12 diff --git a/hosts/taishan200-2280-2s48p-256g--a11 b/hosts/taishan200-2280-2s48p-256g--a11 index 619dc06..142b44e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a11 +++ b/hosts/taishan200-2280-2s48p-256g--a11 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8891431-part1 diff --git a/hosts/taishan200-2280-2s48p-256g--a13 b/hosts/taishan200-2280-2s48p-256g--a13 index 468c175..173a2bf 100644 --- a/hosts/taishan200-2280-2s48p-256g--a13 +++ b/hosts/taishan200-2280-2s48p-256g--a13 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500c2799bb3 diff --git a/hosts/taishan200-2280-2s48p-256g--a14 b/hosts/taishan200-2280-2s48p-256g--a14 index 24ea9dc..3e70159 100644 --- a/hosts/taishan200-2280-2s48p-256g--a14 +++ b/hosts/taishan200-2280-2s48p-256g--a14 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4475 diff --git a/hosts/taishan200-2280-2s48p-256g--a15 b/hosts/taishan200-2280-2s48p-256g--a15 index 9c28258..8ac1654 100644 --- a/hosts/taishan200-2280-2s48p-256g--a15 +++ b/hosts/taishan200-2280-2s48p-256g--a15 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b841fff5 diff --git a/hosts/taishan200-2280-2s48p-256g--a16 b/hosts/taishan200-2280-2s48p-256g--a16 new file mode 100644 index 0000000..1355932 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a16 @@ -0,0 +1,19 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf271 + - /dev/disk/by-id/scsi-350000399b88bf1a9 + - /dev/disk/by-id/scsi-350000399b88bf0d5 +rootfs_partition: + - /dev/disk/by-id/scsi-350000399b88bf385 +mac_addr: + - 84:46:fe:3d:a2:17 + - 84:46:fe:3d:a2:18 + - 84:46:fe:3d:a2:19 + - 84:46:fe:3d:a2:1a + - 84:46:fe:3d:a2:1b + - 84:46:fe:3d:a2:1c + - 84:46:fe:3d:a2:1d + - 84:46:fe:3d:a2:1e +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.6 diff --git a/hosts/taishan200-2280-2s48p-256g--a17 b/hosts/taishan200-2280-2s48p-256g--a17 index 16b065d..5d4fe01 100644 --- a/hosts/taishan200-2280-2s48p-256g--a17 +++ b/hosts/taishan200-2280-2s48p-256g--a17 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b44cd diff --git a/hosts/taishan200-2280-2s48p-256g--a18 b/hosts/taishan200-2280-2s48p-256g--a18 index 9d1ec01..3e36555 100644 --- a/hosts/taishan200-2280-2s48p-256g--a18 +++ b/hosts/taishan200-2280-2s48p-256g--a18 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b891b4d1 diff --git a/hosts/taishan200-2280-2s48p-256g--a19 b/hosts/taishan200-2280-2s48p-256g--a19 index 217eaa9..f7233e4 100644 --- a/hosts/taishan200-2280-2s48p-256g--a19 +++ b/hosts/taishan200-2280-2s48p-256g--a19 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8923939 diff --git a/hosts/taishan200-2280-2s48p-256g--a21 b/hosts/taishan200-2280-2s48p-256g--a21 index 738738d..8331e55 100644 --- a/hosts/taishan200-2280-2s48p-256g--a21 +++ b/hosts/taishan200-2280-2s48p-256g--a21 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf2d5 diff --git a/hosts/taishan200-2280-2s48p-256g--a22 b/hosts/taishan200-2280-2s48p-256g--a22 index bb29d94..94549a9 100644 --- a/hosts/taishan200-2280-2s48p-256g--a22 +++ b/hosts/taishan200-2280-2s48p-256g--a22 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919069 diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 index 60ea1d2..df8bd3c 100644 --- a/hosts/taishan200-2280-2s48p-256g--a24 +++ b/hosts/taishan200-2280-2s48p-256g--a24 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8917d59 diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 index 916513e..eb0ba8e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a25 +++ b/hosts/taishan200-2280-2s48p-256g--a25 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88b4499 diff --git a/hosts/taishan200-2280-2s48p-256g--a26 b/hosts/taishan200-2280-2s48p-256g--a26 index 4a5a0f3..1f8136a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a26 +++ b/hosts/taishan200-2280-2s48p-256g--a26 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf131 diff --git a/hosts/taishan200-2280-2s48p-256g--a27 b/hosts/taishan200-2280-2s48p-256g--a27 index 129589c..25b076f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a27 +++ b/hosts/taishan200-2280-2s48p-256g--a27 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918ea9 diff --git a/hosts/taishan200-2280-2s48p-256g--a28 b/hosts/taishan200-2280-2s48p-256g--a28 index f8a77f8..2901c3e 100644 --- a/hosts/taishan200-2280-2s48p-256g--a28 +++ b/hosts/taishan200-2280-2s48p-256g--a28 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500cdf1eb07 diff --git a/hosts/taishan200-2280-2s48p-256g--a29 b/hosts/taishan200-2280-2s48p-256g--a29 index 37814cc..f1fdd6b 100644 --- a/hosts/taishan200-2280-2s48p-256g--a29 +++ b/hosts/taishan200-2280-2s48p-256g--a29 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918425 diff --git a/hosts/taishan200-2280-2s48p-256g--a30 b/hosts/taishan200-2280-2s48p-256g--a30 index f722edb..2dbc84f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a30 +++ b/hosts/taishan200-2280-2s48p-256g--a30 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883b881 diff --git a/hosts/taishan200-2280-2s48p-256g--a31 b/hosts/taishan200-2280-2s48p-256g--a31 index 7d6c67c..085a150 100644 --- a/hosts/taishan200-2280-2s48p-256g--a31 +++ b/hosts/taishan200-2280-2s48p-256g--a31 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b883b929 diff --git a/hosts/taishan200-2280-2s48p-256g--a32 b/hosts/taishan200-2280-2s48p-256g--a32 index fb17e38..0f3396c 100644 --- a/hosts/taishan200-2280-2s48p-256g--a32 +++ b/hosts/taishan200-2280-2s48p-256g--a32 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bf141 diff --git a/hosts/taishan200-2280-2s48p-256g--a33 b/hosts/taishan200-2280-2s48p-256g--a33 index a3a6b03..dba4da1 100644 --- a/hosts/taishan200-2280-2s48p-256g--a33 +++ b/hosts/taishan200-2280-2s48p-256g--a33 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919555 diff --git a/hosts/taishan200-2280-2s48p-256g--a34 b/hosts/taishan200-2280-2s48p-256g--a34 index 5a15949..f32c952 100644 --- a/hosts/taishan200-2280-2s48p-256g--a34 +++ b/hosts/taishan200-2280-2s48p-256g--a34 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be219 diff --git a/hosts/taishan200-2280-2s48p-256g--a35 b/hosts/taishan200-2280-2s48p-256g--a35 new file mode 100644 index 0000000..7eb3c79 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a35 @@ -0,0 +1,20 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a71a5 + - /dev/disk/by-id/scsi-350000399886b66dd-part1 + - /dev/disk/by-id/scsi-350000399886b66dd-part2 + - /dev/disk/by-id/scsi-350000399886b66dd-part3 +rootfs_partition: + - /dev/disk/by-id/scsi-362c97b1c6eedb00026e527a2b8b998f2 +mac_addr: + - 44:67:47:c9:ec:ec + - 44:67:47:c9:ec:ed + - 44:67:47:c9:ec:ee + - 44:67:47:c9:ec:ef + - 44:67:47:c9:ec:f0 + - 44:67:47:c9:ec:f1 + - 44:67:47:c9:ec:f2 + - 44:67:47:c9:ec:f3 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.12 diff --git a/hosts/taishan200-2280-2s48p-256g--a52 b/hosts/taishan200-2280-2s48p-256g--a52 index 2bd7096..be10a77 100644 --- a/hosts/taishan200-2280-2s48p-256g--a52 +++ b/hosts/taishan200-2280-2s48p-256g--a52 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500cdefd89b diff --git a/hosts/taishan200-2280-2s48p-256g--a53 b/hosts/taishan200-2280-2s48p-256g--a53 index bf0894b..546e5ef 100644 --- a/hosts/taishan200-2280-2s48p-256g--a53 +++ b/hosts/taishan200-2280-2s48p-256g--a53 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6aa4e3 diff --git a/hosts/taishan200-2280-2s48p-256g--a60 b/hosts/taishan200-2280-2s48p-256g--a60 index 2255f2f..0bf91a1 100644 --- a/hosts/taishan200-2280-2s48p-256g--a60 +++ b/hosts/taishan200-2280-2s48p-256g--a60 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd67640b diff --git a/hosts/taishan200-2280-2s48p-256g--a61 b/hosts/taishan200-2280-2s48p-256g--a61 index 73079cb..48f4251 100644 --- a/hosts/taishan200-2280-2s48p-256g--a61 +++ b/hosts/taishan200-2280-2s48p-256g--a61 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399886a7869 diff --git a/hosts/taishan200-2280-2s48p-256g--a62 b/hosts/taishan200-2280-2s48p-256g--a62 index abaac6e..9c1218f 100644 --- a/hosts/taishan200-2280-2s48p-256g--a62 +++ b/hosts/taishan200-2280-2s48p-256g--a62 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b892d131 diff --git a/hosts/taishan200-2280-2s48p-256g--a63 b/hosts/taishan200-2280-2s48p-256g--a63 new file mode 100644 index 0000000..cab9044 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a63 @@ -0,0 +1,19 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886b0431 + - /dev/disk/by-id/scsi-350000399886adc71 + - /dev/disk/by-id/scsi-350000399886b66f5 +rootfs_partition: + - /dev/disk/by-id/scsi-350000399886b6b75 +mac_addr: + - 44:67:47:c9:e5:44 + - 44:67:47:c9:e5:45 + - 44:67:47:c9:e5:46 + - 44:67:47:c9:e5:47 + - 44:67:47:c9:e5:48 + - 44:67:47:c9:e5:49 + - 44:67:47:c9:e5:4a + - 44:67:47:c9:e5:4b +model_name: Kunpeng-920 +ipmi_ip: 9.3.4.4 diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 index fce93d1..081ec02 100644 --- a/hosts/taishan200-2280-2s48p-256g--a66 +++ b/hosts/taishan200-2280-2s48p-256g--a66 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000c5009a671773 diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 index 6b32609..2009165 100644 --- a/hosts/taishan200-2280-2s48p-256g--a67 +++ b/hosts/taishan200-2280-2s48p-256g--a67 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88aed21 diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 index 4bdd8f4..5bc660a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a68 +++ b/hosts/taishan200-2280-2s48p-256g--a68 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8909f81 diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 index 3d3be80..4a5ad9a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a69 +++ b/hosts/taishan200-2280-2s48p-256g--a69 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88be92d diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 index 89c3c77..75d114d 100644 --- a/hosts/taishan200-2280-2s48p-256g--a70 +++ b/hosts/taishan200-2280-2s48p-256g--a70 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b890931d diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 index 3121212..cc20212 100644 --- a/hosts/taishan200-2280-2s48p-256g--a71 +++ b/hosts/taishan200-2280-2s48p-256g--a71 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 256G +<<: taishan200-2280-2s48p-256g mac_addr: - 44:67:47:d7:6d:e6 - 44:67:47:d7:6d:e7 diff --git a/hosts/taishan200-2280-2s48p-256g--a87 b/hosts/taishan200-2280-2s48p-256g--a87 new file mode 100644 index 0000000..381d8bf --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a87 @@ -0,0 +1,19 @@ +<<: taishan200-2280-2s48p-256g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a6b55 + - /dev/disk/by-id/scsi-350000399886ad4a5 + - /dev/disk/by-id/scsi-350000399886a7139 +rootfs_partition: + - /dev/disk/by-id/scsi-350000399886acb21 +mac_addr: + - 44:67:47:c9:eb:66 + - 44:67:47:c9:eb:67 + - 44:67:47:c9:eb:68 + - 44:67:47:c9:eb:69 + - 44:67:47:c9:eb:6a + - 44:67:47:c9:eb:6b + - 44:67:47:c9:eb:6c + - 44:67:47:c9:eb:6d +model_name: Kunpeng-920 +ipmi_ip: 9.3.8.4 diff --git a/hosts/taishan200-2280-2s48p-256g--a102 b/hosts/taishan200-2280-2s48p-512g--a102 similarity index 90% rename from hosts/taishan200-2280-2s48p-256g--a102 rename to hosts/taishan200-2280-2s48p-512g--a102 index e1d3f10..2e1ad9a 100644 --- a/hosts/taishan200-2280-2s48p-256g--a102 +++ b/hosts/taishan200-2280-2s48p-512g--a102 @@ -1,11 +1,9 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 512G -nr_hdd_partitions: 2 +<<: taishan200-2280-2s48p-512g +nr_hdd_partitions: 1 nr_ssd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-350000399b88bfbc9 +rootfs_partition: - /dev/disk/by-id/scsi-350000399b8919395 ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH1T9HMLT-00005_S455NY0MB55506 diff --git a/hosts/taishan200-2280-2s48p-512g--a105 b/hosts/taishan200-2280-2s48p-512g--a105 new file mode 100644 index 0000000..b164f04 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-512g--a105 @@ -0,0 +1,23 @@ +<<: taishan200-2280-2s48p-512g +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b891945d + - /dev/disk/by-id/scsi-350000399b8919135 + - /dev/disk/by-id/scsi-350000399b8919699 +rootfs_partition: + - /dev/disk/by-id/scsi-350000399b89190d5 +mac_addr: + - 44:67:47:d7:76:c4 + - 44:67:47:d7:76:c5 + - 44:67:47:d7:76:c6 + - 44:67:47:d7:76:c7 + - 44:67:47:d7:76:c8 + - 44:67:47:d7:76:c9 + - 44:67:47:d7:76:ca + - 44:67:47:d7:76:cb + - cc:05:77:ee:b2:8f + - cc:05:77:ee:b2:90 + - cc:05:77:ee:b2:91 + - cc:05:77:ee:b2:92 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.10 diff --git a/hosts/taishan200-2280-2s48p-256g--a95 b/hosts/taishan200-2280-2s48p-512g--a95 similarity index 81% rename from hosts/taishan200-2280-2s48p-256g--a95 rename to hosts/taishan200-2280-2s48p-512g--a95 index 213d10f..0e88e91 100644 --- a/hosts/taishan200-2280-2s48p-256g--a95 +++ b/hosts/taishan200-2280-2s48p-512g--a95 @@ -1,12 +1,10 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 -memory: 512G -nr_hdd_partitions: 4 +<<: taishan200-2280-2s48p-512g +nr_hdd_partitions: 3 hdd_partitions: - /dev/disk/by-id/scsi-35000039988792e31 - /dev/disk/by-id/scsi-35000039988793705 - /dev/disk/by-id/scsi-35000039988792aa5 +rootfs_partition: - /dev/disk/by-id/scsi-350000399887932fd mac_addr: - cc:05:77:fd:fb:61 @@ -18,3 +16,4 @@ mac_addr: - cc:05:77:fd:fb:67 - cc:05:77:fd:fb:68 model_name: Kunpeng-920 +ipmi_ip: 9.3.8.12 diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 index cdb32f5..f34dc96 100644 --- a/hosts/taishan200-2280-2s64p-256g--a10 +++ b/hosts/taishan200-2280-2s64p-256g--a10 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_ssd_partitions: 1 rootfs_partition: - /dev/disk/by-id/scsi-350000399c8030fd5 diff --git a/hosts/taishan200-2280-2s64p-256g--a3 b/hosts/taishan200-2280-2s64p-256g--a3 index 8f34f3f..f372df5 100644 --- a/hosts/taishan200-2280-2s64p-256g--a3 +++ b/hosts/taishan200-2280-2s64p-256g--a3 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_ssd_partitions: 3 ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43895-part1 diff --git a/hosts/taishan200-2280-2s64p-256g--a36 b/hosts/taishan200-2280-2s64p-256g--a36 index 9757144..4fa59e0 100644 --- a/hosts/taishan200-2280-2s64p-256g--a36 +++ b/hosts/taishan200-2280-2s64p-256g--a36 @@ -1,8 +1,5 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G -nr_ssd_partitions: 1 +<<: taishan200-2280-2s64p-256g +nr_ssd_partitions: 2 rootfs_partition: - /dev/disk/by-id/scsi-3500003999813487d ssd_partitions: diff --git a/hosts/taishan200-2280-2s64p-256g--a4 b/hosts/taishan200-2280-2s64p-256g--a4 index bcfaea7..d00ac8a 100644 --- a/hosts/taishan200-2280-2s64p-256g--a4 +++ b/hosts/taishan200-2280-2s64p-256g--a4 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_ssd_partitions: 3 ssd_partitions: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43892-part1 diff --git a/hosts/taishan200-2280-2s64p-256g--a40 b/hosts/taishan200-2280-2s64p-256g--a40 index d9a9937..a914a29 100644 --- a/hosts/taishan200-2280-2s64p-256g--a40 +++ b/hosts/taishan200-2280-2s64p-256g--a40 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-3500003999812ed81 diff --git a/hosts/taishan200-2280-2s64p-256g--a41 b/hosts/taishan200-2280-2s64p-256g--a41 index 91531fd..6291741 100644 --- a/hosts/taishan200-2280-2s64p-256g--a41 +++ b/hosts/taishan200-2280-2s64p-256g--a41 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8919495 diff --git a/hosts/taishan200-2280-2s64p-256g--a42 b/hosts/taishan200-2280-2s64p-256g--a42 index ed1f188..32b9b00 100644 --- a/hosts/taishan200-2280-2s64p-256g--a42 +++ b/hosts/taishan200-2280-2s64p-256g--a42 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-350000399b8918a11 diff --git a/hosts/taishan200-2280-2s64p-256g--a8 b/hosts/taishan200-2280-2s64p-256g--a8 index e515306..582ee27 100644 --- a/hosts/taishan200-2280-2s64p-256g--a8 +++ b/hosts/taishan200-2280-2s64p-256g--a8 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g rootfs_partition: - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43325 mac_addr: diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 index ce3aa0a..876c586 100644 --- a/hosts/taishan200-2280-2s64p-256g--a9 +++ b/hosts/taishan200-2280-2s64p-256g--a9 @@ -1,7 +1,4 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 128 -memory: 256G +<<: taishan200-2280-2s64p-256g nr_hdd_partitions: 1 hdd_partitions: - /dev/disk/by-id/scsi-35000c500bd6a1347 -- 2.23.0

2 1

[PATCH v2 compass-ci] add queue field into job.yaml
by Xiao Shenwei 28 Oct '20

28 Oct '20

[why] after one job submit, it will be add specified queue before: use tbox_group to discriminate now : use queue field to discriminate so, we should add this field into job.yaml it's come from user's specify(job.yaml) or dafault then put the task into the queue Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- src/lib/job.cr | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/lib/job.cr b/src/lib/job.cr index 8f5dd36..14e6ec7 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -139,6 +139,7 @@ class Job set_kernel_params() set_lkp_server() set_sshr_port() + set_queue() end private def append_init_field @@ -199,6 +200,22 @@ class Job self["result_service"] = "raw_upload" end + private def set_queue + if @hash.has_key?("queue") + if !@hash["queue"].to_s.starts_with?(tbox_group) + raise "an incorrect queue-prefix is specified: #{queue}" + end + return + end + + # set default value + if tbox_group.to_s.starts_with?("vm") || tbox_group.to_s.starts_with?("dc") + self["queue"] = "#{tbox_group}.#{arch}" + else + self["queue"] = tbox_group + end + end + # if not assign tbox_group, set it to a match result from testbox # ?if job special testbox, should we just set tbox_group=textbox private def update_tbox_group_from_testbox -- 2.23.0

4 10

[PATCH v2 compass-ci] container: docker run delete fluentd configration
by Wu Zhende 28 Oct '20

28 Oct '20

[Why] --log-driver has been configured in the global Docker. By default, each docker uses fluentd to collect logs and does not need to be configured separately. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/extract-stats/start | 7 ------- container/scheduler-https/start | 6 ------ container/scheduler/start | 6 ------ container/web-backend-nginx/start | 5 ----- container/web-backend/start | 5 ----- 5 files changed, 29 deletions(-) diff --git a/container/extract-stats/start b/container/extract-stats/start index e5ee777..74cf917 100755 --- a/container/extract-stats/start +++ b/container/extract-stats/start @@ -12,8 +12,6 @@ names = Set.new %w[ REDIS_PORT ES_HOST ES_PORT - FLUENTD_HOST - FLUENTD_PORT MAIL_HOST MAIL_PORT LAB @@ -24,8 +22,6 @@ env = docker_env(defaults) DEFAULT_LKP = '/c/lkp-tests' DEFAULT_CCI = '/c/compass-ci' -FLUENTD_HOST = defaults['FLUENTD_HOST'] || '172.17.0.1' -FLUENTD_PORT = defaults['FLUENTD_PORT'] || '24224' SRV_HTTP_HOST = defaults['SRV_HTTP_HOST'] || Open3.capture3('curl ip.sb')[0].chomp SRV_HTTP_PORT = defaults['SRV_HTTP_PORT'] || '11300' docker_rm "extract-stats" @@ -44,11 +40,8 @@ cmd = %w[ -v /etc/localtime:/etc/localtime:ro -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} -v /srv/result:/result - --log-driver=fluentd - --log-opt fluentd-address=#{FLUENTD_HOST}:#{FLUENTD_PORT} --log-opt mode=non-blocking --log-opt max-buffer-size=4m - --log-opt tag=extract-stats extract-stats ] diff --git a/container/scheduler-https/start b/container/scheduler-https/start index 6b06769..38c4892 100755 --- a/container/scheduler-https/start +++ b/container/scheduler-https/start @@ -19,8 +19,6 @@ names = Set.new %w[ OS_HTTP_PORT INITRD_HTTP_HOST INITRD_HTTP_PORT - FLUENTD_HOST - FLUENTD_PORT TASKQUEUE_PORT TASKQUEUE_HOST ] @@ -34,8 +32,6 @@ SCHED_PORT = defaults['SCHED_PORT'] || '3000' SCHED_HOST = defaults['SCHED_HOST'] || '172.17.0.1' SCHED_HTTPS_PORT = defaults['SCHED_HTTPS_PORT'] || 11306 SCHED_HTTPS_HOST = defaults['SCHED_HTTPS_HOST'] || 'api.compass-ci.openeuler.org' -FLUENTD_HOST = defaults['FLUENTD_HOST'] || '172.17.0.1' -FLUENTD_PORT = defaults['FLUENTD_PORT'] || '24224' docker_rm "s001-alpine-#{SCHED_HTTPS_PORT}" @@ -59,8 +55,6 @@ cmd = %W[ -v /srv/initrd:/srv/initrd:ro -v /srv/os:/srv/os:ro -v /etc/compass-ci/ca:/ca - --log-driver=fluentd - --log-opt fluentd-address=#{FLUENTD_HOST}:#{FLUENTD_PORT} --log-opt mode=non-blocking --log-opt max-buffer-size=4m --log-opt tag=scheduler-#{SCHED_HTTPS_PORT} diff --git a/container/scheduler/start b/container/scheduler/start index 6a2a4b0..8ca12f0 100755 --- a/container/scheduler/start +++ b/container/scheduler/start @@ -17,8 +17,6 @@ names = Set.new %w[ OS_HTTP_PORT INITRD_HTTP_HOST INITRD_HTTP_PORT - FLUENTD_HOST - FLUENTD_PORT TASKQUEUE_PORT TASKQUEUE_HOST GIT_SERVER @@ -42,8 +40,6 @@ DEFAULT_CCI = "#{CCI_REPOS}/compass-ci" LAB = defaults['lab'] || 'z9' SCHED_PORT = defaults['SCHED_PORT'] || '3000' SCHED_HOST = defaults['SCHED_HOST'] || '172.17.0.1' -FLUENTD_HOST = defaults['FLUENTD_HOST'] || '172.17.0.1' -FLUENTD_PORT = defaults['FLUENTD_PORT'] || '24224' FLUENTD_SERVER_PORT = defaults['FLUENTD_SERVER_PORT'] || '24224' DEFAULT_CONFIG_DIR = '/etc/compass-ci/defaults' @@ -79,8 +75,6 @@ cmd = %W[ -v /srv/result:/srv/result -v /srv/initrd:/srv/initrd:ro -v /srv/os:/srv/os:ro - --log-driver=fluentd - --log-opt fluentd-address=#{FLUENTD_HOST}:#{FLUENTD_PORT} --log-opt mode=non-blocking --log-opt max-buffer-size=4m --log-opt tag=scheduler-#{SCHED_PORT} diff --git a/container/web-backend-nginx/start b/container/web-backend-nginx/start index a28101d..4da4c8b 100755 --- a/container/web-backend-nginx/start +++ b/container/web-backend-nginx/start @@ -3,8 +3,6 @@ [[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci -[[ $FLUENTD_HOST ]] || FLUENTD_HOST=localhost -[[ $FLUENTD_PORT ]] || FLUENTD_PORT=24224 . $CCI_SRC/container/defconfig.sh docker_rm web-backend-nginx @@ -17,11 +15,8 @@ cmd=( -v /etc/ssl/certs:/opt/cert - --log-driver=fluentd - --log-opt fluentd-address=$FLUENTD_HOST:$FLUENTD_PORT --log-opt mode=non-blocking --log-opt max-buffer-size=4m - --log-opt tag=web-backend-nginx web-backend-nginx ) diff --git a/container/web-backend/start b/container/web-backend/start index 5fb493c..941fb11 100755 --- a/container/web-backend/start +++ b/container/web-backend/start @@ -5,8 +5,6 @@ [[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci [[ $LKP_SRC ]] || LKP_SRC=/c/lkp-tests [[ $UPSTREAM_REPOS_PATH ]] || UPSTREAM_REPOS_PATH=/c/upstream-repos -[[ $FLUENTD_HOST ]] || FLUENTD_HOST=localhost -[[ $FLUENTD_PORT ]] || FLUENTD_PORT=24224 . $CCI_SRC/container/defconfig.sh docker_rm web-backend @@ -27,11 +25,8 @@ cmd=( -v $LKP_SRC:/c/lkp-tests -v $UPSTREAM_REPOS_PATH:/c/upstream-repos - --log-driver=fluentd - --log-opt fluentd-address=$FLUENTD_HOST:$FLUENTD_PORT --log-opt mode=non-blocking --log-opt max-buffer-size=4m - --log-opt tag=web-backend debian:web-backend ) -- 2.23.0

1 0

[PATCH v2 lkp-tests] lib/monitor.rb:stop optimize
by Wu Zhende 28 Oct '20

28 Oct '20

1.add stop reason 2.close ws before stop EM [Why] Before stop EM, should close ws and give reason first. When the client disconnects from the ws, the reason is not printed. Like this: connect to ws://localhost:11310/filter ............. connection closed: Add stop reason, and it will be like: connect to ws://localhost:11310/filter .......... connection closed: timeout or connection closed: normal Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- lib/monitor.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/monitor.rb b/lib/monitor.rb index 9ce1d475..c20794e8 100755 --- a/lib/monitor.rb +++ b/lib/monitor.rb @@ -27,6 +27,7 @@ class Monitor load_default @result = [] @stop_query = {} + @reason = nil end def load_default @@ -87,16 +88,12 @@ class Monitor ssh root@#{ssh_host} -p #{ssh_port} -o StrictHostKeyChecking=no" end - def stop_em(web_socket) - web_socket.close - EM.stop - end - - def stop(data, web_socket) + def stop(data, web_socket, code = 1000, reason = 'normal') @stop_query.each do |key, value| return false unless data[key] == value end - stop_em(web_socket) + @reason = reason + web_socket.close(code, reason) end def run(timeout = nil) @@ -111,7 +108,8 @@ class Monitor if timeout && timeout != 0 EM.add_timer(timeout) do @exit_status_code = 1 - stop_em(ws) + @reason = 'timeout' + ws.close(1000, @reason) end end @@ -131,7 +129,9 @@ class Monitor end ws.on :close do |event| - puts "connection closed: #{event.reason}" + reason = event.reason || @reason + puts "connection closed: #{reason}" + EM.stop end end return @exit_status_code -- 2.23.0

1 0

[PATCH v2 compass-ci 5/5] container/send-mail: delete old useless files
by Luan Shengde 28 Oct '20

28 Oct '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-mail/conf/sources.list | 9 ----- container/send-mail/mail-post.rb | 48 --------------------------- 2 files changed, 57 deletions(-) delete mode 100644 container/send-mail/conf/sources.list delete mode 100755 container/send-mail/mail-post.rb diff --git a/container/send-mail/conf/sources.list b/container/send-mail/conf/sources.list deleted file mode 100644 index 8179e01..0000000 --- a/container/send-mail/conf/sources.list +++ /dev/null @@ -1,9 +0,0 @@ -deb [trusted=yes] http://mirrors.163.com/debian/ buster main non-free contrib -deb [trusted=yes] http://mirrors.163.com/debian/ buster-updates main non-free contrib -deb [trusted=yes] http://mirrors.163.com/debian/ buster-backports main non-free contrib -deb [trusted=yes] http://mirrors.163.com/debian-security/ buster/updates main non-free contrib - -deb-src [trusted=yes] http://mirrors.163.com/debian/ buster main non-free contrib -deb-src [trusted=yes] http://mirrors.163.com/debian/ buster-updates main non-free contrib -deb-src [trusted=yes] http://mirrors.163.com/debian/ buster-backports main non-free contrib -deb-src [trusted=yes] http://mirrors.163.com/debian-security/ buster/updates main non-free contrib diff --git a/container/send-mail/mail-post.rb b/container/send-mail/mail-post.rb deleted file mode 100755 index 4eecf6e..0000000 --- a/container/send-mail/mail-post.rb +++ /dev/null @@ -1,48 +0,0 @@ -#!/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 'sinatra' -require 'json' -require 'yaml' -require 'open3' -require_relative 'send-mail.rb' - -set :bind, '0.0.0.0' -set :port, 11311 - -post '/send_mail_yaml' do - data = YAML.safe_load request.body.read - raise TypeError, data, 'request data type error' unless data.class.eql? Hash - - mail_info = { - 'references' => data['references'] || '', - 'from' => data['from'] || 'team(a)crystal.ci', - 'subject' => data['subject'], - 'to' => data['to'], - 'body' => data['body'] - } - check_send_mail(mail_info) -end - -post '/send_mail_text' do - data = Mail.read_from_string(request.body.read) - - mail_info = { - 'references' => data.references || '', - 'from' => data.from || 'team(a)crystal.ci', - 'subject' => data.subject, - 'to' => data.to, - 'body' => data.body.decoded - } - check_send_mail(mail_info) -end - -def check_send_mail(mail_info) - raise TypeError, data, 'empty subject.' if mail_info['subject'].empty? - raise TypeError, data, 'empty email address.' if mail_info['to'].empty? - raise TypeError, data, 'empty email content.' if mail_info['body'].empty? - - send_mail(mail_info) -end -- 2.23.0

1 0

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

28 Oct '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-mail/start | 92 +++++++++++++++------------------------ 1 file changed, 34 insertions(+), 58 deletions(-) diff --git a/container/send-mail/start b/container/send-mail/start index 80be86a..95d797f 100755 --- a/container/send-mail/start +++ b/container/send-mail/start @@ -1,60 +1,36 @@ -#!/bin/bash +#!/usr/bin/env ruby # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. - -. $CCI_SRC/container/defconfig.sh - -docker_rm send-mail - -cmd=( - docker run - --restart=always - --name=send-mail - -u nobody - -d - -p 11311:11311 - -v /etc/localtime:/etc/localtime:ro - send-mail -) - -"${cmd[@]}" - -cat<<EOF -port: 11311 ---- -data='{ -"from": "email_from_addr" # default: team(a)crystal.ci -"subject": "email subject", -"to": "email_to_addr", -"body": "email message" -}' - -or - -data=" -from: email_from_addr # default: team(a)crystal.ci -subject: email subject -to: email_to_addr -body: email message" - -when compass-ci: - curl -XPOST 'localhost:11311/send_mail_yaml' -d "$data" -when other server: - curl -XPOST '124.90.34.227:11311/send_mail_yaml' -d "$data" - ---- -data=" -From: email_from_addr # default: team(a)crystal.ci -To: email_to_addr -Subject: email_subject - -mail_msg_line1 -mail_msg_line2 -... -" - -when compass-ci: - curl -XPOST 'localhost:11311/send_mail_text' -d "$data" -when other server: - curl -XPOST '124.90.34.227:11311/send_mail_text' -d "$data" -EOF +# frozen_string_literal: true + +require 'set' +require_relative '../defconfig' + +docker_rm 'send-mail' + +names = Set.new %w[ + LOCAL_SEND_MAIL_PORT + LOCAL_ROBOT_EMAIL_ADDRESS +] + +defaults = relevant_defaults(names) + +cmd = %W[ + docker run + --restart=always + --name=send-mail + -u nobody + -d + -e CCI_SRC=/c/compass-ci + -e SEND_MAIL_PORT=#{defaults['LOCAL_SEND_MAIL_PORT']} + -e ROBOT_EMAIL_ADDRESS=#{defaults['LOCAL_ROBOT_EMAIL_ADDRESS']} + -p #{defaults['LOCAL_SEND_MAIL_PORT']}:#{defaults['LOCAL_SEND_MAIL_PORT']} + -v #{ENV['CCI_SRC']}:/c/compass-ci + -v /etc/localtime:/etc/localtime:ro + -w /c/compass-ci/container/send-mail + send-mail +] + +cmd += ['ruby', 'send-mail.rb'] + +system(*cmd) -- 2.23.0

1 0

[PATCH v2 compass-ci 3/5] container/send-mail: Dockerfile
by Luan Shengde 28 Oct '20

28 Oct '20

Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-mail/Dockerfile | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/container/send-mail/Dockerfile b/container/send-mail/Dockerfile index 36b145c..d151bda 100644 --- a/container/send-mail/Dockerfile +++ b/container/send-mail/Dockerfile @@ -2,18 +2,8 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. FROM debian -MAINTAINER luanshd0525(a)163.com +MAINTAINER shdluan(a)163.com ENV DEBIAN_FRONTEND noninteractive -COPY conf/sources.list* /etc/apt/ RUN apt-get update && \ - apt-get install -y ruby-mail ruby-json ruby-sinatra && \ - ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo 'Asia/Shanghai' > /etc/timezone - -EXPOSE 25 - -COPY mail-post.rb /usr/local/bin/ -COPY send-mail.rb /usr/local/bin/ - -CMD ["/usr/local/bin/mail-post.rb"] + apt-get install -y ruby-mail ruby-json ruby-sinatra -- 2.23.0

1 0

[PATCH v2 compass-ci 2/5] container/send-mail: mail-post.rb
by Luan Shengde 28 Oct '20

28 Oct '20

fix invoke function name error Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- lib/mail-post.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mail-post.rb b/lib/mail-post.rb index 5832bfb..0b1f94a 100755 --- a/lib/mail-post.rb +++ b/lib/mail-post.rb @@ -22,7 +22,7 @@ post '/send_mail_yaml' do 'body' => data['body'] } - check_send_mail(mail_info) + send_mail(mail_info) end post '/send_mail_text' do -- 2.23.0

1 0

[PATCH v2 compass-ci 1/5] container/send-mail: send-mail.rb
by Luan Shengde 28 Oct '20

28 Oct '20

setup smtp config for email server invoke mail-post to hand the send mail request Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-mail/send-mail.rb | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/container/send-mail/send-mail.rb b/container/send-mail/send-mail.rb index f459e78..436736c 100755 --- a/container/send-mail/send-mail.rb +++ b/container/send-mail/send-mail.rb @@ -4,25 +4,14 @@ # frozen_string_literal: true require 'mail' +require 'sinatra' +require "#{ENV['CCI_SRC']}/lib/mail-post" -mail_server = `/sbin/ip route |awk '/default/ {print $3}'`.chomp +mail_server = %x(/sbin/ip route |awk '/default/ {print $3}').chomp -# setup smtp config smtp = { address: mail_server, enable_starttls_auto: false } Mail.defaults { delivery_method :smtp, smtp } - -# send mail -def send_mail(mail_info) - mail = Mail.new do - references mail_info['references'] - from mail_info['from'] - subject mail_info['subject'] - to mail_info['to'] - body mail_info['body'] - end - mail.deliver! -end -- 2.23.0

1 0

[PATCH compass-ci] LICENSE: add document license
by Bai Jing 27 Oct '20

27 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- LICENSES/CCBY-4.0 | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 LICENSES/CCBY-4.0 diff --git a/LICENSES/CCBY-4.0 b/LICENSES/CCBY-4.0 new file mode 100644 index 0000000..112f1cd --- /dev/null +++ b/LICENSES/CCBY-4.0 @@ -0,0 +1,2 @@ +Copyright (c) 2020 Huawei Technologies Co., Ltd. +Your copying, use, modification, and distribution of this document is subject to the Creative Commons Attribution-ShareAlike 4.0 International Public License ("CC BY-SA 4.0"). For ease of understanding, you can visit https://creativecommons.org/licenses/by-sa/4.0/to learn about the outline of CC BY-SA 4.0(but not a substitute).The complete agreement of CC BY-SA 4.0 can be obtained from the following website: https://creativecommons.org/licenses/by-sa/4.0/legalcode. -- 2.23.0

2 1

[PATCH compass-ci] sparrow: 3-code/dev-env: add ENV TASKQUEUE_HOST
by Liu Yinsi 27 Oct '20

27 Oct '20

TASKQUEUE_HOST used by container service taskqueue, taskqueue port is default 3060. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/3-code/dev-env | 1 + 1 file changed, 1 insertion(+) diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 11c7fb0..44f7a93 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -17,6 +17,7 @@ mkdir -p /etc/compass-ci/defaults cat > /etc/compass-ci/defaults/$server_name.yaml <<EOF SCHED_HOST: $sched_host SCHED_PORT: $sched_port +TASKQUEUE_HOST: $server_ip OS_HTTP_HOST: $os_http_host INITRD_HTTP_HOST: $initrd_http_host INITRD_HTTP_PORT: $initrd_http_port -- 2.23.0

3 4

[PATCH v2 lkp-tests 1/2] jobs/block_size.yaml: add block_size.yaml
by Lu Kaiyi 27 Oct '20

27 Oct '20

[why] need test different block_size value Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- jobs/block_size.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 jobs/block_size.yaml diff --git a/jobs/block_size.yaml b/jobs/block_size.yaml new file mode 100644 index 00000000..1e2239e5 --- /dev/null +++ b/jobs/block_size.yaml @@ -0,0 +1,21 @@ +suite: iozone +testcase: iozone +category: benchmark + +block_size: +- 64k +- 256k +- 1m +- 4m +- 16m + +disk: 2HDD + +fs: +- xfs +- ext4 +- btrfs +iosched: +- kyber + +iozone: -- 2.23.0

2 1

[PATCH v7 lkp-tests] tests: add get_cpu function
by Zhang Yu 27 Oct '20

27 Oct '20

[why] Obtain more host information from 'lscpu' Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- tests/host-info | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/host-info b/tests/host-info index 46f43f93..4d935944 100755 --- a/tests/host-info +++ b/tests/host-info @@ -1,20 +1,24 @@ #!/bin/bash -get_node() +get_memory() { - echo "nr_node: $(grep -Eo 'Node [0-9]+,' /proc/zoneinfo | uniq | wc -l)" - echo "nr_cpu: $(nproc)" memory_total=$(cat /proc/meminfo |grep MemTotal | awk '{print $2}') memory_new=$(awk 'BEGIN{printf "%0.2f", '$memory_total'/1024/1024/16}') memory=$(echo `expr $(echo $memory_new | awk '{print int($0)+1}') \* 16`)G echo "memory: $memory" } -get_model_name() +get_cpu() { - echo "model_name: $(lscpu |grep "Model name" | awk '{print $3}')" + echo $1: $(lscpu | awk -F': *' '/'$2':/{print $2}') } +cpu_info=("arch Architecture" "nr_node NUMA\snode$s$" "nr_cpu ^CPU$s$" "model_name Model\sname") +for info in "${cpu_info[@]}" +do + get_cpu $info +done + get_nr_disk() { nr_hdd_disks=$(lsblk -d -o name,ROTA | grep -v loop | awk '{print $2}' | grep 1 | wc -l) @@ -101,11 +105,10 @@ get_ipmi_ip() main() { - get_node + get_memory get_nr_disk get_partitions get_mac - get_model_name get_ipmi_ip } -- 2.23.0

3 2

[PATCH v2 compass-ci] container/debian: solve build error
by Cui Yili 27 Oct '20

27 Oct '20

[why] Executing "container/debian/build", error when apt-get installs the package: E: Could not configure 'libc6:arm64'. E: Could not perform immediate configuration on 'libnss-nis:arm64'. Please see man 5 apt.conf under APT::Immediate-Configure for details. (2) [how] Increase the parameter "-o APT::Immediate-Configure=false" when apt-get installs the package. reference: https://www.debian.org/releases/wheezy/armhf/release-notes/ch-upgrading.en.… Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/debian/Dockerfile b/container/debian/Dockerfile index 1d310da..21b6a22 100644 --- a/container/debian/Dockerfile +++ b/container/debian/Dockerfile @@ -12,6 +12,6 @@ COPY root / RUN sed -i "s/^exit [0-9]*/exit 0/" /usr/sbin/policy-rc.d RUN apt-get update && \ apt-get install -y --no-install-recommends apt-utils > /dev/null 2>&1 && \ - apt-get install -y runit openssh-server zsh vim rsync git make gcc g++ tzdata sudo && \ + apt-get install -o APT::Immediate-Configure=false -y runit openssh-server zsh vim rsync git make gcc g++ tzdata sudo && \ mkdir -p /run/sshd -- 2.23.0

1 0

[PATCH v6 lkp-tests] tests: add get_cpu function
by Zhang Yu 27 Oct '20

27 Oct '20

[why] Obtain more host information from 'lscpu' Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- tests/host-info | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/host-info b/tests/host-info index 46f43f93..e79680e9 100755 --- a/tests/host-info +++ b/tests/host-info @@ -1,20 +1,23 @@ #!/bin/bash -get_node() +get_memory() { - echo "nr_node: $(grep -Eo 'Node [0-9]+,' /proc/zoneinfo | uniq | wc -l)" - echo "nr_cpu: $(nproc)" memory_total=$(cat /proc/meminfo |grep MemTotal | awk '{print $2}') memory_new=$(awk 'BEGIN{printf "%0.2f", '$memory_total'/1024/1024/16}') memory=$(echo `expr $(echo $memory_new | awk '{print int($0)+1}') \* 16`)G echo "memory: $memory" } -get_model_name() +get_cpu() { - echo "model_name: $(lscpu |grep "Model name" | awk '{print $3}')" + echo $1: $(lscpu | awk -F': *' '/'$2':/{print $2}') } +get_cpu arch 'Architecture' +get_cpu nr_node 'NUMA\snode$s$' +get_cpu nr_cpu '^CPU$s$' +get_cpu model_name 'Model\sname' + get_nr_disk() { nr_hdd_disks=$(lsblk -d -o name,ROTA | grep -v loop | awk '{print $2}' | grep 1 | wc -l) @@ -101,11 +104,10 @@ get_ipmi_ip() main() { - get_node + get_memory get_nr_disk get_partitions get_mac - get_model_name get_ipmi_ip } -- 2.23.0

2 2

[PATCH v3 compass-ci] fix: taskqueue: add TASKQUEUE_HOST to container
by Tong Qunfeng 27 Oct '20

27 Oct '20

[how] 1. add TASKQUEUE_HOST to system default configure file (/etc/compass-ci/defaults/*.yaml) 2. add TASKQUEUE_HOST to taskqueue container start file. Signed-off-by: Tong Qunfeng <taxcom(a)tom.com> --- container/taskqueue/start | 1 + 1 file changed, 1 insertion(+) diff --git a/container/taskqueue/start b/container/taskqueue/start index bdd5e7c..45a8b03 100755 --- a/container/taskqueue/start +++ b/container/taskqueue/start @@ -8,6 +8,7 @@ require_relative '../defconfig.rb' names = Set.new %w[ TASKQUEUE_PORT + TASKQUEUE_HOST REDIS_HOST REDIS_PORT ] -- 2.23.0

1 1

[PATCH v2 compass-ci] [why] current container will only bind to special ip (172.17.0.1 and the configured TASKQUEUE_HOST at default configure file). some servier default visit 172.17.0.1, but some visit (at crystal) 172.168.131.113 as default.
by Tong Qunfeng 27 Oct '20

27 Oct '20

[how] 1. add TASKQUEUE_HOST to system default configure file (/etc/compass-ci/defaults/*.yaml) 2. add TASKQUEUE_HOST to taskqueue container start file. Signed-off-by: Tong Qunfeng <taxcom(a)tom.com> --- container/taskqueue/start | 1 + 1 file changed, 1 insertion(+) diff --git a/container/taskqueue/start b/container/taskqueue/start index bdd5e7c..45a8b03 100755 --- a/container/taskqueue/start +++ b/container/taskqueue/start @@ -8,6 +8,7 @@ require_relative '../defconfig.rb' names = Set.new %w[ TASKQUEUE_PORT + TASKQUEUE_HOST REDIS_HOST REDIS_PORT ] -- 2.23.0

1 1

[PATCH compass-ci] fix: taskqueue: add TQSKQUEUE_HOST to container
by Tong Qunfeng 27 Oct '20

27 Oct '20

[why] current container will only bind to special ip (172.17.0.1 and the configured TASKQUEUE_HOST at default configure file). some servier default visit 172.17.0.1, but some visit (at crystal) 172.168.131.113 as default. [how] 1. add TASKQUEUE_HOST to system default configure file (/etc/compass-ci/defaults/*.yaml) 2. add TASKQUEUE_HOST to taskqueue container start file. Signed-off-by: Tong Qunfeng <taxcom(a)tom.com> --- container/taskqueue/start | 1 + 1 file changed, 1 insertion(+) diff --git a/container/taskqueue/start b/container/taskqueue/start index bdd5e7c..45a8b03 100755 --- a/container/taskqueue/start +++ b/container/taskqueue/start @@ -8,6 +8,7 @@ require_relative '../defconfig.rb' names = Set.new %w[ TASKQUEUE_PORT + TASKQUEUE_HOST REDIS_HOST REDIS_PORT ] -- 2.23.0

1 1

[PATCH v4 compass-ci] fix: taskqueue: add TASKQUEUE_HOST to container
by Tong Qunfeng 27 Oct '20

27 Oct '20

[why] current container will only bind to special ip (172.17.0.1 and the configured TASKQUEUE_HOST at default configure file). some servier default visit 172.17.0.1, but some visit (at crystal) 172.168.131.113 as default. [how] 1. add TASKQUEUE_HOST to system default configure file (/etc/compass-ci/defaults/*.yaml) 2. add TASKQUEUE_HOST to taskqueue container start file. Signed-off-by: Tong Qunfeng <taxcom(a)tom.com> --- container/taskqueue/start | 1 + 1 file changed, 1 insertion(+) diff --git a/container/taskqueue/start b/container/taskqueue/start index bdd5e7c..45a8b03 100755 --- a/container/taskqueue/start +++ b/container/taskqueue/start @@ -8,6 +8,7 @@ require_relative '../defconfig.rb' names = Set.new %w[ TASKQUEUE_PORT + TASKQUEUE_HOST REDIS_HOST REDIS_PORT ] -- 2.23.0

1 0

[PATCH lab-z9 1/3] new hosts file
by Zhang Dewan 27 Oct '20

27 Oct '20

--- hosts/m | 40 ++++++++++++++++++++++++++++++++++++++++ hosts/p | 10 ++++++++++ 2 files changed, 50 insertions(+) create mode 100644 hosts/m create mode 100644 hosts/p diff --git a/hosts/m b/hosts/m new file mode 100644 index 0000000..b73dfb7 --- /dev/null +++ b/hosts/m @@ -0,0 +1,40 @@ +taishan200-2280-2s48p-256g--a11 a11 +taishan200-2280-2s48p-256g--a13 a13 +taishan200-2280-2s48p-256g--a14 a14 +taishan200-2280-2s48p-256g--a15 a15 +taishan200-2280-2s48p-256g--a17 a17 +taishan200-2280-2s48p-256g--a18 a18 +taishan200-2280-2s48p-256g--a19 a19 +taishan200-2280-2s48p-256g--a21 a21 +taishan200-2280-2s48p-256g--a22 a22 +taishan200-2280-2s48p-256g--a24 a24 +taishan200-2280-2s48p-256g--a25 a25 +taishan200-2280-2s48p-256g--a26 a26 +taishan200-2280-2s48p-256g--a27 a27 +taishan200-2280-2s48p-256g--a28 a28 +taishan200-2280-2s48p-256g--a29 a29 +taishan200-2280-2s48p-256g--a30 a30 +taishan200-2280-2s48p-256g--a31 a31 +taishan200-2280-2s48p-256g--a32 a32 +taishan200-2280-2s48p-256g--a33 a33 +taishan200-2280-2s48p-256g--a34 a34 +taishan200-2280-2s48p-256g--a52 a52 +taishan200-2280-2s48p-256g--a53 a53 +taishan200-2280-2s48p-256g--a60 a60 +taishan200-2280-2s48p-256g--a61 a61 +taishan200-2280-2s48p-256g--a62 a62 +taishan200-2280-2s48p-256g--a66 a66 +taishan200-2280-2s48p-256g--a67 a67 +taishan200-2280-2s48p-256g--a68 a68 +taishan200-2280-2s48p-256g--a69 a69 +taishan200-2280-2s48p-256g--a70 a70 +taishan200-2280-2s48p-256g--a71 a71 +taishan200-2280-2s64p-256g--a10 a10 +taishan200-2280-2s64p-256g--a3 a3 +taishan200-2280-2s64p-256g--a36 a36 +taishan200-2280-2s64p-256g--a4 a4 +taishan200-2280-2s64p-256g--a40 a40 +taishan200-2280-2s64p-256g--a41 a41 +taishan200-2280-2s64p-256g--a42 a42 +taishan200-2280-2s64p-256g--a8 a8 +taishan200-2280-2s64p-256g--a9 a9 diff --git a/hosts/p b/hosts/p new file mode 100644 index 0000000..9d47282 --- /dev/null +++ b/hosts/p @@ -0,0 +1,10 @@ +#!/bin/bash + +while read line +do + + i=$(echo $line | awk '{print $2}') + j=$(echo $line | awk '{print $1}') + ip=$(grep $i /home/dewan/servers.info | head -n 1 |awk '{print $1}') + echo "ipmi_ip: $ip" >> $j +done < m -- 2.23.0

5 5

[PATCH compass-ci] sparrow/0-package: add epel-release package.
by Zhang Yale 27 Oct '20

27 Oct '20

[Why] Before install redis and lockfile-progs in centos, need install epel-release package first. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- sparrow/0-package/os/centos | 1 + 1 file changed, 1 insertion(+) diff --git a/sparrow/0-package/os/centos b/sparrow/0-package/os/centos index 261592c..8dcab75 100755 --- a/sparrow/0-package/os/centos +++ b/sparrow/0-package/os/centos @@ -3,6 +3,7 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. pkgs=( + epel-release vim git gcc -- 2.23.0

2 1

[PATCH compass-ci] sparrow/0-package: add restart redis
by Zhang Yale 27 Oct '20

27 Oct '20

[Why] When redis was installed in centos, It need to start redis.service. Signed-off-by: Zhang Yale <zhangyale3(a)huawei.com> --- sparrow/0-package/common | 1 + 1 file changed, 1 insertion(+) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 31588f4..f73f2c4 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -40,3 +40,4 @@ cat > /etc/docker/daemon.json <<EOF EOF systemctl restart docker +systemctl restart redis -- 2.23.0

1 0

[PATCH lab-z9 1/2] new hosts file
by Zhang Dewan 27 Oct '20

27 Oct '20

--- hosts/m | 40 ++++++++++++++++++++++++++++++++++++++++ hosts/p | 10 ++++++++++ 2 files changed, 50 insertions(+) create mode 100644 hosts/m create mode 100644 hosts/p diff --git a/hosts/m b/hosts/m new file mode 100644 index 0000000..b73dfb7 --- /dev/null +++ b/hosts/m @@ -0,0 +1,40 @@ +taishan200-2280-2s48p-256g--a11 a11 +taishan200-2280-2s48p-256g--a13 a13 +taishan200-2280-2s48p-256g--a14 a14 +taishan200-2280-2s48p-256g--a15 a15 +taishan200-2280-2s48p-256g--a17 a17 +taishan200-2280-2s48p-256g--a18 a18 +taishan200-2280-2s48p-256g--a19 a19 +taishan200-2280-2s48p-256g--a21 a21 +taishan200-2280-2s48p-256g--a22 a22 +taishan200-2280-2s48p-256g--a24 a24 +taishan200-2280-2s48p-256g--a25 a25 +taishan200-2280-2s48p-256g--a26 a26 +taishan200-2280-2s48p-256g--a27 a27 +taishan200-2280-2s48p-256g--a28 a28 +taishan200-2280-2s48p-256g--a29 a29 +taishan200-2280-2s48p-256g--a30 a30 +taishan200-2280-2s48p-256g--a31 a31 +taishan200-2280-2s48p-256g--a32 a32 +taishan200-2280-2s48p-256g--a33 a33 +taishan200-2280-2s48p-256g--a34 a34 +taishan200-2280-2s48p-256g--a52 a52 +taishan200-2280-2s48p-256g--a53 a53 +taishan200-2280-2s48p-256g--a60 a60 +taishan200-2280-2s48p-256g--a61 a61 +taishan200-2280-2s48p-256g--a62 a62 +taishan200-2280-2s48p-256g--a66 a66 +taishan200-2280-2s48p-256g--a67 a67 +taishan200-2280-2s48p-256g--a68 a68 +taishan200-2280-2s48p-256g--a69 a69 +taishan200-2280-2s48p-256g--a70 a70 +taishan200-2280-2s48p-256g--a71 a71 +taishan200-2280-2s64p-256g--a10 a10 +taishan200-2280-2s64p-256g--a3 a3 +taishan200-2280-2s64p-256g--a36 a36 +taishan200-2280-2s64p-256g--a4 a4 +taishan200-2280-2s64p-256g--a40 a40 +taishan200-2280-2s64p-256g--a41 a41 +taishan200-2280-2s64p-256g--a42 a42 +taishan200-2280-2s64p-256g--a8 a8 +taishan200-2280-2s64p-256g--a9 a9 diff --git a/hosts/p b/hosts/p new file mode 100644 index 0000000..9d47282 --- /dev/null +++ b/hosts/p @@ -0,0 +1,10 @@ +#!/bin/bash + +while read line +do + + i=$(echo $line | awk '{print $2}') + j=$(echo $line | awk '{print $1}') + ip=$(grep $i /home/dewan/servers.info | head -n 1 |awk '{print $1}') + echo "ipmi_ip: $ip" >> $j +done < m -- 2.23.0

4 3

[PATCH compass-ci 3/5] container/send-mail: Dockerfile
by Luan Shengde 27 Oct '20

27 Oct '20

updata Dockerfile Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-mail/Dockerfile | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/container/send-mail/Dockerfile b/container/send-mail/Dockerfile index 36b145c..d151bda 100644 --- a/container/send-mail/Dockerfile +++ b/container/send-mail/Dockerfile @@ -2,18 +2,8 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. FROM debian -MAINTAINER luanshd0525(a)163.com +MAINTAINER shdluan(a)163.com ENV DEBIAN_FRONTEND noninteractive -COPY conf/sources.list* /etc/apt/ RUN apt-get update && \ - apt-get install -y ruby-mail ruby-json ruby-sinatra && \ - ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ - echo 'Asia/Shanghai' > /etc/timezone - -EXPOSE 25 - -COPY mail-post.rb /usr/local/bin/ -COPY send-mail.rb /usr/local/bin/ - -CMD ["/usr/local/bin/mail-post.rb"] + apt-get install -y ruby-mail ruby-json ruby-sinatra -- 2.23.0

2 1

[PATCH compass-ci 4/5] container/send-mail: start
by Luan Shengde 27 Oct '20

27 Oct '20

update start Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/send-mail/start | 68 +++++++++++++-------------------------- 1 file changed, 22 insertions(+), 46 deletions(-) diff --git a/container/send-mail/start b/container/send-mail/start index 80be86a..95d6b02 100755 --- a/container/send-mail/start +++ b/container/send-mail/start @@ -1,60 +1,36 @@ -#!/bin/bash +#!/usr/bin/env ruby # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true -. $CCI_SRC/container/defconfig.sh +require 'set' +require_relative '../defconfig' -docker_rm send-mail +docker_rm 'send-mail' -cmd=( +names = Set.new %w[ + LOCAL_SEND_MAIL_PORT + LOCAL_ROBOT_EMAIL_ADDRESS +] + +defaults = relevant_defaults(names) + +cmd = %W[ docker run --restart=always --name=send-mail -u nobody -d - -p 11311:11311 + -e CCI_SRC=/c/compass-ci + -e SEND_MAIL_PORT=#{defaults['LOCAL_SEND_MAIL_PORT']} + -e ROBOT_EMAIL_ADDRESS=#{defaults['LOCAL_ROBOT_EMAIL_ADDRESS']} + -p #{defaults['LOCAL_SEND_MAIL_PORT']}:#{defaults['LOCAL_SEND_MAIL_PORT']} + -v #{ENV['CCI_SRC']}:/c/compass-ci -v /etc/localtime:/etc/localtime:ro + -w /c/compass-ci/container/send-mail send-mail -) - -"${cmd[@]}" - -cat<<EOF -port: 11311 ---- -data='{ -"from": "email_from_addr" # default: team(a)crystal.ci -"subject": "email subject", -"to": "email_to_addr", -"body": "email message" -}' - -or - -data=" -from: email_from_addr # default: team(a)crystal.ci -subject: email subject -to: email_to_addr -body: email message" - -when compass-ci: - curl -XPOST 'localhost:11311/send_mail_yaml' -d "$data" -when other server: - curl -XPOST '124.90.34.227:11311/send_mail_yaml' -d "$data" - ---- -data=" -From: email_from_addr # default: team(a)crystal.ci -To: email_to_addr -Subject: email_subject +] -mail_msg_line1 -mail_msg_line2 -... -" +cmd += ['ruby', 'send-mail.rb'] -when compass-ci: - curl -XPOST 'localhost:11311/send_mail_text' -d "$data" -when other server: - curl -XPOST '124.90.34.227:11311/send_mail_text' -d "$data" -EOF +system(*cmd) -- 2.23.0

2 4

[PATCH lkp-tests 1/2] jobs/block_size.yaml: add block_size.yaml [why] need test different block_size value
by Lu Kaiyi 27 Oct '20

27 Oct '20

Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- jobs/block_size.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 jobs/block_size.yaml diff --git a/jobs/block_size.yaml b/jobs/block_size.yaml new file mode 100644 index 00000000..1e2239e5 --- /dev/null +++ b/jobs/block_size.yaml @@ -0,0 +1,21 @@ +suite: iozone +testcase: iozone +category: benchmark + +block_size: +- 64k +- 256k +- 1m +- 4m +- 16m + +disk: 2HDD + +fs: +- xfs +- ext4 +- btrfs +iosched: +- kyber + +iozone: -- 2.23.0

2 1

[PATCH lab-z9 2/2] add new host file
by Zhang Dewan 27 Oct '20

27 Oct '20

--- hosts/m | 43 ++------------------------ hosts/taishan200-2280-2s48p-256g--a102 | 1 - hosts/taishan200-2280-2s48p-256g--a103 | 24 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a104 | 23 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a105 | 24 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a106 | 24 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a107 | 24 ++++++++++++++ hosts/taishan200-2280-2s48p-256g--a16 | 20 ++++++++++++ hosts/taishan200-2280-2s48p-256g--a35 | 21 +++++++++++++ hosts/taishan200-2280-2s48p-256g--a63 | 19 ++++++++++++ hosts/taishan200-2280-2s48p-256g--a87 | 20 ++++++++++++ hosts/taishan200-2280-2s48p-256g--a95 | 1 - 12 files changed, 202 insertions(+), 42 deletions(-) create mode 100644 hosts/taishan200-2280-2s48p-256g--a103 create mode 100644 hosts/taishan200-2280-2s48p-256g--a104 create mode 100644 hosts/taishan200-2280-2s48p-256g--a105 create mode 100644 hosts/taishan200-2280-2s48p-256g--a106 create mode 100644 hosts/taishan200-2280-2s48p-256g--a107 create mode 100644 hosts/taishan200-2280-2s48p-256g--a16 create mode 100644 hosts/taishan200-2280-2s48p-256g--a35 create mode 100644 hosts/taishan200-2280-2s48p-256g--a63 create mode 100644 hosts/taishan200-2280-2s48p-256g--a87 diff --git a/hosts/m b/hosts/m index b73dfb7..73ba010 100644 --- a/hosts/m +++ b/hosts/m @@ -1,40 +1,3 @@ -taishan200-2280-2s48p-256g--a11 a11 -taishan200-2280-2s48p-256g--a13 a13 -taishan200-2280-2s48p-256g--a14 a14 -taishan200-2280-2s48p-256g--a15 a15 -taishan200-2280-2s48p-256g--a17 a17 -taishan200-2280-2s48p-256g--a18 a18 -taishan200-2280-2s48p-256g--a19 a19 -taishan200-2280-2s48p-256g--a21 a21 -taishan200-2280-2s48p-256g--a22 a22 -taishan200-2280-2s48p-256g--a24 a24 -taishan200-2280-2s48p-256g--a25 a25 -taishan200-2280-2s48p-256g--a26 a26 -taishan200-2280-2s48p-256g--a27 a27 -taishan200-2280-2s48p-256g--a28 a28 -taishan200-2280-2s48p-256g--a29 a29 -taishan200-2280-2s48p-256g--a30 a30 -taishan200-2280-2s48p-256g--a31 a31 -taishan200-2280-2s48p-256g--a32 a32 -taishan200-2280-2s48p-256g--a33 a33 -taishan200-2280-2s48p-256g--a34 a34 -taishan200-2280-2s48p-256g--a52 a52 -taishan200-2280-2s48p-256g--a53 a53 -taishan200-2280-2s48p-256g--a60 a60 -taishan200-2280-2s48p-256g--a61 a61 -taishan200-2280-2s48p-256g--a62 a62 -taishan200-2280-2s48p-256g--a66 a66 -taishan200-2280-2s48p-256g--a67 a67 -taishan200-2280-2s48p-256g--a68 a68 -taishan200-2280-2s48p-256g--a69 a69 -taishan200-2280-2s48p-256g--a70 a70 -taishan200-2280-2s48p-256g--a71 a71 -taishan200-2280-2s64p-256g--a10 a10 -taishan200-2280-2s64p-256g--a3 a3 -taishan200-2280-2s64p-256g--a36 a36 -taishan200-2280-2s64p-256g--a4 a4 -taishan200-2280-2s64p-256g--a40 a40 -taishan200-2280-2s64p-256g--a41 a41 -taishan200-2280-2s64p-256g--a42 a42 -taishan200-2280-2s64p-256g--a8 a8 -taishan200-2280-2s64p-256g--a9 a9 +taishan200-2280-2s48p-256g--a16 a16 +taishan200-2280-2s48p-256g--a35 a35 +taishan200-2280-2s48p-256g--a87 a87 diff --git a/hosts/taishan200-2280-2s48p-256g--a102 b/hosts/taishan200-2280-2s48p-256g--a102 index e1d3f10..267a962 100644 --- a/hosts/taishan200-2280-2s48p-256g--a102 +++ b/hosts/taishan200-2280-2s48p-256g--a102 @@ -1,4 +1,3 @@ -arch: aarch64 nr_node: 4 nr_cpu: 96 memory: 512G diff --git a/hosts/taishan200-2280-2s48p-256g--a103 b/hosts/taishan200-2280-2s48p-256g--a103 new file mode 100644 index 0000000..4afef3c --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a103 @@ -0,0 +1,24 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bdc69 + - /dev/disk/by-id/scsi-350000399b88bdd85 + - /dev/disk/by-id/scsi-350000399b88bdc4d + - /dev/disk/by-id/scsi-350000399b88bdc7d +mac_addr: + - 44:67:47:c9:d8:b8 + - 44:67:47:c9:d8:b9 + - 44:67:47:c9:d8:ba + - 44:67:47:c9:d8:bb + - 44:67:47:c9:d8:bc + - 44:67:47:c9:d8:bd + - 44:67:47:c9:d8:be + - 44:67:47:c9:d8:bf + - cc:05:77:ee:b5:4f + - cc:05:77:ee:b5:50 + - cc:05:77:ee:b5:51 + - cc:05:77:ee:b5:52 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a104 b/hosts/taishan200-2280-2s48p-256g--a104 new file mode 100644 index 0000000..3c5b807 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a104 @@ -0,0 +1,23 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8892431 + - /dev/disk/by-id/scsi-350000399b8892f81 + - /dev/disk/by-id/scsi-350000399b8891c49 + - /dev/disk/by-id/scsi-350000399b88930d1 +mac_addr: + - 44:67:47:d7:6d:f0 + - 44:67:47:d7:6d:f1 + - 44:67:47:d7:6d:f2 + - 44:67:47:d7:6d:f3 + - 44:67:47:d7:6d:f4 + - 44:67:47:d7:6d:f5 + - 44:67:47:d7:6d:f6 + - 44:67:47:d7:6d:f7 + - cc:05:77:ee:b9:6f + - cc:05:77:ee:b9:70 + - cc:05:77:ee:b9:71 + - cc:05:77:ee:b9:72 +model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a105 b/hosts/taishan200-2280-2s48p-256g--a105 new file mode 100644 index 0000000..3c28d2d --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a105 @@ -0,0 +1,24 @@ +nr_node: 4 +nr_cpu: 96 +memory: 512G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b891945d + - /dev/disk/by-id/scsi-350000399b8919135 + - /dev/disk/by-id/scsi-350000399b8919699 + - /dev/disk/by-id/scsi-350000399b89190d5 +mac_addr: + - 44:67:47:d7:76:c4 + - 44:67:47:d7:76:c5 + - 44:67:47:d7:76:c6 + - 44:67:47:d7:76:c7 + - 44:67:47:d7:76:c8 + - 44:67:47:d7:76:c9 + - 44:67:47:d7:76:ca + - 44:67:47:d7:76:cb + - cc:05:77:ee:b2:8f + - cc:05:77:ee:b2:90 + - cc:05:77:ee:b2:91 + - cc:05:77:ee:b2:92 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.10 diff --git a/hosts/taishan200-2280-2s48p-256g--a106 b/hosts/taishan200-2280-2s48p-256g--a106 new file mode 100644 index 0000000..a7b44a0 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a106 @@ -0,0 +1,24 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b883bf99 + - /dev/disk/by-id/scsi-350000399b883ba89 + - /dev/disk/by-id/scsi-350000399b883b94d + - /dev/disk/by-id/scsi-350000399b883b981 +mac_addr: + - 44:67:47:86:1c:30 + - 44:67:47:86:1c:31 + - 44:67:47:86:1c:32 + - 44:67:47:86:1c:33 + - 44:67:47:86:1c:34 + - 44:67:47:86:1c:35 + - 44:67:47:86:1c:36 + - 44:67:47:86:1c:37 + - cc:05:77:ee:b7:df + - cc:05:77:ee:b7:e0 + - cc:05:77:ee:b7:e1 + - cc:05:77:ee:b7:e2 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a107 b/hosts/taishan200-2280-2s48p-256g--a107 new file mode 100644 index 0000000..9d20e57 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a107 @@ -0,0 +1,24 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8917c39 + - /dev/disk/by-id/scsi-350000399b8918005 + - /dev/disk/by-id/scsi-350000399b8900a4d + - /dev/disk/by-id/scsi-350000399b8900799 +mac_addr: + - 84:46:fe:73:a2:71 + - 84:46:fe:73:a2:72 + - 84:46:fe:73:a2:73 + - 84:46:fe:73:a2:74 + - 84:46:fe:73:a2:75 + - 84:46:fe:73:a2:76 + - 84:46:fe:73:a2:77 + - 84:46:fe:73:a2:78 + - 44:a1:91:35:1a:70 + - 44:a1:91:35:1a:71 + - 44:a1:91:35:1a:72 + - 44:a1:91:35:1a:73 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.12 diff --git a/hosts/taishan200-2280-2s48p-256g--a16 b/hosts/taishan200-2280-2s48p-256g--a16 new file mode 100644 index 0000000..62cb124 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a16 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bf271 + - /dev/disk/by-id/scsi-350000399b88bf1a9 + - /dev/disk/by-id/scsi-350000399b88bf0d5 + - /dev/disk/by-id/scsi-350000399b88bf385 +mac_addr: + - 84:46:fe:3d:a2:17 + - 84:46:fe:3d:a2:18 + - 84:46:fe:3d:a2:19 + - 84:46:fe:3d:a2:1a + - 84:46:fe:3d:a2:1b + - 84:46:fe:3d:a2:1c + - 84:46:fe:3d:a2:1d + - 84:46:fe:3d:a2:1e +model_name: Kunpeng-920 +ipmi_ip: 9.3.5.6 diff --git a/hosts/taishan200-2280-2s48p-256g--a35 b/hosts/taishan200-2280-2s48p-256g--a35 new file mode 100644 index 0000000..ec1e524 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a35 @@ -0,0 +1,21 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 3 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a71a5 + - /dev/disk/by-id/scsi-350000399886b66dd-part1 + - /dev/disk/by-id/scsi-350000399886b66dd-part2 + - /dev/disk/by-id/scsi-350000399886b66dd-part3 + - /dev/disk/by-id/scsi-362c97b1c6eedb00026e527a2b8b998f2 +mac_addr: + - 44:67:47:c9:ec:ec + - 44:67:47:c9:ec:ed + - 44:67:47:c9:ec:ee + - 44:67:47:c9:ec:ef + - 44:67:47:c9:ec:f0 + - 44:67:47:c9:ec:f1 + - 44:67:47:c9:ec:f2 + - 44:67:47:c9:ec:f3 +model_name: Kunpeng-920 +ipmi_ip: 9.3.9.12 diff --git a/hosts/taishan200-2280-2s48p-256g--a63 b/hosts/taishan200-2280-2s48p-256g--a63 new file mode 100644 index 0000000..6d4b636 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a63 @@ -0,0 +1,19 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886b0431 + - /dev/disk/by-id/scsi-350000399886adc71 + - /dev/disk/by-id/scsi-350000399886b66f5 + - /dev/disk/by-id/scsi-350000399886b6b75 +mac_addr: + - 44:67:47:c9:e5:44 + - 44:67:47:c9:e5:45 + - 44:67:47:c9:e5:46 + - 44:67:47:c9:e5:47 + - 44:67:47:c9:e5:48 + - 44:67:47:c9:e5:49 + - 44:67:47:c9:e5:4a + - 44:67:47:c9:e5:4b +model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a87 b/hosts/taishan200-2280-2s48p-256g--a87 new file mode 100644 index 0000000..b87417b --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a87 @@ -0,0 +1,20 @@ +nr_node: 4 +nr_cpu: 96 +memory: 256G +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886a6b55 + - /dev/disk/by-id/scsi-350000399886ad4a5 + - /dev/disk/by-id/scsi-350000399886a7139 + - /dev/disk/by-id/scsi-350000399886acb21 +mac_addr: + - 44:67:47:c9:eb:66 + - 44:67:47:c9:eb:67 + - 44:67:47:c9:eb:68 + - 44:67:47:c9:eb:69 + - 44:67:47:c9:eb:6a + - 44:67:47:c9:eb:6b + - 44:67:47:c9:eb:6c + - 44:67:47:c9:eb:6d +model_name: Kunpeng-920 +ipmi_ip: 9.3.8.4 diff --git a/hosts/taishan200-2280-2s48p-256g--a95 b/hosts/taishan200-2280-2s48p-256g--a95 index 213d10f..3fd8124 100644 --- a/hosts/taishan200-2280-2s48p-256g--a95 +++ b/hosts/taishan200-2280-2s48p-256g--a95 @@ -1,4 +1,3 @@ -arch: aarch64 nr_node: 4 nr_cpu: 96 memory: 512G -- 2.23.0

3 2

[PATCH compass-ci] fix: sched: alter 'ip' -> 'direct_ips', 'server' -> 'direct_server_ips'
by Ren Wen 27 Oct '20

27 Oct '20

[Why] 1) 'ip' -> 'direct_ips' : Cluster test script need to known direct-ip not ip. ip comes from node by command $(hostname -I | cut -d' ' -f1), it's not a direct-ip. 2) 'server' -> 'direct_server_ips' : Cluster test script uses variables 'direct_server_ips' or 'server' to connect daemon node, i perfer to 'direct_server_ips' example: iperf test: ```shell ... [ -n "$direct_server_ips" ] && server=$direct_server_ips [ -z "$server" ] && server=127.0.0.1 server=${server%% *} client_cmd="iperf3 -t $runtime -J -c $server $opt_udp" ... ``` Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index c32091f..ced0276 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -98,13 +98,13 @@ class Sched return cluster_state when "write_state" node_roles = env.params.query["node_roles"] - node_ip = env.params.query["ip"] + node_ip = env.params.query["direct_ips"] update_cluster_state(cluster_id, job_id, "roles", node_roles) update_cluster_state(cluster_id, job_id, "ip", node_ip) when "roles_ip" role = "server" server_ip = get_ip(cluster_id, role) - return "server=#{server_ip}" + return "direct_server_ips=#{server_ip}" end # show cluster state -- 2.23.0

1 0

[PATCH v1 compass-ci] specify the queues for the test machine to consume
by Xiao Shenwei 27 Oct '20

27 Oct '20

Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/my-qemu.sh | 4 +++- providers/qemu.sh | 13 +++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/providers/my-qemu.sh b/providers/my-qemu.sh index 954d3a0..7f3aa1b 100755 --- a/providers/my-qemu.sh +++ b/providers/my-qemu.sh @@ -4,6 +4,8 @@ [[ $tbox_group ]] || tbox_group=vm-2p8g -export hostname=$tbox_group--$USER-$$ +export hostname=$tbox_group.$USER-$$ +# specify which queues will be request, use " " to separate more than 2 values +export queues="vm-2p8g.aarch64 vm-2p8g~$USER" $CCI_SRC/providers/qemu.sh diff --git a/providers/qemu.sh b/providers/qemu.sh index d97fd85..9e7627f 100755 --- a/providers/qemu.sh +++ b/providers/qemu.sh @@ -9,6 +9,7 @@ load_cci_defaults : ${hostname:="vm-1p1g-1"} +: ${queue:="vm-1p1g.$(arch)"} # unicast prefix: x2, x6, xA, xE export mac=$(echo $hostname | md5sum | sed 's/^$..$$..$$..$$..$$..$.*$/0a-\1-\2-\3-\4-\5/') echo hostname: $hostname @@ -17,7 +18,15 @@ echo $mac > mac echo "arp -n | grep ${mac//-/:}" > ip.sh chmod +x ip.sh -curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}" +set_mac2host() +{ + local queues + # use "," replace " " + queues=${queue/ /,} + echo $queues + curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}&queues=${queues}" +} +set_mac2host del_host_mac() { @@ -33,7 +42,7 @@ trap del_host_mac EXIT tbox_group=$hostname fi - host=${tbox_group%%--*} + host=${tbox_group%.*} create_yaml_variables "$LKP_SRC/hosts/${host}" -- 2.23.0

2 6

[PATCH lkp-tests] check QEMU_EFI.fd file for multi-qemu
by Xiao Shenwei 27 Oct '20

27 Oct '20

[why] for multi-qemu job, the qemu-efi container will build error, then the QEMU_EFI.fd will not found, it caused one job will be remove from redis, but kvm can't execute it. so, this job looks like it's been executed, but not result file. Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- daemon/multi-qemu | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/multi-qemu b/daemon/multi-qemu index b407251f..5f4d976b 100755 --- a/daemon/multi-qemu +++ b/daemon/multi-qemu @@ -7,6 +7,7 @@ multi_qemu() { + [ -f "/usr/share/qemu-efi-aarch64/QEMU_EFI.fd" ] || return export CCI_SRC=/c/compass-ci local hostname=$tbox_group--$HOSTNAME -- 2.23.0

2 1

[PATCH compass-ci 2/5] container/send-mail: mail-post.rb
by Luan Shengde 27 Oct '20

27 Oct '20

fix function invoke bugs Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- lib/mail-post.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mail-post.rb b/lib/mail-post.rb index 5832bfb..0b1f94a 100755 --- a/lib/mail-post.rb +++ b/lib/mail-post.rb @@ -22,7 +22,7 @@ post '/send_mail_yaml' do 'body' => data['body'] } - check_send_mail(mail_info) + send_mail(mail_info) end post '/send_mail_text' do -- 2.23.0

2 2

[PATCH compass-ci] doc: reset tutorial
by Li Ping 27 Oct '20

27 Oct '20

--- doc/tutorial.md | 257 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 203 insertions(+), 54 deletions(-) diff --git a/doc/tutorial.md b/doc/tutorial.md index 03f1342..aea6cc2 100644 --- a/doc/tutorial.md +++ b/doc/tutorial.md @@ -5,7 +5,7 @@ ### 概念 -Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上游开源软件（来自 Github, Gitee, Gitlab 等托管平台）的测试服务、登录服务、故障辅助定界服务和基于历史数据的分析服务。通过 Compass-CI，社区开发者可以将开源软件快速引入 openEuler 社区，并补充更多的测试用例，共同构建一个开放、完整的开源软件生态系统。 +Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上游开源软件（来自 Github,Gitee,Gitlab 等托管平台）的测试服务、登录服务、故障辅助定界服务和基于历史数据的分析服务。通过Compass-CI，社区开发者可以将开源软件快速引入openEuler社区，并补充更多的测试用例，共同构建一个开放、完整的开源软件生态系统。 ### 功能描述 @@ -30,7 +30,7 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上 - 聚合开发者测试用例 - 开发者向代码托管平台提交代码、测试用例、测试工具时，Compass-CI 自动获取提交的代码开展构建测试，同时获取开发者编写到开源软件包的测试用例进行自动化测试，并反馈测试结果。 + 开发者向代码托管平台提交代码、测试用例、测试工具时，Compass-CI自动获取提交的代码开展构建测试，同时获取开发者编写到开源软件包的测试用例进行自动化测试，并反馈测试结果。 - 登录环境随时调测 @@ -46,28 +46,59 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上 -## 使用 Compass-CI -> 当您注册之后，便可以编写 yaml 文件并通过我们的工具上传任务以进行自定义测试，测试功能将尽快上线。 +## 使用Compass-CI +### 前提条件 + + +- 申请账号 + + 您可以通过向**compass-ci(a)139.xn--com**,-1y7i63cba145j8lao86rn19at45crrlpsetoortax6hia2663b"**apply account**"，在正文中提供**您向开源项目提交过的commit的url地址**(我们将根据此进行审查并决定是否发放账号)，并以附件方式添加**准备用来提交任务的个人电脑的公钥**。 + 发送邮件后，将收到一封回复邮件，邮件回复内容如下： + + account_uuird: xxxxxx + SCHED_HOST: ip # 下面配置中将会使用到的ip地址 + SCHED_PORT: port # 下面配置中将会使用到的端口 + +- 构建本地可以提交job的环境 + + - 下载安装[lkp-tests](https://gitee.com/wu_fengguang/lkp-tests) + ```bash + git clone https://gitee.com/wu_fengguang/lkp-tests.git + cd lkp-tests + sudo make install + ``` + + - 配置lab + + - 编辑`.../lkp-tests/include/lab/z9` + ```yaml + SCHED_HOST: ip # 申请账号时回复邮件中的ip + SCHED_PORT: port # 申请账号时回复邮件中的端口 + ``` + - 新建`$HOME/.config/compass-ci/defaults/$USER.yaml` 内容如下 + ```yaml + lab: z9 + ``` - 注册自己的仓库 - 如果您想在 `git push` 的时候, 自动触发测试, 那么需要把您的公开 git url 添加到如下仓库 [upstream-repos](https://gitee.com/wu_fengguang/upstream-repos)。 + 如果您想在 `git push` 的时候, 自动触发测试, 那么需要把您的公开 git url 添加到如下仓库[upstream-repos](https://gitee.com/wu_fengguang/upstream-repos)。 ```bash git clone https://gitee.com/wu_fengguang/upstream-repos.git less upstream-repos/README.md ``` -### 编写 job yaml 文件 +### 编写job yaml文件 -#### job yaml 简介 -job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAML_for_ruby.html)的格式编写，所有 job 文件位于```$LKP_SRC/jobs```路径下。[$LKP_SRC](https://gitee.com/wu_fengguang/lkp-te… +#### job yaml简介 +job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAML_for_ruby.html)的格式编写，所有 job 文件位于```$LKP_SRC/jobs```路径下。 -#### job yaml 的结构 +#### job yaml的结构 - 标识头部 Header（必选） - 每一个 job 文件的开始部分，都有一些基础的描述信息，称之为 yaml 的 Header。头部主要有 suite 和 category，suite 是测试套的名称。category 是测试类型，包括 benchmarch（性能测试）/functional（功能测试）/noise-benchmark（不常用）。 + 每一个job文件的开始部分，都有一些基础的描述信息，称之为yaml的Header。头部主要有suite和category，suite是测试套的名称。category是测试类型，包括benchmarch（性能测试）/functional（功能测试）/noise-benchmark（不常用）。 ```yaml suite: netperf \\测试套名称 @@ -76,7 +107,7 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM - 测试脚本和参数（必选） - - 测试脚本位于```$LKP_SRC/tests```，```$LKP_SRC/daemon```路径下。job yaml 中写入与上述路径中脚本相匹配的文件，将其视为可执行脚本。 + - 测试脚本位于```$LKP_SRC/tests```，```$LKP_SRC/daemon```路径下。job yaml中写入与上述路径中脚本相匹配的文件，将其视为可执行脚本。 ``` $LKP_SRC/setup @@ -101,7 +132,7 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM SUT/schduler/部署等资源相关变量。 ```yaml - testbox: vm-2p8g + testbox: vm-hi1620-2p8g os: openeuler os_version: 20.03 os_arch: aarch64 @@ -129,52 +160,170 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM nterval: 5 ``` -**了解更多 job yaml 相关知识** [Job definition to execution](https://gitee.com/wu_fengguang/lkp-tests/blob/master/jobs/README… +**了解更多job yaml相关知识** [Job definition to execution](https://gitee.com/wu_fengguang/lkp-tests/blob/master/jobs/README… ### 提交测试任务 + +使用```submit```关键字提交测试任务，以netperf为例，命令如下。 +```bash +submit netperf.yaml +``` + + +submit命令更多参数设置方法如下。 +``` +- Usage: submit [options] jobs... + submit test jobs to scheduler +- options: + - s, --set 'KEY: VALUE' #add YAML hash to job + - o, --output DIR #save job yaml to DIR + - a, --auto-define-files #auto add define_files + - c, --connect #auto connect to the host + - m, --monitor # monitor job status: use -m 'KEY: VALUE' to add rule" +``` + + ### 查看测试结果 + +- 生成与存储测试结果 + 测试执行机完成测试任务后，将结果保存到日志文件中，并上传至服务器，按照```$suite/$tbox_group/$date/job_id```的目录结构存储在本地```/srv/result```目录。 + extract-stats 服务将提取本地日志文件中的数据，生成与日志文件对应的json文件，并将汇总后的结果存储到obs数据库(ES)对应id的job中。 + + +- web页面查看结果: + - 点击链接查看obs数据库（ES）中的结果：https://compass-ci.openeuler.org/jobs + + - 点击链接查看文件中的结果,示例：http://124.90.34.227:11300/result/iperf/dc-2g--xiao/2020-09-21/crystal.83385/，文件分为两类： + + - 由测试执行机上传的日志文件： + boot-time, diskstats.gz, interrupts.gz, ...等。 + + - 由extract-stats服务生成的json文件： + boot-time.json, diskstats.json, interrupts.json,stats.json, ... 等。 + json 文件对应每一个日志文件提取后的结果，stats.json为汇总后的结果。 + + ### 比较测试结果 -### 提交 borrow 任务 +测试完成后，Compass-CI通过条件查询数据并将数据合并为多个矩阵，计算每个矩阵的平均值和标准差，以比较测试用例在特定维度的性能变化。最后，将比较结果打印输出。 + + +可以通过如下两种方式比较测试结果： + +- 通过compare web比较 + Compass CI/compare + +- 通过命令行比较 + ``` + compare conditions -d dimension + ``` + +示例比较测试结果如下。 +``` + os=openeuler/os_arch=aarch64/tbox_group=vm-hi1620-2p8g + + + 20 1 metric + -------------------- ------------------------------ ------------------------------ + fails:runs change fails:runs + | | | + 8:21 -38.1% 0:1 last_state.daemon.sshd.exit_code.1 + 1:21 -4.8% 0:1 last_state.daemon.sshd.exit_code.2 + 1:21 -4.8% 0:1 last_state.setup.disk.exit_code.1 + 1:21 -4.8% 0:1 last_state.test.dbench.exit_code.99 + 1:21 -4.8% 0:1 last_state.test.email.exit_code.7 + + + 20 1 metric + -------------------- ------------------------------ ------------------------------ + %stddev change %stddev + \ | \ + 0.02 ± 265% +2259.8% 0.57 mpstat.cpu.all.soft% + 0.48 ± 299% +1334.9% 6.90 mpstat.cpu.all.sys% + 2760.71 ± 164% +292.6% 10838.00 proc-vmstat.nr_dirty_background_threshold + 5522.10 ± 164% +292.6% 21680.00 proc-vmstat.nr_dirty_threshold + +``` + + +### 提交borrow任务 + +borrow任务是指通过提交任务的方式申请环境，提交borrow任务的yaml文件请参考lkp-tests/jobs/borrow-1h.yaml。 + +1. yaml文件配置说明： + + - 必填字段： + ``` + sshd: + pub_key \\将用户的公钥信息添加到job中 + email \\ 配置用户邮箱地址 + runtime \\申请环境的使用时间 h/d/w + testbox \\申请环境的规格 + ``` + - 选填字段： + ``` + os \\申请环境的操作系统参数 + os_arch + os_version + ``` + +2. 提交任务 + + 执行命令```submit -m -c borrow-1h.yaml```，可以提交borrow任务并自动ssh连接到申请的环境当中。 + ### 提交 bisect 任务 +bisect 任务可以找到首次在git repo中引入问题的commit信息。提交bisect任务的yaml文件请参考 $LKP_SRC/jobs/bisect.yaml。 + +1. yaml文件配置说明： + - 必填字段： + ``` + bisect: + job_id: \\提交job的job_id + error_id: \\在Compass-CI网页上搜索$job_id，得到$error_ids，从$error_ids中选择一个$error_id。 + ``` +2. 提交任务 + 执行命令```submit bisect.yaml```，提交成功后会收到通知邮件。 + + + ## 高级功能 -### 添加 OS 支持 +### 添加OS支持 -制作一个 initramfs 启动的 cgz 镜像，当系统内核启动时，直接从打包的 cgz 镜像中导出 rootfs，在内存中展开文件系统，利用磁盘的高速缓存机制让系统直接在内存中读写文件，以提升系统的 I/O 性能。 +制作一个initramfs启动的cgz镜像，当系统内核启动时，直接从打包的cgz镜像中导出rootfs，在内存中展开文件系统，利用磁盘的高速缓存机制让系统直接在内存中读写文件，以提升系统的I/O性能。 #### 操作步骤 - 1. 获取对应 os 版本的 rootfs（以 openEuler 为例） - - 通过 docker 获取 rootfs + 1. 获取对应os版本的rootfs（以openEuler为例） + - 通过docker获取rootfs - 1) 下载 openEuler 官方提供的 docker 镜像压缩包 + 1) 下载openEuler官方提供的docker镜像压缩包 ```bash wget https://repo.openeuler.org/openEuler-20.03-LTS/docker_img/aarch64/openEuler… ``` - 2) 加载 docker 镜像 + 2) 加载docker镜像 ```bash docker load -i openEuler-docker.aarch64 ``` - 3) 启动 openEuler 容器 + 3) 启动openEuler容器 ```bash docker run -id openeuler-20.03-lts ``` - 4) 拷贝 docker 的 rootfs + 4) 拷贝docker的rootfs ```bash docker cp -a docker run -d openeuler-20.03-lts:/ openEuler-rootfs ``` - - 通过 qemu.img(qcow2格式)获取 rootfs (openEuler为例) + - 通过qemu.img(qcow2格式)获取rootfs (以openEuler为例) - 1) 下载 openEule r官方网站提供的 qcow2 格式镜像 + 1) 下载openEuler官方网站提供的qcow2格式镜像 ```bash wget https://repo.openeuler.org/openEuler-20.03-LTS/virtual_machine_img/aarch64/… ``` @@ -184,22 +333,22 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM ./run openEuler-20.03-LTS.aarch64.qcow2.xz /tmp/openEuler-rootfs ``` 2. 定制rootfs - 1. 使用chroot命令切换到 rootfs (此步骤需要 root 权限) + 1. 使用chroot命令切换到rootfs中(此步骤需要root权限) ```bash chroot openEuler-rootfs ``` 2. 根据个人需要安装并配置服务 - a. 修改 root 密码 - b. 配置 ssh 服务 + a. 修改root密码 + b. 配置ssh服务 c. 检查系统时间 - d. 如果使用 docker 制作 osimage 还需要以下操作： + d. 如果使用docker制作osimage还需要以下操作： > 1. 安装所需版本内核 - > 2. 从 centos 官方网站下载内核rpm包 - > 3. 使用 yum 进行安装 - > 4. 删除 docker 环境变量文件 + > 2. 从centos官方网站下载内核rpm包 + > 3. 使用yum进行安装 + > 4. 删除docker环境变量文件 - 3. 退出 rootfs，并打包 + 3. 退出rootfs，并打包 ```bash cd $rootfs find . | coip -o -Hnewc |gzip -9 > $os_name.cgz @@ -218,7 +367,7 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM - 解决方法 1）启动内存不足，增加内存可解决。 - 2）内核文件权限不足，给予 644 权限。 + 2）内核文件权限不足，给予644权限。 2. 系统运行缓慢 @@ -227,7 +376,7 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM 打包镜像体积过大，会消耗很大内存 - 解决方法 - 建议用户根据具体需要对 rootfs 进行裁剪。 + 建议用户根据具体需要对rootfs进行裁剪。 ### 添加测试用例 @@ -238,13 +387,13 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM 1. 概述： - 使用 PKGBUILD 完成上游项目源代码的编译构建，同一项目可以使用不同 PKGBUILD 完成项目编译构建过程。 - PKGBUILD 相关参考文档：https://wiki.archlinux.org/index.php/PKGBUILD。 + 使用PKGBUILD完成上游项目源代码的编译构建，同一项目可以使用不同PKGBUILD完成项目编译构建过程。 + PKGBUILD相关参考文档：https://wiki.archlinux.org/index.php/PKGBUILD 2. 步骤： 1) 注册仓库 - 如果您想在 git push 的时候, 自动触发测试, 那么需要把您的公开 git url 添加到如下仓库 [upstream-repos](https://gitee.com/wu_fengguang/upstream-repos)。 + 如果您想在git push的时候, 自动触发测试, 那么需要把您的公开git url添加到如下仓库[upstream-repos](https://gitee.com/wu_fengguang/upstream-repos) ```bash git clone https://gitee.com/wu_fengguang/upstream-repos.git less upstream-repos/README.md @@ -254,17 +403,17 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM 项目代码更新后自动触发构建任务，无需其他操作。 3) 查看结果 - web: https://compass-ci.openeuler.org/jobs。 + web: https://compass-ci.openeuler.org/jobs 4) 备注 - 目前提供 archlinux 下已有 PKGBUILD 项目构建测试，暂不支持自主导入 PKGBUILD 文件。 - PKGBUILD 存放路径： /srv/git/archlinux/*/*/PKGBUILD。 + 目前提供archlinux下已有PKGBUILD项目构建测试，暂不支持自主导入PKGBUILD文件。 + PKGBUILD存放路径： /srv/git/archlinux/*/*/PKGBUILD ### depends - 依赖包构建 - 流程: 以下默认使用 debian:sid 版本进行,如果使用其他OS跑测试用例，则需要在 lkp-tests/distro/adaptation/ 下将包名以键值对的形式写入对应 OS 的文件中 + 流程: 以下默认使用debian:sid版本进行,如果使用其他OS跑测试用例，则需要在lkp-tests/distro/adaptation/下将包名以键值对的形式写入对应OS的文件中 > 例： `echo 'apache2: httpd' >> lkp-tests/distro/adaptation/openeuler` 1) 在lkp-tests/distro/depends/下新建一个与测试用例同名的文件 @@ -280,40 +429,40 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM -### 本地搭建 compass-ci 服务器节点 +### 本地搭建compass-ci 服务器节点 -在 openEuler 系统一键部署 compass-ci 环境，当前已支持 openEuler-aarch64-20.03-LTS 系统环境，以下配置仅供参考。 +在openEuler系统一键部署compass-ci环境，当前已支持 openEuler-aarch64-20.03-LTS 系统环境，以下配置仅供参考。 #### 准备工作 - 硬件 - 服务器类型：ThaiShan200-2280 (建议) - 架构：aarch64 - 内存：>= 8GB - CPU：64 nuclear (建议) + 服务器类型：ThaiShan200-2280 (建议) + 架构：aarch64 + 内存：>= 8GB + CPU：64 nuclear (建议) 硬盘：>= 500G - 软件 - OS：openEuler-aarch64-20.03 LTS - git：2.23.0版本 (建议) - 预留空间：>= 300G + OS：openEuler-aarch64-20.03 LTS + git：2.23.0版本 (建议) + 预留空间：>= 300G 网络：可以访问互联网 >**说明：** - >openEuler 系统安装详细操作请参考[添加测试用例](https://openeuler.org/zh/docs/20.03_LTS/docs/Installati… + >openEuler系统安装详细操作请参考[添加测试用例](https://openeuler.org/zh/docs/20.03_LTS/docs/I… #### 操作指导 -1. 登录 openEuler 系统 +1. 登录openEuler系统 2. 创建工作目录并设置文件权限 ```bash mkdir demo && cd demo && umask 002 ``` -3. 克隆 compass-ci 项目代码到 demo 目录 +3. 克隆compass-ci项目代码到demo目录 ```bash git clone https://gitee.com/wu_fengguang/compass-ci.git ``` -4. 执行一键部署脚本 install-tiny +4. 执行一键部署脚本install-tiny ```bash cd compass-ci/sparrow && ./install-tiny ``` -- 2.23.0

1 0