Use unified ostree-commit recipe

Select proper kernel for appropriate architecture.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

Differential Revision: https://phabricator.apertis.org/D7338

apertis-ostree-commit-arm64-generic.yaml

-{{ $architecture := or .architecture "arm64" }}
-{{ $type := or .type "minimal" }}
-{{ $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) }}
-
-{{ $branch := or .branch (printf "apertis/%s-generic/%s" $architecture $type) }}
-{{ $ostreelocal := or .ostreelocal "repo" }}
-{{ $message := or .message "Update" }}
-
-architecture: {{ $architecture }}
-
-actions:
-  - action: unpack
-    file: {{ $ospack }}
-
-  - action: apt
-    description: Kernel and system packages for arm64
-    packages:
-      - kmod
-      - linux-base
-      - initramfs-tools
-      - linux-image-4.9.0-0.bpo.2-arm64-unsigned
-
-  - action: run
-    description: Cleanup /var/lib
-    script: scripts/remove_var_lib_parts.binary
-
-  - action: run
-    chroot: true
-    script: scripts/ostree-prepare.sh
-
-  - action: run
-    chroot: false
-    script: scripts/ostree-convert-from-debian
-
-  - action: ostree-commit
-    repository: {{ $ostreelocal }}
-    branch: {{ $branch }}
-    subject: {{ $message }}

apertis-ostree-commit-amd64-generic.yaml → apertis-ostree-commit.yaml

@@ -15,9 +15,14 @@ actions:
     file: {{ $ospack }}
 
   - action: apt
-    description: Kernel and system packages for amd64
+    description: Kernel and system packages
     packages:
+    {{- if eq $architecture "amd64" "armhf" }}
       - linux-image-generic
+    {{- end }}
+    {{- if eq $architecture "arm64" }}
+      - linux-image-4.9.0-0.bpo.2-arm64-unsigned
+    {{- end }}
 
   - action: run
     description: Cleanup /var/lib