[THINGS] Fix in manifest pipeline template file

* The fix allows to perform build also on Edgehog Things images

build-pipeline-yocto.yml.jinja2

@@ -218,7 +218,31 @@ release:
         {% set parts = distro.split('-') %}
         {% set recipe = parts[1:]|join('-') %}
         {% set image = parts[1:]|join('-') %}
-
+      {% elif distro == 'embedded-base' %}
+        {% set DEFCONFIG = DEFCONFIG + "_embedded_" %}
+        {% set BUILD_DIR = BUILD_DIR + "_embedded_" %}
+        {% set recipe = "seco-image-edgehog-base" %} 
+        {% set image = "edgehog-embedded-base-image" %}
+      {% elif distro == 'embedded-full' %}
+        {% set DEFCONFIG = DEFCONFIG + "_embedded_" %}
+        {% set BUILD_DIR = BUILD_DIR + "_embedded_" %}
+        {% set recipe = "seco-image-edgehog-full" %}
+        {% set image = "edgehog-embedded-full-image" %}
+        {% set testing = true %}
+      {% else %}
+        {% set parts = distro.split('-') %}
+        {% if 'embedded' in distro %}
+          {% set DEFCONFIG = DEFCONFIG + "_" + parts[0] + "_" %}
+          {% set BUILD_DIR = BUILD_DIR + "_" + parts[0] + "_" %}
+        {% endif %}
+        {% set recipe = parts[1:]|join('-') %}
+        {% set image = parts[1:]|join('-') %}
+      {% endif %}
+      {% if 'things' not in distro %}
+        {% for backend in GRAPHIC_BACKEND.split(' ')%}
+          {% set DEFCONFIG = DEFCONFIG + backend %}
+          {% set BUILD_DIR = BUILD_DIR + backend %}
+          {% set distro = distro + "-" + backend %}
 #----------------------------------------------------
 # Edgehog-build-{{ machine }}-{{ distro }}
 #----------------------------------------------------
@@ -234,7 +258,7 @@ build-{{ machine }}-{{ distro }}:
      MACHINE: {{ MACHINE }}
      DEFCONFIG_FILE: {{ DEFCONFIG }}
      RECIPE_NAME: {{ recipe }}
-     IMAGE_NAME: {{ image }}
+     IMAGE_NAME: {{ image }}-{{ backend }}
      UBOOT_FILE: {{ UBOOT_FILE }}
      KERNEL_FILE: {{ KERNEL_FILE }}
      AZURE_PATH: {{ AZURE_PATH }}
@@ -248,44 +272,21 @@ deploy-{{ machine }}-{{ distro }}:
      artifacts: true
   variables: &deploy-{{ machine }}-{{ distro }}
       <<: *build-{{ machine }}-{{ distro }}
-      {% if machine == 'a62-1G-4x256M' or machine == 'c20' or machine == 'd23' or machine == 'intel' %}
+          {% if testing is defined %}
 #----------------------------------------------------
 # Edgehog-test-{{ machine }}-{{ distro }}
 #----------------------------------------------------
 test-{{ machine }}-{{ distro }}:
-  extends: .test-things
-  needs:
+  extends: .test
+  needs: 
    - job: deploy-{{ machine }}-{{ distro }}
      artifacts: true
   variables: 
       <<: *build-{{ machine }}-{{ distro }}
-      CI_PARAM_TEST_SUITE: '{{ machine }}-edgehog.jinja2'
-      {% endif %}
-      {% elif distro == 'embedded-base' %}
-        {% set DEFCONFIG = DEFCONFIG + "_embedded_" %}
-        {% set BUILD_DIR = BUILD_DIR + "_embedded_" %}
-        {% set recipe = "seco-image-edgehog-base" %} 
-        {% set image = "edgehog-embedded-base-image" %}
-      {% elif distro == 'embedded-full' %}
-        {% set DEFCONFIG = DEFCONFIG + "_embedded_" %}
-        {% set BUILD_DIR = BUILD_DIR + "_embedded_" %}
-        {% set recipe = "seco-image-edgehog-full" %}
-        {% set image = "edgehog-embedded-full-image" %}
-        {% set testing = true %}
-      {% else %}
-        {% set parts = distro.split('-') %}
-        {% if 'embedded' in distro %}
-          {% set DEFCONFIG = DEFCONFIG + "_" + parts[0] + "_" %}
-          {% set BUILD_DIR = BUILD_DIR + "_" + parts[0] + "_" %}
-        {% endif %}
-        {% set recipe = parts[1:]|join('-') %}
-        {% set image = parts[1:]|join('-') %}
-      {% endif %}
-      {% if 'things' not in distro %}
-        {% for backend in GRAPHIC_BACKEND.split(' ')%}
-          {% set DEFCONFIG = DEFCONFIG + backend %}
-          {% set BUILD_DIR = BUILD_DIR + backend %}
-          {% set distro = distro + "-" + backend %}
+      CI_PARAM_TEST_SUITE: '{{ machine }}.jinja2'
+          {% endif %}
+        {% endfor %}
+      {% else %}       
 #----------------------------------------------------
 # Edgehog-build-{{ machine }}-{{ distro }}
 #----------------------------------------------------
@@ -301,7 +302,7 @@ build-{{ machine }}-{{ distro }}:
      MACHINE: {{ MACHINE }}
      DEFCONFIG_FILE: {{ DEFCONFIG }}
      RECIPE_NAME: {{ recipe }}
-     IMAGE_NAME: {{ image }}-{{ backend }}
+     IMAGE_NAME: {{ image }}
      UBOOT_FILE: {{ UBOOT_FILE }}
      KERNEL_FILE: {{ KERNEL_FILE }}
      AZURE_PATH: {{ AZURE_PATH }}
@@ -315,20 +316,19 @@ deploy-{{ machine }}-{{ distro }}:
      artifacts: true
   variables: &deploy-{{ machine }}-{{ distro }}
       <<: *build-{{ machine }}-{{ distro }}
-          {% if testing is defined %}
+      {% if machine == 'a62-1G-4x256M' or machine == 'c20' or machine == 'd23' or machine == 'intel' %}
 #----------------------------------------------------
 # Edgehog-test-{{ machine }}-{{ distro }}
 #----------------------------------------------------
 test-{{ machine }}-{{ distro }}:
-  extends: .test
-  needs: 
+  extends: .test-things
+  needs:
    - job: deploy-{{ machine }}-{{ distro }}
      artifacts: true
   variables: 
       <<: *build-{{ machine }}-{{ distro }}
-      CI_PARAM_TEST_SUITE: '{{ machine }}.jinja2'
-          {% endif %}
-        {% endfor %}
+      CI_PARAM_TEST_SUITE: '{{ machine }}-edgehog.jinja2'
+      {% endif %}
       {% endif %}
     {% endfor %}
   {% endfor %}