aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGuillaume Tucker <guillaume.tucker@collabora.com>2018-10-25 23:11:13 +0100
committerGuillaume Tucker <guillaume.tucker@collabora.com>2018-10-29 18:14:31 +0000
commitf0c9373de0cf3c08d9bf081c33d795dfa231f3c6 (patch)
tree2c2c91e3a3303c0645631d1d686f7a5a958105ed /src
parent26f6e87a309a1beed8e764628e00c85c8373dac4 (diff)
Rootfs.groovy: wrap long lines in makeImageStep
Wrap long lines with each arguments of makeImageStep and debos on a separate line to make it more readable and also easier to diff when arguments change. Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Diffstat (limited to 'src')
-rw-r--r--src/org/kernelci/debian/RootFS.groovy18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/org/kernelci/debian/RootFS.groovy b/src/org/kernelci/debian/RootFS.groovy
index 63f03d5..9bbf39d 100644
--- a/src/org/kernelci/debian/RootFS.groovy
+++ b/src/org/kernelci/debian/RootFS.groovy
@@ -74,7 +74,13 @@ def buildImage(config) {
}
-def makeImageStep(String pipeline_version, String arch, String debianRelease, String debosFile, String extraPackages, String name, String script) {
+def makeImageStep(String pipeline_version,
+ String arch,
+ String debianRelease,
+ String debosFile,
+ String extraPackages,
+ String name,
+ String script) {
return {
node('builder' && 'docker') {
stage("Checkout") {
@@ -85,7 +91,13 @@ def makeImageStep(String pipeline_version, String arch, String debianRelease, St
stage("Build base image for ${arch}") {
sh """
mkdir -p ${pipeline_version}/${arch}
- debos -t architecture:${arch} -t suite:${debianRelease} -t basename:${pipeline_version}/${arch} -t extra_packages:'${extraPackages}' -t script:${script} ${debosFile}
+ debos \
+ -t architecture:${arch} \
+ -t suite:${debianRelease} \
+ -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
@@ -122,5 +134,3 @@ def getDockerArgs() {
return "--group-add " + "${GROUP}"
}
-
-