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..dafc2c8 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-2p8g--delimiter'
diff --git a/src/features/jobs/right_iperf.yaml b/src/features/jobs/right_iperf.yaml
index 843564d..f81af38 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-2p8g--chief
category: benchmark
runtime: 30
cluster: cs-localhost
diff --git a/src/features/scheduler.feature b/src/features/scheduler.feature
index c335fb4..7c1a804 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-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..2872bc7 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-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..31aa0c3 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-2p8g--212" remove "--212"
+# "vm-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..fdc7027 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-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..674606e 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-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..27d46cf 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-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