diff options
| author | Guillaume Tucker <guillaume.tucker@collabora.com> | 2017-11-27 16:36:05 +0000 |
|---|---|---|
| committer | Guillaume Tucker <guillaume.tucker@collabora.com> | 2018-01-16 10:32:40 +0000 |
| commit | ec8998bbf9faa08a7f50c0952eb54ba6422e17ad (patch) | |
| tree | b38cd5c824ce85884138e1ac04231ac07c0c5194 /jenkins/bisect.jpl | |
| parent | 5c657e2ff5aed272bf4a95d576c1855e6f318b60 (diff) | |
bisect.jpl: refactor with buildRevision()
Add buildRevision() function and use it to build a given git revision
of the kernel in the good/bad check stages.
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Diffstat (limited to 'jenkins/bisect.jpl')
| -rw-r--r-- | jenkins/bisect.jpl | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/jenkins/bisect.jpl b/jenkins/bisect.jpl index 6a980ee..27af7c5 100644 --- a/jenkins/bisect.jpl +++ b/jenkins/bisect.jpl @@ -140,6 +140,13 @@ BRANCH=${params.KERNEL_BRANCH} \ } } +def buildRevision(kdir, kci_build, git_rev, name) { + checkoutRevision(kdir, git_rev) + def tag = createTag(kdir, name) + buildKernel(kdir, kci_build) + return tag +} + def submitJob(lava_ci, describe) { dir(lava_ci) { sh(script: "rm -rf data; mkdir data") @@ -287,10 +294,9 @@ Bad: ${params.BAD_COMMIT}""" lock("${env.NODE_NAME}-build-lock") { timeout(time: 60, unit: 'MINUTES') { - checkoutRevision(kdir, params.GOOD_COMMIT) - tag = createTag(kdir, 'pass') try { - buildKernel(kdir, kci_build) + tag = buildRevision(kdir, kci_build, params.GOOD_COMMIT, + 'pass') check = true } catch (error) { check = false @@ -325,10 +331,9 @@ Bad: ${params.BAD_COMMIT}""" lock("${env.NODE_NAME}-build-lock") { timeout(time: 60, unit: 'MINUTES') { - checkoutRevision(kdir, params.BAD_COMMIT) - tag = createTag(kdir, 'fail') try { - buildKernel(kdir, kci_build) + tag = buildRevision(kdir, kci_build, params.BAD_COMMIT, + 'fail') check = true } catch (error) { check = false |