- Compass-ci - mailweb.openeuler.org

[PATCH v4 compass-ci 1/2] fix(sparrow): process will exit if firewalld.service was not installed
by Hu Xuejiao 09 Oct '20

09 Oct '20

When firewalld is inactive, return code of 'systemctl status firewalld' will be 3, and install-tiny has set -e, so this will cause this process exit. Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/2-network/iptables | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/sparrow/2-network/iptables b/sparrow/2-network/iptables index 092c4ca..7183145 100755 --- a/sparrow/2-network/iptables +++ b/sparrow/2-network/iptables @@ -12,15 +12,19 @@ iptables -I FORWARD 1 -j ACCEPT iptables -t nat -A POSTROUTING -o "$PUB_IFACE" -s $BR0_SUBNET -j MASQUERADE iptables -t nat -A POSTROUTING -o $BR0_IFACE -d $BR0_SUBNET -j MASQUERADE -systemctl status firewalld | grep -q "running" && { +command -v firewall-cmd > /dev/null || { + echo "firewalld.service could not be found" + exit 0 +} - DOCKER0_IFACE=docker0 - DOCKER0_SUBNET=172.17.0.0/16 +systemctl start firewalld +[ "$(systemctl is-active firewalld)" == "active" ] || { + echo "start firewalld.service failed" + exit 0 +} - iptables -t nat -A POSTROUTING -o $PUB_IFACE -s $DOCKER0_SUBNET -j MASQUERADE - iptables -t nat -A POSTROUTING -o $DOCKER0_IFACE -d $DOCKER0_SUBNET -j MASQUERADE +DOCKER0_SUBNET=172.17.0.0/16 - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$DOCKER0_SUBNET accept" - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$BR0_SUBNET accept" - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=0.0.0.0/32 accept" -} +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$DOCKER0_SUBNET accept" +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$BR0_SUBNET accept" +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=0.0.0.0/32 accept" -- 2.23.0

2 1

[PATCH v2 compass-ci] container: manjaro: fix dependency issues
by Liu Yinsi 09 Oct '20

09 Oct '20

pacman -Sy cause dependency issues, must use pacman -Syu. When build manjaro, error message as follows: util-linux-libs and libutil-linux are in conflict. Remove libutil-linux? [y/N] util-linux-libs and libutil-linux are in conflict error: unresolvable package conflicts detected error: failed to prepare transaction (conflicting dependencies) See https://wiki.archlinux.org/index.php/Pacman Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- container/manjaro/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/manjaro/Dockerfile b/container/manjaro/Dockerfile index f6cec48..48c5ee6 100644 --- a/container/manjaro/Dockerfile +++ b/container/manjaro/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER Wu Fenguang <wfg(a)mail.ustc.edu.cn> COPY root / RUN chmod 755 /etc /etc/pacman.d -RUN pacman --needed --noprogressbar --noconfirm -Sy && \ +RUN pacman --needed --noprogressbar --noconfirm -Syu && \ pacman --needed --noprogressbar --noconfirm -S bash zsh git openssh rsync make gcc tzdata sudo coreutils util-linux vim RUN ssh-keygen -t rsa -P '' -f /etc/ssh/ssh_host_rsa_key -- 2.23.0

1 0

[PATCH compass-ci] providers/docker: change commpass-ci => compass-ci
by Cao Xueliang 09 Oct '20

09 Oct '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- providers/docker/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/docker/run.sh b/providers/docker/run.sh index c37dd20..6798f48 100755 --- a/providers/docker/run.sh +++ b/providers/docker/run.sh @@ -23,10 +23,10 @@ cmd=( --rm -m $memory --mount type=tmpfs,destination=/tmp - -e CCI_SRC=/c/commpass-ci + -e CCI_SRC=/c/compass-ci -v ${load_path}/lkp:/lkp -v ${DIR}/bin:/root/bin:ro - -v $CCI_SRC:/c/commpass-ci + -v $CCI_SRC:/c/compass-ci -v /srv/git:/srv/git:ro --oom-score-adj="-1000" ${docker_image} -- 2.23.0

1 0

[PATCH compass-ci] src: change vm-hi1620 to vm-aarch64
by Bai Jing 09 Oct '20

09 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- src/delimiter/constants.rb | 2 +- src/features/jobs/right_iperf.yaml | 2 +- src/features/scheduler.feature | 2 +- src/features/step_definitions/scheduler_step.rb | 2 +- src/lib/web_backend.rb | 4 ++-- src/scheduler/README.md | 2 +- src/taskqueue/queue.cr | 2 +- src/taskqueue/redis_client.cr | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/delimiter/constants.rb b/src/delimiter/constants.rb index 7a17b36..70196c1 100644 --- a/src/delimiter/constants.rb +++ b/src/delimiter/constants.rb @@ -9,4 +9,4 @@ MONITOR_PORT = ENV['MONITOR_PORT'] || '11310' TMEP_GIT_BASE = '/c/public_git' DELIMITER_TASK_QUEUE = 'delimiter' BISECT_RUN_SCRIPT = "#{ENV['CCI_SRC']}/src/delimiter/find-commit/bisect_run_script.rb" -DELIMITER_TBOX_GROUP = 'vm-hi1620-2p8g--delimiter' +DELIMITER_TBOX_GROUP = 'vm-aarch64-2p8g--delimiter' diff --git a/src/features/jobs/right_iperf.yaml b/src/features/jobs/right_iperf.yaml index 843564d..60654d9 100644 --- a/src/features/jobs/right_iperf.yaml +++ b/src/features/jobs/right_iperf.yaml @@ -3,7 +3,7 @@ #! jobs/iperf.yaml suite: iperf testcase: iperf -testbox: vm-hi1620-2p8g-chief +testbox: vm-aarch64-2p8g-chief category: benchmark runtime: 30 cluster: cs-localhost diff --git a/src/features/scheduler.feature b/src/features/scheduler.feature index c335fb4..e22ad6a 100644 --- a/src/features/scheduler.feature +++ b/src/features/scheduler.feature @@ -6,7 +6,7 @@ Feature: Scheduler Given prepared a job "right_iperf.yaml" When call with API: post "submit_job" job from add_job.sh Then return with job id - When call with API: put "set_host_mac" "vm-hi1620-2p8g-chief => ef-01-02-03-04-05" + When call with API: put "set_host_mac" "vm-aarch64-2p8g-chief => ef-01-02-03-04-05" And call with API: get "boot.ipxe/mac/ef-01-02-03-04-05" Then return with basic ipxe boot parameter and initrd and kernel diff --git a/src/features/step_definitions/scheduler_step.rb b/src/features/step_definitions/scheduler_step.rb index 882ddd8..cb49837 100644 --- a/src/features/step_definitions/scheduler_step.rb +++ b/src/features/step_definitions/scheduler_step.rb @@ -22,7 +22,7 @@ Then('return with job id') do end # set_host_mac -# host_mac => "vm-hi1620-2p8g-chief => ef-01-02-03-04-05" +# host_mac => "vm-aarch64-2p8g-chief => ef-01-02-03-04-05" Given('call with API: put {string} {string}') do |url, host_mac| host_mac_params = host_mac.split(' ') url_with_params = "#{url}?hostname=#{host_mac_params[0]}\\&mac=#{host_mac_params[2]}" diff --git a/src/lib/web_backend.rb b/src/lib/web_backend.rb index 4544690..7271605 100644 --- a/src/lib/web_backend.rb +++ b/src/lib/web_backend.rb @@ -41,8 +41,8 @@ def es_count(query) ES_CLIENT.count(index: 'jobs*', body: query)['count'] end -# "vm-hi1620-2p8g-212" remove "-212" -# "vm-hi1620-2p8g-zzz" remove "-zzz" +# "vm-aarch64-2p8g-212" remove "-212" +# "vm-aarch64-2p8g-zzz" remove "-zzz" # "vm-git-bisect" don't remove "-bisect" def filter_tbox_group(es_result) result = Set.new diff --git a/src/scheduler/README.md b/src/scheduler/README.md index 5da1bde..66d7e49 100644 --- a/src/scheduler/README.md +++ b/src/scheduler/README.md @@ -413,7 +413,7 @@ you can simply call the scheduler's build and run script. vim $CCI_SRC/user-client/helper/iperf.yaml runtime: 30 # unit in seconds, the time can be shortened arch: aarch64 - testbox: vm-hi1620-2p8g-$USER # echo $USER for your own user name + testbox: vm-aarch64-2p8g-$USER # echo $USER for your own user name ## 2.Submit job submit-job $_CCI_SRC/user-client/helper/iperf.yaml diff --git a/src/taskqueue/queue.cr b/src/taskqueue/queue.cr index 02236f5..565af7d 100644 --- a/src/taskqueue/queue.cr +++ b/src/taskqueue/queue.cr @@ -183,7 +183,7 @@ class TaskQueue private def move_uuid_task2ready(queue_name) # get uuid lists - # uuid_keys ["queues/sched/vm-hi1620-2p8g/ee44b164-90e3-49a7-9798-5e7cc9bc7451", ] + # uuid_keys ["queues/sched/vm-aarch64-2p8g/ee44b164-90e3-49a7-9798-5e7cc9bc7451", ] uuid_keys = get_uuid_keys("#{queue_name}") return unless uuid_keys # nil return unless uuid_keys.size > 0 diff --git a/src/taskqueue/redis_client.cr b/src/taskqueue/redis_client.cr index 3bac924..35ee31e 100644 --- a/src/taskqueue/redis_client.cr +++ b/src/taskqueue/redis_client.cr @@ -236,7 +236,7 @@ class TaskQueue private def get_uuid_keys(queue_name) return nil unless queue_name[0..5] == "sched/" - # search = "queues/sched/vm-hi1620-2p8g/ee44b164-90e3-49a7-9798-5e7cc9bc7451" + # search = "queues/sched/vm-aarch64-2p8g/ee44b164-90e3-49a7-9798-5e7cc9bc7451" # only 3 matchs keyword: * [] ? search = "#{QUEUE_NAME_BASE}/#{queue_name}/[0-9a-eA-F\-]*" lua_script = "return redis.call('keys', KEYS[1])" -- 2.23.0

1 1

[PATCH compass-ci] providers: change the vm-hi1620 to vm-aarch64
by Bai Jing 09 Oct '20

09 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- providers/multi-qemu | 2 +- providers/my-qemu.sh | 2 +- providers/qemu.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/providers/multi-qemu b/providers/multi-qemu index 72453fb..76e39ee 100755 --- a/providers/multi-qemu +++ b/providers/multi-qemu @@ -8,7 +8,7 @@ require 'fileutils' PWD = Dir.pwd # Run multiple QEMU in parallel -HOSTNAME = ARGV[0] || "vm-hi1620-2p8g--#{ENV['USER']}" +HOSTNAME = ARGV[0] || "vm-aarch64-2p8g--#{ENV['USER']}" NR_VM = ARGV[1] || 1 def run(seqno) diff --git a/providers/my-qemu.sh b/providers/my-qemu.sh index 2f20f67..f52b2ba 100755 --- a/providers/my-qemu.sh +++ b/providers/my-qemu.sh @@ -3,7 +3,7 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. [[ $tbox_group ]] || -tbox_group=vm-hi1620-2p8g +tbox_group=vm-aarch64-2p8g export hostname=$tbox_group--$USER-$$ $CCI_SRC/providers/qemu.sh diff --git a/providers/qemu.sh b/providers/qemu.sh index 786a7aa..aed8c3d 100755 --- a/providers/qemu.sh +++ b/providers/qemu.sh @@ -8,7 +8,7 @@ load_cci_defaults -: ${hostname:="vm-hi1620-1p1g-1"} +: ${hostname:="vm-aarch64-1p1g-1"} # unicast prefix: x2, x6, xA, xE export mac=$(echo $hostname | md5sum | sed 's/^$..$$..$$..$$..$$..$.*$/0a-\1-\2-\3-\4-\5/') echo hostname: $hostname -- 2.23.0

1 1

[PATCH compass-ci] sparrow: change hi1620 to aarch64
by Zhang Yu 09 Oct '20

09 Oct '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- sbin/auto_submit.yaml | 8 ++++---- sparrow/6-test/qemu | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/auto_submit.yaml b/sbin/auto_submit.yaml index 7076cca..51c7cf1 100644 --- a/sbin/auto_submit.yaml +++ b/sbin/auto_submit.yaml @@ -1,7 +1,7 @@ AvxToNeon/AvxToNeon: -- testbox=vm-hi1620-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml +- testbox=vm-aarch64-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml compass-ci/compass-ci: -- testbox=vm-hi1620-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml -- testbox=vm-hi1620-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-aarch64-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-aarch64-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml archlinux: -- testbox=vm-hi1620-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml +- testbox=vm-aarch64-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml diff --git a/sparrow/6-test/qemu b/sparrow/6-test/qemu index 1e92a47..93eeb886 100755 --- a/sparrow/6-test/qemu +++ b/sparrow/6-test/qemu @@ -12,5 +12,5 @@ run_job() } dmidecode -s system-product-name | grep -iq "virtual" && exit -run_job vm-hi1620-2p8g -run_job vm-pxe-hi1620-2p8g +run_job vm-aarch64-2p8g +run_job vm-pxe-aarch64-2p8g -- 2.23.0

1 0

[PATCH lkp-tests] spec: change hi1620 to aarch64
by Zhang Yu 09 Oct '20

09 Oct '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- spec/submit/ftq/ftq-1000-2-100000ss-add.yaml | 4 ++-- spec/submit/ftq/ftq-10000-2-100000ss-add.yaml | 4 ++-- spec/submit/ftq/ftq-20-2-6000ss-cache.yaml | 4 ++-- ...4-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml | 4 ++-- spec/submit_spec.rb | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml b/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml index 76e23ca1..2cdc28e8 100644 --- a/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml +++ b/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml @@ -7,8 +7,8 @@ samples: 100000ss ftq: test: add freq: 1000 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-aarch64-2p8g--spec_submit +tbox_group: vm-aarch64-2p8g--spec_submit provider: qemu template: kvm nr_cpu: 2 diff --git a/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml b/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml index d3f4cdc9..310c9787 100644 --- a/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml +++ b/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml @@ -7,8 +7,8 @@ samples: 100000ss ftq: test: add freq: 10000 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-aarch64-2p8g--spec_submit +tbox_group: vm-aarch64-2p8g--spec_submit provider: qemu template: kvm nr_cpu: 2 diff --git a/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml b/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml index a87e7da0..30ebb14a 100644 --- a/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml +++ b/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml @@ -7,8 +7,8 @@ samples: 6000ss ftq: test: cache freq: 20 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-aarch64-2p8g--spec_submit +tbox_group: vm-aarch64-2p8g--spec_submit provider: qemu template: kvm nr_cpu: 2 diff --git a/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml b/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml index 0ba2fb60..3f70a593 100644 --- a/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml +++ b/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml @@ -25,8 +25,8 @@ if role client: requests: 68000000 n_pipeline: 3 key_len: 68000000 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-aarch64-2p8g--spec_submit +tbox_group: vm-aarch64-2p8g--spec_submit node_roles: server client provider: qemu template: kvm diff --git a/spec/submit_spec.rb b/spec/submit_spec.rb index 2b3b5de3..4473a638 100644 --- a/spec/submit_spec.rb +++ b/spec/submit_spec.rb @@ -29,7 +29,7 @@ describe 'submit job spec' do "#{LKP_SRC}/sbin/submit", '-o', output_dir, '-s', 'lab: spec_lab', - '-s', 'testbox: vm-hi1620-2p8g--spec_submit', + '-s', 'testbox: vm-aarch64-2p8g--spec_submit', yaml_file ] system(*submit_cmd) -- 2.23.0

1 0

[PATCH lkp-tests] spec: change hi1620 to aarch64
by Zhang Yu 09 Oct '20

09 Oct '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- spec/submit/ftq/ftq-1000-2-100000ss-add.yaml | 4 ++-- spec/submit/ftq/ftq-10000-2-100000ss-add.yaml | 4 ++-- spec/submit/ftq/ftq-20-2-6000ss-cache.yaml | 4 ++-- ...4-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml | 4 ++-- spec/submit_spec.rb | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml b/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml index 76e23ca1..2cdc28e8 100644 --- a/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml +++ b/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml @@ -7,8 +7,8 @@ samples: 100000ss ftq: test: add freq: 1000 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-aarch64-2p8g--spec_submit +tbox_group: vm-aarch64-2p8g--spec_submit provider: qemu template: kvm nr_cpu: 2 diff --git a/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml b/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml index d3f4cdc9..310c9787 100644 --- a/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml +++ b/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml @@ -7,8 +7,8 @@ samples: 100000ss ftq: test: add freq: 10000 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-aarch64-2p8g--spec_submit +tbox_group: vm-aarch64-2p8g--spec_submit provider: qemu template: kvm nr_cpu: 2 diff --git a/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml b/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml index a87e7da0..30ebb14a 100644 --- a/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml +++ b/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml @@ -7,8 +7,8 @@ samples: 6000ss ftq: test: cache freq: 20 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-aarch64-2p8g--spec_submit +tbox_group: vm-aarch64-2p8g--spec_submit provider: qemu template: kvm nr_cpu: 2 diff --git a/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml b/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml index 0ba2fb60..3f70a593 100644 --- a/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml +++ b/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml @@ -25,8 +25,8 @@ if role client: requests: 68000000 n_pipeline: 3 key_len: 68000000 -testbox: vm-hi1620-2p8g--spec_submit -tbox_group: vm-hi1620-2p8g--spec_submit +testbox: vm-aarch64-2p8g--spec_submit +tbox_group: vm-aarch64-2p8g--spec_submit node_roles: server client provider: qemu template: kvm diff --git a/spec/submit_spec.rb b/spec/submit_spec.rb index 2b3b5de3..4473a638 100644 --- a/spec/submit_spec.rb +++ b/spec/submit_spec.rb @@ -29,7 +29,7 @@ describe 'submit job spec' do "#{LKP_SRC}/sbin/submit", '-o', output_dir, '-s', 'lab: spec_lab', - '-s', 'testbox: vm-hi1620-2p8g--spec_submit', + '-s', 'testbox: vm-aarch64-2p8g--spec_submit', yaml_file ] system(*submit_cmd) -- 2.23.0

1 0

[PATCH lkp-tests 2/2] hosts: add vm-aarch64-*
by Wu Fengguang 30 Sep '20

30 Sep '20

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- hosts/vm-aarch64-1p1g | 6 ++++++ hosts/vm-aarch64-2p1g | 6 ++++++ hosts/vm-aarch64-2p4g | 6 ++++++ hosts/vm-aarch64-2p8g | 6 ++++++ hosts/vm-pxe-aarch64-1p1g | 6 ++++++ hosts/vm-pxe-aarch64-2p1g | 6 ++++++ hosts/vm-pxe-aarch64-2p4g | 6 ++++++ hosts/vm-pxe-aarch64-2p8g | 6 ++++++ 8 files changed, 48 insertions(+) create mode 100644 hosts/vm-aarch64-1p1g create mode 100644 hosts/vm-aarch64-2p1g create mode 100644 hosts/vm-aarch64-2p4g create mode 100644 hosts/vm-aarch64-2p8g create mode 100644 hosts/vm-pxe-aarch64-1p1g create mode 100644 hosts/vm-pxe-aarch64-2p1g create mode 100644 hosts/vm-pxe-aarch64-2p4g create mode 100644 hosts/vm-pxe-aarch64-2p8g diff --git a/hosts/vm-aarch64-1p1g b/hosts/vm-aarch64-1p1g new file mode 100644 index 00000000..b7a53601 --- /dev/null +++ b/hosts/vm-aarch64-1p1g @@ -0,0 +1,6 @@ +provider: qemu +template: kvm +arch: aarch64 +nr_node: 1 +nr_cpu: 1 +memory: 1G diff --git a/hosts/vm-aarch64-2p1g b/hosts/vm-aarch64-2p1g new file mode 100644 index 00000000..08d0c25c --- /dev/null +++ b/hosts/vm-aarch64-2p1g @@ -0,0 +1,6 @@ +provider: qemu +template: kvm +arch: aarch64 +nr_node: 1 +nr_cpu: 2 +memory: 1G diff --git a/hosts/vm-aarch64-2p4g b/hosts/vm-aarch64-2p4g new file mode 100644 index 00000000..d57774b9 --- /dev/null +++ b/hosts/vm-aarch64-2p4g @@ -0,0 +1,6 @@ +provider: qemu +template: kvm +arch: aarch64 +nr_node: 1 +nr_cpu: 2 +memory: 4G diff --git a/hosts/vm-aarch64-2p8g b/hosts/vm-aarch64-2p8g new file mode 100644 index 00000000..40fe2716 --- /dev/null +++ b/hosts/vm-aarch64-2p8g @@ -0,0 +1,6 @@ +provider: qemu +template: kvm +arch: aarch64 +nr_node: 1 +nr_cpu: 2 +memory: 8G diff --git a/hosts/vm-pxe-aarch64-1p1g b/hosts/vm-pxe-aarch64-1p1g new file mode 100644 index 00000000..554e8fb1 --- /dev/null +++ b/hosts/vm-pxe-aarch64-1p1g @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +arch: aarch64 +nr_node: 1 +nr_cpu: 1 +memory: 1G diff --git a/hosts/vm-pxe-aarch64-2p1g b/hosts/vm-pxe-aarch64-2p1g new file mode 100644 index 00000000..27b8438b --- /dev/null +++ b/hosts/vm-pxe-aarch64-2p1g @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +arch: aarch64 +nr_node: 1 +nr_cpu: 2 +memory: 1G diff --git a/hosts/vm-pxe-aarch64-2p4g b/hosts/vm-pxe-aarch64-2p4g new file mode 100644 index 00000000..c31dd953 --- /dev/null +++ b/hosts/vm-pxe-aarch64-2p4g @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +arch: aarch64 +nr_node: 1 +nr_cpu: 2 +memory: 4G diff --git a/hosts/vm-pxe-aarch64-2p8g b/hosts/vm-pxe-aarch64-2p8g new file mode 100644 index 00000000..3687d460 --- /dev/null +++ b/hosts/vm-pxe-aarch64-2p8g @@ -0,0 +1,6 @@ +provider: qemu +template: pxe +arch: aarch64 +nr_node: 1 +nr_cpu: 2 +memory: 8G -- 2.23.0

1 1

[PATCH lkp-tests 1/2] hosts: rename dc-* to dc-aarch64-*
by Wu Fengguang 30 Sep '20

30 Sep '20

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- hosts/{dc-1g => dc-aarch64-1g} | 0 hosts/{dc-2g => dc-aarch64-2g} | 0 hosts/{dc-4g => dc-aarch64-4g} | 0 hosts/{dc-8g => dc-aarch64-8g} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename hosts/{dc-1g => dc-aarch64-1g} (100%) rename hosts/{dc-2g => dc-aarch64-2g} (100%) rename hosts/{dc-4g => dc-aarch64-4g} (100%) rename hosts/{dc-8g => dc-aarch64-8g} (100%) diff --git a/hosts/dc-1g b/hosts/dc-aarch64-1g similarity index 100% rename from hosts/dc-1g rename to hosts/dc-aarch64-1g diff --git a/hosts/dc-2g b/hosts/dc-aarch64-2g similarity index 100% rename from hosts/dc-2g rename to hosts/dc-aarch64-2g diff --git a/hosts/dc-4g b/hosts/dc-aarch64-4g similarity index 100% rename from hosts/dc-4g rename to hosts/dc-aarch64-4g diff --git a/hosts/dc-8g b/hosts/dc-aarch64-8g similarity index 100% rename from hosts/dc-8g rename to hosts/dc-aarch64-8g -- 2.23.0

1 0