bisect.jpl: refactor with runCheck()

Add runCheck() function to factor out the code for both the good and
bad revision tests.

Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>

1 files changed, 35 insertions, 56 deletions

diff --git a/jenkins/bisect.jpl b/jenkins/bisect.jpl
index f4f2f30..8c107a3 100644
--- a/jenkins/bisect.jpl
+++ b/jenkins/bisect.jpl
@@ -283,6 +283,39 @@ def bisectNext(kdir, status) {
  * pipeline
  */
 
+def runCheck(kdir, kci_build, git_commit, name, run_status) {
+    def check = null
+    def tag = null
+
+    lock("${env.NODE_NAME}-build-lock") {
+        timeout(time: 60, unit: 'MINUTES') {
+            try {
+                tag = buildRevision(kdir, kci_build, git_commit, name)
+                check = true
+            } catch (error) {
+                check = false
+            }
+        }
+    }
+
+    if (!check)
+        return false
+
+    def describe = gitDescribe(kdir)
+
+    node("kernel-boot-v2") {
+        timeout(time: 120, unit: 'MINUTES') {
+            def lava_ci = env.WORKSPACE + '/lava-ci'
+            def status = runTest(lava_ci, describe)
+            check = (status == run_status ? true : false)
+        }
+    }
+
+    removeTag(kdir, tag)
+
+    return check
+}
+
 node("bisection") {
     def kci_build = env.WORKSPACE + '/kernelci-build'
     def kdir = env.WORKSPACE + '/linux'
@@ -314,34 +347,7 @@ Bad:       ${params.BAD_COMMIT}"""
     }
 
     stage("Check pass") {
-        def tag = null
-
-        lock("${env.NODE_NAME}-build-lock") {
-            timeout(time: 60, unit: 'MINUTES') {
-                try {
-                    tag = buildRevision(kdir, kci_build, params.GOOD_COMMIT,
-                                        'pass')
-                    check = true
-                } catch (error) {
-                    check = false
-                }
-            }
-        }
-
-        if (!check)
-            return
-
-        def describe = gitDescribe(kdir)
-
-        node("kernel-boot-v2") {
-            timeout(time: 120, unit: 'MINUTES') {
-                def lava_ci = env.WORKSPACE + '/lava-ci'
-                def status = runTest(lava_ci, describe)
-                check = (status == 0 ? true : false)
-            }
-        }
-
-        removeTag(kdir, tag)
+        check = runCheck(kdir, kci_build, params.GOOD_COMMIT, 'pass', 0)
     }
 
     if (!check) {
@@ -351,34 +357,7 @@ Bad:       ${params.BAD_COMMIT}"""
     }
 
     stage("Check fail") {
-        def tag = null
-
-        lock("${env.NODE_NAME}-build-lock") {
-            timeout(time: 60, unit: 'MINUTES') {
-                try {
-                    tag = buildRevision(kdir, kci_build, params.BAD_COMMIT,
-                                        'fail')
-                    check = true
-                } catch (error) {
-                    check = false
-                }
-            }
-        }
-
-        if (!check)
-            return
-
-        def describe = gitDescribe(kdir)
-
-        node("kernel-boot-v2") {
-            timeout(time: 120, unit: 'MINUTES') {
-                def lava_ci = env.WORKSPACE + '/lava-ci'
-                def status = runTest(lava_ci, describe)
-                check = (status == 2 ? true : false)
-            }
-        }
-
-        removeTag(kdir, tag)
+        check = runCheck(kdir, kci_build, params.BAD_COMMIT, 'fail', 2)
     }
 
     if (!check) {