Signed-off-by: Cao Xueliang caoxl78320@163.com --- lib/git_bisect.rb | 4 ++-- sbin/git-bisect | 6 +++--- src/delimiter/delimiter.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/git_bisect.rb b/lib/git_bisect.rb index b54be4d..189edb8 100644 --- a/lib/git_bisect.rb +++ b/lib/git_bisect.rb @@ -34,7 +34,7 @@ class GitBisect def set_ids puts "task content: #{@task}" @error_id = @task['error_id'] - @bad_job_id = @task['job_id'] + @bad_job_id = @task['bad_job_id'] end
def set_bad_job @@ -95,7 +95,7 @@ class GitBisect error_messages = ErrorMessages.new(@build_pkg_dir).obtain_error_messages_by_errorid(@error_id)
return Hash['repo' => @upstream_repo, 'commit' => first_bad_commit, - 'job_id' => @bad_job_id, 'error_messages' => error_messages.join("\n")] + 'error_messages' => error_messages.join("\n")] end
# first search the good commit in db diff --git a/sbin/git-bisect b/sbin/git-bisect index 86f79d4..f9da6de 100755 --- a/sbin/git-bisect +++ b/sbin/git-bisect @@ -21,10 +21,10 @@ def parse_argv end
op = OptionParser.new do |opts| - opts.banner = 'Usage: git-bisect job_id=$job_id, error_id=$error_id' + opts.banner = 'Usage: git-bisect bad_job_id=$bad_job_id, error_id=$error_id'
opts.separator '' - opts.separator 'job_id: you submit a job to compass-ci and the job has some errors' + opts.separator 'bad_job_id: you submit a job to compass-ci and the job has some errors' opts.separator 'error_id: you want git bisect a error from the errors that you got' opts.separator ''
@@ -36,7 +36,7 @@ end
op.parse!(ARGV) items = parse_argv -unless items['job_id'] || items['error_id'] +unless items['bad_job_id'] || items['error_id'] system 'git-bisect -h' exit end diff --git a/src/delimiter/delimiter.rb b/src/delimiter/delimiter.rb index 3dcb3de..c1922e2 100644 --- a/src/delimiter/delimiter.rb +++ b/src/delimiter/delimiter.rb @@ -25,7 +25,7 @@ class Delimiter next end
- %x(#{LKP_SRC}/sbin/submit job_id=#{task['job_id']} error_id=#{task['error_id']}) + %x(#{LKP_SRC}/sbin/submit bad_job_id=#{task['job_id']} error_id=#{task['error_id']} bisect.yaml) rescue StandardError => e puts e sleep(60)