fvp_*.jinja2: Remove "namespace" directives
Recently there were issues with the coverage builds, and based on the
information received from the LAVA maintainers, it's due to fixes to
various cases of test job namespace handling. Their recommendation was
to remove namespaces from these particular jobs at all.
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I2388cf2afbad67967b004a235596859a4b4e5f38
diff --git a/lava_helper/jinja2_templates/fvp_corstone1000.jinja2 b/lava_helper/jinja2_templates/fvp_corstone1000.jinja2
index d70c65f..fe6d297 100644
--- a/lava_helper/jinja2_templates/fvp_corstone1000.jinja2
+++ b/lava_helper/jinja2_templates/fvp_corstone1000.jinja2
@@ -17,7 +17,6 @@
actions:
- deploy:
- namespace: docker
to: fvp
images:
{% for name, img in binaries.items() %}
@@ -30,7 +29,6 @@
{% endfor %}
- boot:
failure_retry: 3
- namespace: docker
method: fvp
docker:
name: {{ docker_prefix }}/fvp:fvp_corstone_1000_11.19_21_linux64
@@ -69,7 +67,6 @@
- '(.*)'
- test:
- namespace: target
monitors:
{%- for monitor in monitors %}
- name: "{{monitor.name}}"
diff --git a/lava_helper/jinja2_templates/fvp_mps2.jinja2 b/lava_helper/jinja2_templates/fvp_mps2.jinja2
index e203f40..7b92e8a 100644
--- a/lava_helper/jinja2_templates/fvp_mps2.jinja2
+++ b/lava_helper/jinja2_templates/fvp_mps2.jinja2
@@ -17,7 +17,6 @@
actions:
- deploy:
- namespace: docker
to: fvp
images:
{% for name, img in binaries.items() %}
@@ -34,7 +33,6 @@
{%- endif %}
- boot:
failure_retry: 3
- namespace: docker
method: fvp
docker:
name: {{ docker_prefix }}/fvp:fvp_arm_std_library_11.22_14
@@ -92,7 +90,6 @@
- '(.*)'
- test:
- namespace: target
monitors:
{%- for monitor in monitors %}
- name: "{{monitor.name}}"
@@ -112,7 +109,6 @@
{%- if enable_code_coverage %}
- test:
- namespace: target
interactive:
- name: fvp_stopped
prompts: ['/OSCI/SystemC: Simulation stopped by user.']
diff --git a/lava_helper/jinja2_templates/fvp_mps3.jinja2 b/lava_helper/jinja2_templates/fvp_mps3.jinja2
index 5e7c0cf..1d9052c 100644
--- a/lava_helper/jinja2_templates/fvp_mps3.jinja2
+++ b/lava_helper/jinja2_templates/fvp_mps3.jinja2
@@ -17,7 +17,6 @@
actions:
- deploy:
- namespace: docker
to: fvp
images:
{% for name, img in binaries.items() %}
@@ -34,7 +33,6 @@
{%- endif %}
- boot:
failure_retry: 3
- namespace: docker
method: fvp
docker:
name: {{ docker_prefix }}/fvp:fvp_corstone_sse-300_11.22_20_linux64
@@ -79,7 +77,6 @@
- '(.*)'
- test:
- namespace: target
monitors:
{%- for monitor in monitors %}
- name: "{{monitor.name}}"
@@ -96,7 +93,6 @@
{%- if enable_code_coverage %}
- test:
- namespace: target
interactive:
- name: fvp_stopped
prompts: ['/OSCI/SystemC: Simulation stopped by user.']
diff --git a/lava_helper/jinja2_templates/fvp_mps4.jinja2 b/lava_helper/jinja2_templates/fvp_mps4.jinja2
index c9a026d..3aba507 100644
--- a/lava_helper/jinja2_templates/fvp_mps4.jinja2
+++ b/lava_helper/jinja2_templates/fvp_mps4.jinja2
@@ -17,7 +17,6 @@
actions:
- deploy:
- namespace: docker
to: fvp
images:
{% for name, img in binaries.items() %}
@@ -30,7 +29,6 @@
{%- endif %}
- boot:
failure_retry: 3
- namespace: docker
method: fvp
docker:
name: {{ docker_prefix }}/fvp:fvp_corstone_sse-315_11.24_22_linux64
@@ -69,7 +67,6 @@
- '(.*)'
- test:
- namespace: target
monitors:
{%- for monitor in monitors %}
- name: "{{monitor.name}}"
@@ -86,7 +83,6 @@
{%- if enable_code_coverage %}
- test:
- namespace: target
interactive:
- name: fvp_stopped
prompts: ['/OSCI/SystemC: Simulation stopped by user.']
diff --git a/lava_helper/jinja2_templates/fvp_rse_tc2.jinja2 b/lava_helper/jinja2_templates/fvp_rse_tc2.jinja2
index c12196c..a7e0f8e 100644
--- a/lava_helper/jinja2_templates/fvp_rse_tc2.jinja2
+++ b/lava_helper/jinja2_templates/fvp_rse_tc2.jinja2
@@ -17,7 +17,6 @@
actions:
- deploy:
- namespace: docker
to: fvp
images:
{% for name, img in binaries.items() %}
@@ -26,7 +25,6 @@
{% endfor %}
- boot:
failure_retry: 3
- namespace: docker
method: fvp
docker:
name: {{ docker_prefix }}/fvp:fvp_tc2_0.0_8294_linux64
@@ -57,7 +55,6 @@
- '(.*)'
- test:
- namespace: target
monitors:
{%- for monitor in monitors %}
- name: "{{monitor.name}}"