LAVA: rename MACHINE to LAVA_MACHINE

Rename variable in order to avoid confusion with the original MACHINE
variable used everywhere else. Also rename the local Jinja2 variable to
include an underscore to make naming consistent.

build-pipeline-yocto.yml.jinja2

@@ -82,16 +82,16 @@ build-{{ machine }}:
 
 {% if machine == 'seco-mx6' or machine == 'imx6guf' %}
   {% set platforms = "santaro santoka santino santino-lt" %}
-  {% set lavamachine = "imx6guf" %}
+  {% set lava_machine = "imx6guf" %}
 {% elif machine == 'seco-mx6ull' or machine == 'imx6ullguf' %}
   {% set platforms = "nallino" %}
-  {% set lavamachine = "imx6ullguf" %}
+  {% set lava_machine = "imx6ullguf" %}
 {% elif machine == 'seco-mx8mm' or machine == 'imx8mguf'  %}
   {% set platforms = "tanaro" %}
-  {% set lavamachine = "imx8mguf" %}
+  {% set lava_machine = "imx8mguf" %}
 {% else %}
   {% set platforms = '' %}
-  {% set lavamachine = '' %}
+  {% set lava_machine = '' %}
 {% endif %}
 
 {% if platforms %}
@@ -104,8 +104,8 @@ smoketest:{{ machine }}:
     - job: build-{{ machine }}
   variables:
     BUILD_JOB: build-{{ machine }}
-    MACHINE: {{ lavamachine }}
-    PLATFORMS: {{ lavamachine }}
+    LAVA_MACHINE: {{ lava_machine }}
+    PLATFORMS: {{ lava_machine }}
     TEST_SUITE: boot.jinja2
     TEST_EXTRA_ARGUMENTS: --all-devices
 
@@ -117,7 +117,7 @@ platformtest:{{ machine }}:
     - job: build-{{ machine }}
   variables:
     BUILD_JOB: build-{{ machine }}
-    MACHINE: {{ lavamachine }}
+    LAVA_MACHINE: {{ lava_machine }}
     PLATFORMS: {{ platforms }}
 {% endif %}
 

build-pipeline.yml

@@ -269,7 +269,7 @@ workflow:
     - .gitlab-ci/scripts/submit_test.py
         --fng-install "$FNG_INSTALL_URL"
         --name
-        "Gitlab $MACHINE $YOCTO_DISTRO $YOCTO_IMAGE ($CI_PIPELINE_ID)"
+        "Gitlab $LAVA_MACHINE $YOCTO_DISTRO $YOCTO_IMAGE ($CI_PIPELINE_ID)"
         --results-path "results"
         --report-name "testresults-${CI_JOB_NAME}.md"
         --test-repo $TESTS_GIT_URL