Add image suffixes in the board templates

This commit removes adding a global suffix from the Jenkinsfile
for the images and instead add the suffix from the uboot and
uefi boards template (like the sdk template already does).

Signed-off-by: Luis Araujo <luis.araujo@collabora.co.uk>
Reviewed-by: Denis Pynkin <denis.pynkin@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D7341

Jenkinsfile

@@ -75,7 +75,7 @@ def buildImage(architecture, type, board, debosarguments = "", sysroot = false,
                     -t architecture:${architecture} \
                     -t type:${type} \
                     -t ospack:ospack_${release}-${architecture}-${type}_${PIPELINE_VERSION}.tar.gz \
-                    -t image:apertis_${release}-${type}-${architecture}-${board}_${PIPELINE_VERSION}.img \
+                    -t image:apertis_${release}-${type}-${architecture}-${board}_${PIPELINE_VERSION} \
                     ${WORKSPACE}/apertis-image-${board}.yaml""")
               }
 

apertis-image-uboot.yaml

@@ -4,7 +4,7 @@
 {{ $suite := or .suite "17.12" }}
 {{ $timestamp := or .timestamp "00000000.0" }}
 {{ $ospack := or .ospack (printf "ospack_%s-%s-%s_%s.tar.gz" $suite $architecture $type $timestamp) }}
-{{ $image := or .image (printf "apertis-%s-%s-%s_%s.img" $suite  $type $architecture $timestamp) }}
+{{ $image := or .image (printf "apertis-%s-%s-%s_%s" $suite  $type $architecture $timestamp) }}
 
 {{ $cmdline := or .cmdline " rootwait ro" }}
 
@@ -17,7 +17,7 @@ actions:
     file: {{ $ospack }}
 
   - action: image-partition
-    imagename: {{ $image }}
+    imagename: {{ (printf "%s.img" $image) }}
 {{ if eq $type "minimal" }}
     imagesize: 4G
 {{ else }}
@@ -85,16 +85,16 @@ actions:
     script: scripts/remove_var_lib_parts.binary
 
   - action: run
-    description: Create block map for {{ $image }}
+    description: Create block map for {{ $image }}.img
     postprocess: true
-    command: bmaptool create {{ $image }} > {{ $image }}.bmap
+    command: bmaptool create {{ $image }}.img > {{ $image }}.img.bmap
 
   - action: run
-    description: Compress {{ $image }}
+    description: Compress {{ $image }}.img
     postprocess: true
-    command: gzip -f {{ $image }}
+    command: gzip -f {{ $image }}.img
 
   - action: run
-    description: Checksum for {{ $image }}.gz
+    description: Checksum for {{ $image }}.img.gz
     postprocess: true
-    command: md5sum {{ $image }}.gz > {{ $image }}.gz.md5
+    command: md5sum {{ $image }}.img.gz > {{ $image }}.img.gz.md5

apertis-image-uefi.yaml

@@ -4,7 +4,7 @@
 {{ $suite := or .suite "17.12" }}
 {{ $timestamp := or .timestamp "00000000.0" }}
 {{ $ospack := or .ospack (printf "ospack_%s-%s-%s_%s.tar.gz" $suite $architecture $type $timestamp) }}
-{{ $image := or .image (printf "apertis-%s-%s-%s_%s.img" $suite  $type $architecture $timestamp) }}
+{{ $image := or .image (printf "apertis-%s-%s-%s_%s" $suite  $type $architecture $timestamp) }}
 
 {{ $cmdline := or .cmdline "console=tty0 console=ttyS0,115200n8 rootwait ro quiet splash plymouth.ignore-serial-consoles" }}
 
@@ -17,7 +17,7 @@ actions:
     file: {{ $ospack }}
 
   - action: image-partition
-    imagename: {{ $image }}
+    imagename: {{ (printf "%s.img" $image) }}
 {{ if eq $type "minimal" }}
     imagesize: 7G
 {{end}}
@@ -119,16 +119,16 @@ actions:
     script: scripts/remove_var_lib_parts.binary
 
   - action: run
-    description: Create block map for {{ $image }}
+    description: Create block map for {{ $image }}.img
     postprocess: true
-    command: bmaptool create {{ $image }} > {{ $image }}.bmap
+    command: bmaptool create {{ $image }}.img > {{ $image }}.img.bmap
 
   - action: run
-    description: Compress {{ $image }}
+    description: Compress {{ $image }}.img
     postprocess: true
-    command: gzip -f {{ $image }}
+    command: gzip -f {{ $image }}.img
 
   - action: run
-    description: Checksum for {{ $image }}.gz
+    description: Checksum for {{ $image }}.img.gz
     postprocess: true
-    command: md5sum {{ $image }}.gz > {{ $image }}.gz.md5
+    command: md5sum {{ $image }}.img.gz > {{ $image }}.img.gz.md5