diff options
| author | Ana Guerrero Lopez <ana.guerrero@collabora.com> | 2018-09-06 13:32:58 +0200 |
|---|---|---|
| committer | Guillaume Tucker <guillaume.tucker@collabora.com> | 2018-09-17 15:10:26 +0100 |
| commit | 1b72a8da9183ffee800f90555b6adfb016b334d3 (patch) | |
| tree | 494d2bed1ae9d89f08d1f9b3f83765a6ac52f93e /src | |
| parent | 6a9d6a8ebedb37386df37c1d120143a05ee04226 (diff) | |
Use the debian arch names for x86 and x86_64
x86 and x86_64 are now i386 and amd64 respectively.
Update the library to only use the debian arch names everywhere.
Signed-off-by: Ana Guerrero Lopez <ana.guerrero@collabora.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/kernelci/debian/RootFS.groovy | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/org/kernelci/debian/RootFS.groovy b/src/org/kernelci/debian/RootFS.groovy index f3faf89..83f8a42 100644 --- a/src/org/kernelci/debian/RootFS.groovy +++ b/src/org/kernelci/debian/RootFS.groovy @@ -38,15 +38,7 @@ package org.kernelci.debian def buildImage(config) { def name = config.name - def kernel_arch = config.arch_list - def debian_arch = ["armhf": "armhf", - "armel": "armel", - "arm64": "arm64", - "x86": "i386", - "x86_64": "amd64", - "mips": "mips", - "mipsel": "mipsel", - "mips64el": "mips64el"] + def archList = config.arch_list def debosFile = "jenkins/debian/debos/stretch.yaml" // Returns the pipeline version with the format YYYYMMMAA.X where X is the number of the build of the day @@ -65,12 +57,11 @@ def buildImage(config) { } def stepsForParallel = [:] - for (int i = 0; i < kernel_arch.size(); i++) { - def arch = kernel_arch[i] + for (int i = 0; i < archList.size(); i++) { + def arch = archList[i] def buildStep = "Build image for ${arch}" stepsForParallel[buildStep] = makeImageStep(pipeline_version, arch, - debian_arch[arch], debosFile, extraPackages, name, @@ -81,7 +72,7 @@ def buildImage(config) { } -def makeImageStep(String pipeline_version, String arch, String debian_arch, String debosFile, String extraPackages, String name, String script) { +def makeImageStep(String pipeline_version, String arch, String debosFile, String extraPackages, String name, String script) { return { node('builder' && 'docker') { stage("Checkout") { @@ -92,7 +83,7 @@ def makeImageStep(String pipeline_version, String arch, String debian_arch, Stri stage("Build base image for ${arch}") { sh """ mkdir -p ${pipeline_version}/${arch} - debos -t architecture:${debian_arch} -t basename:${pipeline_version}/${arch} -t extra_packages:'${extraPackages}' -t script:${script} ${debosFile} + debos -t architecture:${arch} -t basename:${pipeline_version}/${arch} -t extra_packages:'${extraPackages}' -t script:${script} ${debosFile} """ archiveArtifacts artifacts: "${pipeline_version}/${arch}/initrd.cpio.gz", fingerprint: true archiveArtifacts artifacts: "${pipeline_version}/${arch}/rootfs.cpio.gz", fingerprint: true |