Commit bbcff84f authored by Lin Jen-Shin's avatar Lin Jen-Shin

Pick CI_MERGE_REQUEST_PROJECT_ID instead

The merge request project can be different than the project
running the pipeline.
parent 3b081dce
...@@ -73,6 +73,10 @@ class FindJhBranch ...@@ -73,6 +73,10 @@ class FindJhBranch
ENV['CI_DEFAULT_BRANCH'] ENV['CI_DEFAULT_BRANCH']
end end
def merge_request_project_id
ENV['CI_MERGE_REQUEST_PROJECT_ID']
end
def merge_request_id def merge_request_id
ENV['CI_MERGE_REQUEST_IID'] ENV['CI_MERGE_REQUEST_IID']
end end
...@@ -81,12 +85,8 @@ class FindJhBranch ...@@ -81,12 +85,8 @@ class FindJhBranch
"#{ref_name}-jh" "#{ref_name}-jh"
end end
def project_id
API::DEFAULT_OPTIONS[:project]
end
def merge_request def merge_request
@merge_request ||= gitlab.merge_request(project_id, merge_request_id) @merge_request ||= gitlab.merge_request(merge_request_project_id, merge_request_id)
end end
def gitlab def gitlab
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment