diff options
| author | Kevin Hilman <khilman@baylibre.com> | 2018-12-14 13:20:34 -0800 |
|---|---|---|
| committer | Guillaume Tucker <guillaume.tucker@collabora.com> | 2018-12-24 09:14:37 +0000 |
| commit | ed3eb5bc39832f4bbe5d9c717aeb86cc7c9c4bd6 (patch) | |
| tree | 554e6aa7675987a861e9b0466c528910fcd587f1 /src | |
| parent | 89a6e14af96281d00b4125765cff66ca85f524eb (diff) | |
change COMPILER to CC and separate version
COMPILER is not a standard environment variable for kernel builds, where
CC is. Use CC so it can be used by the rest of the build
environment (e.g. build.py) for gcc or clang builds.
While at it, separate out the version part into CC_VERSION.
Other behavior (e.g. docker image names) is left unchanged.
NOTE: this requires updating the jenkins jobs to use the new variable
names.
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/kernelci/util/Job.groovy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/kernelci/util/Job.groovy b/src/org/kernelci/util/Job.groovy index d24663a..618ae40 100644 --- a/src/org/kernelci/util/Job.groovy +++ b/src/org/kernelci/util/Job.groovy @@ -34,7 +34,7 @@ def addBoolParams(params, bool_params) { } } -def dockerImageName(base, compiler, kernel_arch) { +def dockerImageName(base, cc, cc_version, kernel_arch) { def docker_arch if (arch == "riscv") @@ -44,7 +44,7 @@ def dockerImageName(base, compiler, kernel_arch) { else docker_arch = arch - return "${base}${compiler}_${docker_arch}" + return "${base}${cc}-${cc_version}_${docker_arch}" } def dockerPullWithRetry(image_name, retries=10, sleep_time=1) { |