Do not include multimedia demopack in basesdk images

Fixes: APERTIS-5662

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>

Jenkinsfile

@@ -36,13 +36,13 @@ def architectures = [
         boards: ['uefi'],
         types: [
             minimal: [
-                args: '',
+                args: "-t demopack:${demopack}",
                 image: true,
                 sysroot: false,
                 ostree: true,
             ],
             target: [
-                args: '',
+                args: "-t demopack:${demopack}",
                 image: true,
                 sysroot: false,
                 ostree: true,
@@ -54,7 +54,7 @@ def architectures = [
                 ostree: false,
             ],
             sdk: [
-                args: '--scratchsize 10G',
+                args: "-t demopack:${demopack} --scratchsize 10G",
                 boards: [ 'sdk' ],
                 image: true,
                 sysroot: false,
@@ -80,13 +80,13 @@ def architectures = [
         boards: ['uboot'],
         types: [
             minimal: [
-                args: '',
+                args: "-t demopack:${demopack}",
                 image: true,
                 sysroot: false,
                 ostree: true,
             ],
             target: [
-                args: '',
+                args: "-t demopack:${demopack}",
                 image: true,
                 sysroot: false,
                 ostree: true,
@@ -103,7 +103,7 @@ def architectures = [
         boards: ['uboot', 'mx6qsabrelite'],
         types: [
             minimal: [
-                args: '',
+                args: "-t demopack:${demopack}",
                 image: true,
                 sysroot: false,
                 ostree: true
@@ -310,7 +310,6 @@ def buildImage(architecture, type, board, debosarguments = "") {
             -t suite:$release \
             -t timestamp:${PIPELINE_VERSION} \
             -t image:${image_name} \
-            -t demopack:${demopack} \
             ${WORKSPACE}/${osname}-image-${board}.yaml""")
     }
 }
@@ -332,7 +331,6 @@ def buildOStreeImage(architecture, type, board, debosarguments = "") {
             -t suite:$release \
             -t ospack:ospack_${release}-${architecture}-${type}_${PIPELINE_VERSION} \
             -t image:${image_name} \
-            -t demopack:${demopack} \
             -t message:${release}-${type}-${architecture}-${board}_${PIPELINE_VERSION} \
             -t ostree:${repo} \
             ${WORKSPACE}/apertis-ostree-image-${board}.yaml;""")