Fixing merge conflict errors
This should help LAVA job submissions amongst other areas.
Change-Id: I2e4b154ea63c30b38bc0d681adbe2416275170f0
diff --git a/lava_helper/jinja2_templates/mps2.jinja2 b/lava_helper/jinja2_templates/mps2.jinja2
index 870c95f..4f023b8 100644
--- a/lava_helper/jinja2_templates/mps2.jinja2
+++ b/lava_helper/jinja2_templates/mps2.jinja2
@@ -19,11 +19,10 @@
recovery_image:
url: {{ recovery_image_url }}
compression: gz
- namespace: target
- test_binary_1:
- url: {{ firmware_url}}
- test_binary_2:
- url: {{ bootloader_url }}
+ test_binary_1:
+ url: {{ firmware_url }}
+ test_binary_2:
+ url: {{ bootloader_url }}
namespace: target
- boot:
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index a3f507f..a902442 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -284,11 +284,7 @@
"action_timeout": 10,
"monitor_timeout": 10,
"poweroff_timeout": 1,
- "recovery_store_url": "%(jenkins_url)s/"
- "job/%(jenkins_job)s",
- "artifact_store_url": "%(jenkins_url)s/"
- "job/%(jenkins_job)s",
- "platforms": {"AN521": "mps2_an521_v3.0.tar.gz"},
+ "platforms": {"AN521": ""},
"compilers": ["GNUARM", "ARMCLANG"],
"build_types": ["Debug", "Release", "Minsizerel"],
"boot_types": ["BL2"],
@@ -519,15 +515,12 @@
"action_timeout": 10,
"monitor_timeout": 10,
"poweroff_timeout": 1,
- "recovery_store_url": "%(jenkins_url)s/"
- "job/%(jenkins_job)s",
- "artifact_store_url": "%(jenkins_url)s/"
- "job/%(jenkins_job)s",
- "platforms": {"AN521": "mps2_an521_v3.0.tar.gz"},
+ "platforms": {"AN521": ""},
"compilers": ["GNUARM", "ARMCLANG"],
"build_types": ["Debug", "Release", "Minsizerel"],
"boot_types": ["NOBL2"],
"data_bin_offset": "0x00100000",
+ "cpu_baseline": 1,
"tests": {
'Default': {
"binaries": {