aboutsummaryrefslogtreecommitdiff
path: root/jenkins/bisect.jpl
diff options
context:
space:
mode:
authorGuillaume Tucker <guillaume.tucker@collabora.com>2018-12-20 15:36:20 +0000
committerGuillaume Tucker <guillaume.tucker@collabora.com>2019-02-13 16:04:24 +0000
commita93e8eed4491ff4e12975c5403989ad1c43a0077 (patch)
tree1bd98606bd6c38bb4ed4da9a2c52a7472139bff6 /jenkins/bisect.jpl
parent1b7c5dad763fbb6c8f38523c596c1db437c38c57 (diff)
org.kernelci.job: add .cloneKciCore() and clean-up
Move org.kernelci.build.cloneKciCore() to org.kernelci.job as this is not specific to build jobs but other jobs too. Also clean-up the code using cloneKciCore(). Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Diffstat (limited to 'jenkins/bisect.jpl')
-rw-r--r--jenkins/bisect.jpl12
1 files changed, 6 insertions, 6 deletions
diff --git a/jenkins/bisect.jpl b/jenkins/bisect.jpl
index 617b91b..55bc24c 100644
--- a/jenkins/bisect.jpl
+++ b/jenkins/bisect.jpl
@@ -170,8 +170,8 @@ fi
*/
def cloneKciCore(kci_core) {
- def k = new Kernel()
- k.cloneKciCore(kci_core, params.KCI_CORE_URL, params.KCI_CORE_BRANCH)
+ def j = new Job()
+ j.cloneKciCore(kci_core, params.KCI_CORE_URL, params.KCI_CORE_BRANCH)
}
def cloneLinux(kdir) {
@@ -595,8 +595,8 @@ node("docker && bisection") {
def j = new Job()
def docker_image = j.dockerImageName(
params.DOCKER_BASE, params.CC, params.CC_VERSION, params.ARCH)
- def kci_core = env.WORKSPACE + '/kernelci-core'
- def kdir = env.WORKSPACE + '/linux'
+ def kci_core = "${env.WORKSPACE}/kernelci-core"
+ def kdir = "${env.WORKSPACE}/linux"
def checks = [:]
def params_summary = """\
@@ -608,10 +608,10 @@ node("docker && bisection") {
Lab: ${params.LAB}
Defconfig: ${params.DEFCONFIG}
Plan: ${params.PLAN}"""
- echo """\
+ print("""\
Good: ${params.GOOD_COMMIT}
Bad: ${params.BAD_COMMIT}
-${params_summary}"""
+${params_summary}""")
if ((params.PLAN != 'boot') && (params.PLAN != 'simple')) {
echo "Only doing boot and simple plans for now, aborting."