Commit 0ba9223f authored by Evan Lojewski's avatar Evan Lojewski

jenkins: Fix merge requests to pull submodules from destination repository.

parent adf45fa7
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
/// @endcond /// @endcond
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// test
def notify(status, description) def notify(status, description)
{ {
updateGitlabCommitStatus name: 'build', state: status updateGitlabCommitStatus name: 'build', state: status
...@@ -61,20 +63,16 @@ def build(nodeName, archive = false, archive_cab = false, analyze = true, test_a ...@@ -61,20 +63,16 @@ def build(nodeName, archive = false, archive_cab = false, analyze = true, test_a
{ {
URL = 'http://gitlab.raptorengineering.com/kestrel-collaboration/firmware.git' URL = 'http://gitlab.raptorengineering.com/kestrel-collaboration/firmware.git'
} }
def HASH = '' def HASH = ''
def MERGE_REQUEST = false
try { try {
HASH = env['gitlabMergeRequestLastCommit'] HASH = env['gitlabMergeRequestLastCommit']
MERGE_REQUEST = true
} }
catch (exc) catch (exc)
{ {
try { HASH = '**'
HASH = GITHUB_PR_HEAD_SHA
REFSPEC = '+refs/pull/*:refs/remotes/origin/pr/*'
}
catch (exc2)
{
HASH = '**'
}
} }
stage('checkout') stage('checkout')
......
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