diff options
| author | Guillaume Tucker <guillaume.tucker@collabora.com> | 2018-11-28 23:25:10 +0000 |
|---|---|---|
| committer | Guillaume Tucker <guillaume.tucker@collabora.com> | 2018-12-07 13:23:52 +0000 |
| commit | 327394a1271b4e3ab403d33b12f080156f7489bd (patch) | |
| tree | 322491e96abe3e42cfd006f2df7907b9f3637175 /jenkins/bisect.jpl | |
| parent | 401ce3d1cd0c6e00c71b3cc6a856f77d2510592f (diff) | |
org.kernelci.util.Job: add dockerImageName() and use it
Add Job.dockerImageName() to construct the name of the Docker image
for a given combination of Docker base name, compiler and
architecture. This is then used both in build.jpl and bisect.jpl to
ensure they are both using the same Docker images to build kernels.
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Diffstat (limited to 'jenkins/bisect.jpl')
| -rw-r--r-- | jenkins/bisect.jpl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/jenkins/bisect.jpl b/jenkins/bisect.jpl index 49e180a..e83483b 100644 --- a/jenkins/bisect.jpl +++ b/jenkins/bisect.jpl @@ -530,7 +530,9 @@ node("docker && bisection") { /* Global pipeline constants */ env._BUILD_JSON = "build-data.json" - def docker_image = "${params.DOCKER_BASE}${params.COMPILER}_${params.ARCH}" + def j = new Job() + def docker_image = j.dockerImageName( + params.DOCKER_BASE, params.COMPILER, params.ARCH) def kci_core = env.WORKSPACE + '/kernelci-core' def kdir = env.WORKSPACE + '/linux' def checks = [:] @@ -575,7 +577,6 @@ ${params_summary}""" } } - def j = new Job() j.dockerPullWithRetry(docker_image).inside() { try { def valid_bisect = bisection(kci_core, kdir, checks) |