From 0ba9223f1043388ce9e3bdce076ff4dd2c972f55 Mon Sep 17 00:00:00 2001
From: Evan Lojewski <github@meklort.com>
Date: Thu, 25 Mar 2021 17:33:04 -0600
Subject: [PATCH] jenkins: Fix merge requests to pull submodules from
 destination repository.

---
 .jenkins.groovy | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.jenkins.groovy b/.jenkins.groovy
index 76fde60..09f70fb 100644
--- a/.jenkins.groovy
+++ b/.jenkins.groovy
@@ -42,6 +42,8 @@
 /// @endcond
 ////////////////////////////////////////////////////////////////////////////////
 
+// test
+
 def notify(status, description)
 {
     updateGitlabCommitStatus name: 'build', state: status
@@ -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'
         }
+
         def HASH = ''
+        def MERGE_REQUEST = false
         try {
             HASH = env['gitlabMergeRequestLastCommit']
+            MERGE_REQUEST = true
         }
         catch (exc)
         {
-            try {
-                HASH = GITHUB_PR_HEAD_SHA
-                REFSPEC = '+refs/pull/*:refs/remotes/origin/pr/*'
-            }
-            catch (exc2)
-            {
-                HASH = '**'
-            }
+            HASH = '**'
         }
 
         stage('checkout')
-- 
2.30.2