Skip to content

Commit f5c8502

Browse files
a-wainuclearcat
authored andcommitted
config: runtime: tests: consistently indent test definitions
At some point, we might want to provide "generic" test definitions to be included in specific tests. However, in order to do so, all test definitions entries must be consistently indented, which is mostly the case already. Howver, some test templates are a bit off in this regard, so fix this by re-indenting the "faulty" ones. Signed-off-by: Arnaud Ferraris <[email protected]>
1 parent 896a102 commit f5c8502

File tree

2 files changed

+25
-27
lines changed

2 files changed

+25
-27
lines changed

config/runtime/tests/blktests-ddp.jinja2

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,19 @@
88
results:
99
location: /home/cros/lava
1010
definitions:
11-
- from: inline
12-
name: blktests
13-
path: inline/blktests.yaml
14-
repository:
15-
metadata:
16-
format: Lava-Test Test Definition 1.0
17-
name: cros-tast
18-
run:
19-
steps:
20-
- apt-get update
21-
- apt-get install -y sshpass
22-
- sshpass -p 'DougIsHero' ssh -T -o StrictHostKeyChecking=no doug@$(lava-target-ip) "cd nvidia-blktest && mkdir -p mnt && sudo ./orchestrator.py orchestrator.yml {{ node.id }} {{ api_config.name }} {{ rootfs }}"
23-
- lava-test-case ping_loopback --shell sshpass -p 'DougIsHero' ssh -o StrictHostKeyChecking=no doug@$(lava-target-ip) "ping -c 5 127.0.0.1"
24-
- lava-test-case nvme_056_tcp_ddp --shell sshpass -p 'DougIsHero' ssh -o StrictHostKeyChecking=no doug@$(lava-target-ip) "grep 'pass' nvidia-blktest/nvme_056_tcp_ddp.test"
25-
- sshpass -p 'DougIsHero' ssh -T -o StrictHostKeyChecking=no doug@$(lava-target-ip) "sync && sudo systemctl poweroff"
26-
- sleep 10
27-
28-
11+
- from: inline
12+
name: blktests
13+
path: inline/blktests.yaml
14+
repository:
15+
metadata:
16+
format: Lava-Test Test Definition 1.0
17+
name: cros-tast
18+
run:
19+
steps:
20+
- apt-get update
21+
- apt-get install -y sshpass
22+
- sshpass -p 'DougIsHero' ssh -T -o StrictHostKeyChecking=no doug@$(lava-target-ip) "cd nvidia-blktest && mkdir -p mnt && sudo ./orchestrator.py orchestrator.yml {{ node.id }} {{ api_config.name }} {{ rootfs }}"
23+
- lava-test-case ping_loopback --shell sshpass -p 'DougIsHero' ssh -o StrictHostKeyChecking=no doug@$(lava-target-ip) "ping -c 5 127.0.0.1"
24+
- lava-test-case nvme_056_tcp_ddp --shell sshpass -p 'DougIsHero' ssh -o StrictHostKeyChecking=no doug@$(lava-target-ip) "grep 'pass' nvidia-blktest/nvme_056_tcp_ddp.test"
25+
- sshpass -p 'DougIsHero' ssh -T -o StrictHostKeyChecking=no doug@$(lava-target-ip) "sync && sudo systemctl poweroff"
26+
- sleep 10

config/runtime/tests/ltp.jinja2

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
timeout:
44
minutes: {{ job_timeout|default(15) }}
55
definitions:
6-
- repository: https://github.com/kernelci/test-definitions
7-
from: git
8-
revision: kernelci.org
9-
path: automated/linux/ltp/ltp.yaml
10-
name: {{ node.name }}
11-
parameters:
12-
TST_CMDFILES: "{{ tst_cmdfiles|default('') }}"
13-
SKIP_INSTALL: "{{ skip_install }}"
14-
SKIPFILE: {{ skipfile }}
6+
- repository: https://github.com/kernelci/test-definitions
7+
from: git
8+
revision: kernelci.org
9+
path: automated/linux/ltp/ltp.yaml
10+
name: {{ node.name }}
11+
parameters:
12+
TST_CMDFILES: "{{ tst_cmdfiles|default('') }}"
13+
SKIP_INSTALL: "{{ skip_install }}"
14+
SKIPFILE: {{ skipfile }}

0 commit comments

Comments
 (0)