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>

1 files changed, 13 insertions, 0 deletions

diff --git a/src/org/kernelci/util/Job.groovy b/src/org/kernelci/util/Job.groovy
index 79a69ae..d24663a 100644
--- a/src/org/kernelci/util/Job.groovy
+++ b/src/org/kernelci/util/Job.groovy
@@ -34,6 +34,19 @@ def addBoolParams(params, bool_params) {
     }
 }
 
+def dockerImageName(base, compiler, kernel_arch) {
+    def docker_arch
+
+    if (arch == "riscv")
+        docker_arch = "riscv64"
+    else if ((arch == "i386") || (arch == "x86_64"))
+        docker_arch = "x86"
+    else
+        docker_arch = arch
+
+    return "${base}${compiler}_${docker_arch}"
+}
+
 def dockerPullWithRetry(image_name, retries=10, sleep_time=1) {
     def image = docker.image(image_name)
     def pulled = false