commit 1d545c05ddb18602b4972324c3f7666e45a8520c
author Dean Birch <dean.birch@arm.com> Fri May 29 14:09:21 2020 +0100
committer Dean Birch <dean.birch@arm.com> Fri May 29 14:09:21 2020 +0100
tree d38edfb7d85ca44497821cfd0f2b63aaf4f639fa
parent 15c8ffe09f69d1640cdd5a1adb0e03ca012bd3cf

Fixing merge conflict errors

This should help LAVA job submissions amongst other areas.

Change-Id: I2e4b154ea63c30b38bc0d681adbe2416275170f0

lava_helper/lava_helper_configs.py

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": {