fix(fluster-chromeos.jinja2): Fix fluster job

Yaml formatting issues, path issues need to be fixed. Fix fluster_parser.py Signed-off-by: Denys Fedoryshchenko <[email protected]>
musamaanjum · Sep 17, 2024 · 26b0965 · 26b0965
1 parent aae60b3
commit 26b0965
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/config/rootfs/debos/overlays/fluster/usr/bin/fluster_parser.py b/config/rootfs/debos/overlays/fluster/usr/bin/fluster_parser.py
@@ -70,7 +70,7 @@ def _load_results_file(filename):
 
 def _run_fluster(test_suite=None, timeout=None, jobs=None, decoders=None, skips=None, verbose=False):
     cmd = ['python3', 'fluster.py', '-ne', 'run',
-           '-f', 'junitxml', '-so', f'{FLUSTER_PATH}/{RESULTS_FILE}']
+           '-f', 'junitxml', '-so', f'{RESULTS_PATH}/{RESULTS_FILE}']
 
     if verbose:
         cmd.extend(['-v'])
@@ -105,7 +105,7 @@ def main(args):
 
     if not args.run:
         # load test results
-        junitxml = _load_results_file(f'{FLUSTER_PATH}/{RESULTS_FILE}')
+        junitxml = _load_results_file(f'{RESULTS_PATH}/{RESULTS_FILE}')
 
         if not junitxml:
             subprocess.check_call([

diff --git a/config/runtime/tests/fluster-chromeos.jinja2 b/config/runtime/tests/fluster-chromeos.jinja2
@@ -36,13 +36,14 @@
             - lava-test-set start setup
             - for i in $(seq 1 60); do ping -c 1 -w 1 $(lava-target-ip) && break || sleep 1; done
             - ping -c 1 -w 1 $(lava-target-ip) || lava-test-raise "cros-device-unreachable"
+            - cd /home/cros
             - >-
-            ./ssh_retry.sh
-            -o StrictHostKeyChecking=no
-            -o UserKnownHostsFile=/dev/null
-            -i /home/cros/.ssh/id_rsa
-            root@$(lava-target-ip)
-            cat /etc/os-release > /tmp/osrel.tmp
+              /home/cros/ssh_retry.sh
+              -o StrictHostKeyChecking=no
+              -o UserKnownHostsFile=/dev/null
+              -i /home/cros/.ssh/id_rsa
+              root@$(lava-target-ip)
+              cat /etc/os-release > /tmp/osrel.tmp
             - cat /tmp/osrel.tmp
             - lava-test-set stop setup
             - >-