[PATCH v2 lkp-tests] lib/job.rb: delete read "/etc/compass-ci/defaults/*.yaml"
The compass-ci/scheduler will read the yamls, so, delete it in lkp-tests Signed-off-by: Cao Xueliang <caoxl78320@163.com> --- lib/job.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/job.rb b/lib/job.rb index eacb7ec95..37c538753 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -418,8 +418,7 @@ class Job def load_self_config self_config_path = "#{ENV['HOME']}/.config/compass-ci" - Dir.glob(['/etc/compass-ci/defaults/*.yaml', - "#{self_config_path}/defaults/*.yaml"]).each do |file| + Dir.glob(["#{self_config_path}/defaults/*.yaml"]).each do |file| load_one_defaults(file, @job) end -- 2.23.0
Better do the opposite. The per-user and per-host defaults for `submit` look symmetry and good to have. OTOH, the config options for various services can be separated out to dedicated config files. Thanks, Fengguang On Thu, Feb 18, 2021 at 11:04:32AM +0800, Cao Xueliang wrote:
The compass-ci/scheduler will read the yamls, so, delete it in lkp-tests
Signed-off-by: Cao Xueliang <caoxl78320@163.com> --- lib/job.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/job.rb b/lib/job.rb index eacb7ec95..37c538753 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -418,8 +418,7 @@ class Job
def load_self_config self_config_path = "#{ENV['HOME']}/.config/compass-ci" - Dir.glob(['/etc/compass-ci/defaults/*.yaml', - "#{self_config_path}/defaults/*.yaml"]).each do |file| + Dir.glob(["#{self_config_path}/defaults/*.yaml"]).each do |file| load_one_defaults(file, @job) end
-- 2.23.0
On Thu, Feb 18, 2021 at 11:46:51AM +0800, Wu Fengguang wrote:
Better do the opposite.
The per-user and per-host defaults for `submit` look symmetry and good to have.
OTOH, the config options for various services can be separated out to dedicated config files.
Good, we will separate out to dedicated config files. Thanks, Xueliang
Thanks, Fengguang
On Thu, Feb 18, 2021 at 11:04:32AM +0800, Cao Xueliang wrote:
The compass-ci/scheduler will read the yamls, so, delete it in lkp-tests
Signed-off-by: Cao Xueliang <caoxl78320@163.com> --- lib/job.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/job.rb b/lib/job.rb index eacb7ec95..37c538753 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -418,8 +418,7 @@ class Job
def load_self_config self_config_path = "#{ENV['HOME']}/.config/compass-ci" - Dir.glob(['/etc/compass-ci/defaults/*.yaml', - "#{self_config_path}/defaults/*.yaml"]).each do |file| + Dir.glob(["#{self_config_path}/defaults/*.yaml"]).each do |file| load_one_defaults(file, @job) end
-- 2.23.0
participants (2)
-
Cao Xueliang -
Wu Fengguang