[Compass-ci] Re: [PATCH v2 compass-ci] fix: sched: alter conditions when submitting cluster and normal jobs

On Wed, Oct 21, 2020 at 09:22:04AM +0800, Tong Qunfeng wrote:

On Tue, Oct 20, 2020 at 11:15:10AM +0800, Ren Wen wrote:

...

• if File.file?(cluster_file_path)

•  cluster_config = YAML.parse(File.read(cluster_file_path)).as_h
  

•  hosts_size = cluster_config.values.size
  

•  return cluster_config, hosts_size
  

• end
• return nil, 0

...

• return YAML.parse(File.read(cluster_file_path)).as_h

use defalut raise when cluster_file_path not exists?

Yes.

Thanks, RenWen

...

end

def get_commit_date(job) @@ -177,16 +167,17 @@ class Sched 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 != ""
  

•    cluster_config, hosts_size = get_cluster_config(
  

•      cluster_file, job.lkp_initrd_user, job.os_arch)
  

•    return submit_cluster_job(
  

•      job, cluster_config.not_nil!) if hosts_size >= 2
  

•  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
  

•  return submit_single_job(job)
  

  rescue ex puts ex.inspect_with_backtrace return [{

-- 2.23.0

-- Thanks. chief tongqunfeng@huawei.com