commit 02dc94af7f26dcf97af8619bef02673deabb3635
author Chris Kay <chris.kay@arm.com> Tue Oct 11 13:59:09 2022 +0100
committer Chris Kay <chris.kay@arm.com> Thu Oct 27 11:06:36 2022 +0100
tree 43b5efcfe9a87853be5a25aff2e7f1ffbbf17d9f
parent c9523b19c6479009e7464cfb81cd0b5bec9585ae

refactor: refactor simple YAML macros

This change replaces instances of the LAVA-like YAML template variable
syntax where the template variable is actually simple replacement for an
existing Bash variable.

Signed-off-by: Chris Kay <chris.kay@arm.com>
Change-Id: I93147ee1c1a07a096f65760223fbfa1ec2f791d9

script/lava-templates/fvp-linux.yaml

diff --git a/script/lava-templates/fvp-linux.yaml b/script/lava-templates/fvp-linux.yaml
index 711499e..b492117 100644
--- a/script/lava-templates/fvp-linux.yaml
+++ b/script/lava-templates/fvp-linux.yaml
@@ -1,6 +1,6 @@
 metadata:
-  test_config: {TEST_CONFIG}
-  fvp_model: {MODEL}
+  test_config: ${test_config}
+  fvp_model: ${model}
   build_url: ${BUILD_URL}
 
 $(if [ -n "${gerrit_url}" ]; then
@@ -10,7 +10,7 @@
 fi)
 
 device_type: fvp
-job_name: fvp-linux-{TEST_CONFIG}
+job_name: fvp-linux-${test_config}
 
 timeouts:
   connection:
@@ -56,12 +56,12 @@
 
 - boot:
     method: fvp
-    license_variable: ARMLMD_LICENSE_FILE={ARMLMD_LICENSE_FILE}
+    license_variable: ARMLMD_LICENSE_FILE=${armlmd_license_file}
     docker:
-      name: {BOOT_DOCKER_NAME}
+      name: ${docker_name}
       local: true
-    image: {BOOT_IMAGE_DIR}/{BOOT_IMAGE_BIN}
-    version_string: {BOOT_VERSION_STRING}
+    image: ${model_dir}/${model_bin}
+    version_string: ${version_string}
     console_string: 'terminal_0: Listening for serial connection on port (?P<PORT>\d+)'
     feedbacks:
       - '(?P<NAME>terminal_1): Listening for serial connection on port (?P<PORT>\d+)'

script/lava-templates/fvp-tftf.yaml

diff --git a/script/lava-templates/fvp-tftf.yaml b/script/lava-templates/fvp-tftf.yaml
index 9a337a3..26a4d9f 100644
--- a/script/lava-templates/fvp-tftf.yaml
+++ b/script/lava-templates/fvp-tftf.yaml
@@ -1,6 +1,6 @@
 metadata:
-  test_config: {TEST_CONFIG}
-  fvp_model: {MODEL}
+  test_config: ${test_config}
+  fvp_model: ${model}
   build_url: ${BUILD_URL}
 
 $(if [ -n "${gerrit_url}" ]; then
@@ -10,7 +10,7 @@
 fi)
 
 device_type: fvp
-job_name: {TEST_CONFIG}
+job_name: ${test_config}
 
 timeouts:
   job:
@@ -69,12 +69,12 @@
 
 - boot:
     method: fvp
-    license_variable: ARMLMD_LICENSE_FILE={ARMLMD_LICENSE_FILE}
+    license_variable: ARMLMD_LICENSE_FILE=${armlmd_license_file}
     docker:
-      name: {BOOT_DOCKER_NAME}
+      name: ${docker_name}
       local: true
-    image: {BOOT_IMAGE_DIR}/{BOOT_IMAGE_BIN}
-    version_string: {BOOT_VERSION_STRING}
+    image: ${model_dir}/${model_bin}
+    version_string: ${version_string}
     console_string: 'terminal_0: Listening for serial connection on port (?P<PORT>\d+)'
     feedbacks:
       - '(?P<NAME>terminal_1): Listening for serial connection on port (?P<PORT>\d+)'