Wip/martyn/u boot installer

Jenkinsfile

 #!/usr/bin/env groovy
 
+env.PIPELINE_VERSION = VersionNumber(versionNumberString: '${BUILD_DATE_FORMATTED,"yyyyMMdd"}.${BUILDS_TODAY_Z}')
+
 osname = 'apertis'
 
 release = "v2019dev0"
@@ -30,8 +32,6 @@ test_lava_credentials = 'apertis-lava-user'
 demopack = "https://images.apertis.org/media/multimedia-demo.tar.gz"
 devrootpack = "${image_url_prefix}/daily/${release}/${env.PIPELINE_VERSION}/armhf/devroot/ospack_${release}-armhf-devroot_${env.PIPELINE_VERSION}.tar.gz"
 
-installer_repo_url = "https://repositories.apertis.org/apertis/"
-
 sysroot_url_prefix = image_url_prefix + "/sysroot/"
 
 def architectures = [
@@ -125,7 +125,7 @@ def architectures = [
     ]
 ]
 
-def installers = [ 'mx6qsabrelite' ]
+def installerTargets = [ 'mx6qsabrelite' ]
 
 properties([
     parameters([
@@ -384,7 +384,7 @@ def buildSysroot(architecture, type, debosarguments = "") {
     }
 }
 
-def buildInstallers(installers) {
+def buildInstallers(installerTargets) {
   return {
     node("docker-slave") {
       checkout scm
@@ -402,19 +402,15 @@ def buildInstallers(installers) {
               def buildStatus = [:]
 
               try {
-                for(String target: installers) {
+                for(String target: installerTargets) {
                   try {
                     stage("${target} installer image") {
                       sh(script: """
                           mkdir -p ${PIPELINE_VERSION}/installer/${target}
                           cd ${PIPELINE_VERSION}/installer/${target}
                           debos --show-boot \
-                            -t target:${target} \
-                            -t mirror:${installer_repo_url} \
                             -t suite:${release} \
-                            -t timestamp:${PIPELINE_VERSION} \
-                            -t image:u-boot-installer-${target} \
-                            ${WORKSPACE}/uboot-installer.yaml""")
+                            ${WORKSPACE}/${target}-uboot-installer.yaml""")
                     }
                     buildStatus["installer-${target}"] = true
                   } catch (e) {
@@ -465,8 +461,7 @@ def buildImages(architecture, type, boards, debosarguments = "", image = true, s
 
             buildenv.inside("--device=/dev/kvm") {
               stage("setup ${architecture} ${type}") {
-                env.PIPELINE_VERSION = VersionNumber(versionNumberString: '${BUILD_DATE_FORMATTED,"yyyyMMdd"}.${BUILDS_TODAY_Z}')
-                  sh ("env ; mkdir -p ${PIPELINE_VERSION}/${architecture}/${type}")
+                sh ("env ; mkdir -p ${PIPELINE_VERSION}/${architecture}/${type}")
               }
 
               // Add successfully build artifacts here to know which ones we need to upload and test
@@ -613,12 +608,15 @@ buildCandidates.each { name, arch ->
 }
 
 /* Add installer */
-println("buildOnlyList")
-println(buildOnlyList)
-if (buildOnlyList.containsKey('installers')) {
-  println("Got installers")
+if (buildOnlyList) {
+  if (buildOnlyList.containsKey('installers')) {
+    first_pass << [("installers"):
+        buildInstallers(installerTargets)
+    ]
+  }
+} else {
   first_pass << [("installers"):
-      buildInstallers(installers)
+      buildInstallers(installerTargets)
   ]
 }