diff options
| -rw-r--r-- | jenkins/bisect.jpl | 12 | ||||
| -rw-r--r-- | jenkins/build-trigger.jpl | 15 | ||||
| -rw-r--r-- | jenkins/build.jpl | 11 | ||||
| -rw-r--r-- | src/org/kernelci/build/Kernel.groovy | 9 | ||||
| -rw-r--r-- | src/org/kernelci/util/Job.groovy | 9 |
5 files changed, 27 insertions, 29 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." diff --git a/jenkins/build-trigger.jpl b/jenkins/build-trigger.jpl index 061639a..b46326a 100644 --- a/jenkins/build-trigger.jpl +++ b/jenkins/build-trigger.jpl @@ -241,9 +241,14 @@ def buildsComplete(job, arch) { } node("defconfig-creator") { + def j = new Job() + def k = new Kernel() + def kci_core = "${env.WORKSPACE}/kernelci-core" + def kdir = "${env.WORKSPACE}/linux" def archs = params.ARCH_LIST.tokenize(' ') + def arch_configs = [] - echo("""\ + print("""\ Tree: ${params.TREE_NAME} URL: ${params.TREE} Branch: ${params.BRANCH} @@ -251,14 +256,10 @@ node("defconfig-creator") { Revision: ${params.COMMIT_ID} Archs: ${archs.size()}""") - def k = new Kernel() - def kci_core = env.WORKSPACE + '/kernelci-core' - def kdir = env.WORKSPACE + '/linux' - stage("Init") { timeout(time: 30, unit: 'MINUTES') { parallel( - clone: { k.cloneKciCore(kci_core, + clone: { j.cloneKciCore(kci_core, params.KCI_CORE_URL, params.KCI_CORE_BRANCH) }, download: { k.downloadTarball(kdir, params.SRC_TARBALL) }, @@ -266,8 +267,6 @@ node("defconfig-creator") { } } - def arch_configs = [] - stage("Configs") { for (String arch: archs) { def configs = ["allnoconfig"] diff --git a/jenkins/build.jpl b/jenkins/build.jpl index 08c6769..cb5b589 100644 --- a/jenkins/build.jpl +++ b/jenkins/build.jpl @@ -100,10 +100,13 @@ ${kci_core}/build.py \ node("docker && builder") { def j = new Job() + def k = new Kernel() + def kci_core = "${env.WORKSPACE}/kernelci-core" + def kdir = "${env.WORKSPACE}/linux" def docker_image = j.dockerImageName( params.DOCKER_BASE, params.CC, params.CC_VERSION, params.ARCH) - echo("""\ + print("""\ Tree: ${params.TREE_NAME} URL: ${params.TREE} Branch: ${params.BRANCH} @@ -114,14 +117,10 @@ node("docker && builder") { Compiler: ${params.CC} ${params.CC_VERSION} Container: ${docker_image}""") - def k = new Kernel() - def kci_core = env.WORKSPACE + '/kernelci-core' - def kdir = env.WORKSPACE + '/linux' - stage("Init") { timeout(time: 30, unit: 'MINUTES') { parallel( - clone: { k.cloneKciCore(kci_core, + clone: { j.cloneKciCore(kci_core, params.KCI_CORE_URL, params.KCI_CORE_BRANCH) }, download: { k.downloadTarball(kdir, params.SRC_TARBALL) }, diff --git a/src/org/kernelci/build/Kernel.groovy b/src/org/kernelci/build/Kernel.groovy index e5b2426..7853b25 100644 --- a/src/org/kernelci/build/Kernel.groovy +++ b/src/org/kernelci/build/Kernel.groovy @@ -20,15 +20,6 @@ package org.kernelci.build -def cloneKciCore(path, url, branch) { - sh(script: "rm -rf ${path}") - dir("${path}") { - git(url: url, - branch: branch, - poll: false) - } -} - def downloadTarball(kdir, url, filename="linux-src.tar.gz") { sh(script: "rm -rf ${kdir}") dir(kdir) { diff --git a/src/org/kernelci/util/Job.groovy b/src/org/kernelci/util/Job.groovy index 51c007b..cbfbabb 100644 --- a/src/org/kernelci/util/Job.groovy +++ b/src/org/kernelci/util/Job.groovy @@ -34,6 +34,15 @@ def addBoolParams(params, bool_params) { } } +def cloneKciCore(path, url, branch) { + sh(script: "rm -rf ${path}") + dir("${path}") { + git(url: url, + branch: branch, + poll: false) + } +} + def dockerImageName(base, cc, cc_version, kernel_arch) { def image_name = "${base}${cc}-${cc_version}" |