[Compass-ci] Re: [PATCH v3 lkp-tests 2/3] lib/job.rb: change the way get hostname

On Wed, Nov 04, 2020 at 09:02:29PM +0800, Li Ping wrote:

[why] we can get hostname from the repo lab-z9 or get hostname from lkp-tests/hosts

---

lib/job.rb | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/job.rb b/lib/job.rb index 3383897c..89780920 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -334,20 +334,14 @@ class Job end

def get_hosts_file

• lab_hosts_file = get_lab_hosts_file
• return lab_hosts_file if lab_hosts_file
• hosts_file_name = @job['tbox_group'].split('--')[0] hosts_file = "#{LKP_SRC}/hosts/#{hosts_file_name}"
• return hosts_file if hosts_file

• lab_hosts_file = get_lab_hosts_file
• if lab_hosts_file

•  hosts_file = lab_hosts_file
  

• end
• if File.file?(hosts_file)

•  hosts_file
  

• else

•  puts("hosts_file not exist: #{hosts_file}, maybe need check testbox field")
  

•  nil
  

• end

• puts("hosts_file not exist: #{hosts_file}, maybe need check testbox field")

If line 28 and line 32 both no return, this #{hosts_file} is nill, so you should change to #{hosts_file_name}.

Thanks, Zhangyu

end

def include_files

2.23.0