build-common.yml

@@ -45,7 +45,7 @@ workflow:
   - cd ${CI_PROJECT_DIR}
   - repo init --submodules -u ${CI_REPOSITORY_URL}
       -b refs/pipelines/${CI_PIPELINE_ID}
-  - repo sync --detach --current-branch --no-tags --force-remove-dirty
+  - repo sync --detach --current-branch --force-remove-dirty
       --optimized-fetch --force-sync
 
 .buildbase:

build-jobs-yocto.jinja2

@@ -111,14 +111,18 @@ uploadftp-sdk-{{ machine }}:
 # Run platform tests for this machine which the yocto image
 # This is a little hacky as we need to match the machine name to
 # the available platforms
-{% if machine == 'imx6guf' %}
+{% if machine == 'seco-mx6' or machine == 'imx6guf' %}
 {% set platforms = "santaro santoka santino santino-lt" %}
-{% elif machine == 'imx6ullguf' %}
+{% set lavamachine = "imx6guf" %}
+{% elif machine == 'seco-mx6ull' or machine == 'imx6ullguf' %}
 {% set platforms = "nallino" %}
-{% elif machine == 'imx8mguf' %}
+{% set lavamachine = "imx6ullguf" %}
+{% elif machine == 'seco-mx8mm' or machine == 'imx8mguf'  %}
 {% set platforms = "tanaro" %}
+{% set lavamachine = "imx8mguf" %}
 {% else %}
 {% set platforms = '' %}
+{% set lavamachine = '' %}
 {% endif %}
 
 {% if platforms %}
@@ -131,8 +135,8 @@ smoketest:{{ machine }}:
     - job: build-{{ machine }}
   variables:
     CI_PARAM_BUILDJOB: build-{{ machine }}
-    CI_PARAM_MACHINE: {{ machine }}
-    CI_PARAM_PLATFORMS: {{ machine }}
+    CI_PARAM_MACHINE: {{ lavamachine }}
+    CI_PARAM_PLATFORMS: {{ lavamachine }}
     CI_PARAM_TEST_SUITE: boot.jinja2
     CI_PARAM_EXTRA: --all-devices
 
@@ -144,7 +148,7 @@ platformtest:{{ machine }}:
     - job: build-{{ machine }}
   variables:
     CI_PARAM_BUILDJOB: build-{{ machine }}
-    CI_PARAM_MACHINE: {{ machine }}
+    CI_PARAM_MACHINE: {{ lavamachine }}
     CI_PARAM_PLATFORMS: {{ platforms }}
 {% endif %}