linux-linaro-tracking-ll: juno: remove boot_linaro_image stanzas

Sync LAVA job definitions templates for Juno with LSK templates.

Change-Id: I290e74342514db4d7eeb28e408a0d11e1987f345
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>

4 files changed, 182 insertions, 38 deletions

diff --git a/linux-linaro-tracking-ll/lava-job-definitions/juno/template-efi.json b/linux-linaro-tracking-ll/lava-job-definitions/juno/template-efi.json
index 066d082faf..e1d6129fdb 100644
--- a/linux-linaro-tracking-ll/lava-job-definitions/juno/template-efi.json
+++ b/linux-linaro-tracking-ll/lava-job-definitions/juno/template-efi.json
@@ -22,26 +22,6 @@
       }
     },
     {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "expect Start:",
-          "sendline 3",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendcontrol [",
-          "sendcontrol M",
-          "expect Choice:",
-          "sendline 7",
-          "expect Start:",
-          "sendline 2",
-          "expect or any other key to continue.",
-          "sendline "
-        ]
-      }
-    },
-    {
       "command": "lava_test_shell",
       "parameters": {
         "timeout": 800,
@@ -410,6 +390,66 @@
       }
     },
     {
+      "command": "lava_test_shell",
+      "parameters": {
+        "timeout": 1800,
+        "testdef_repos": [
+          {
+            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
+            "testdef": "openembedded/kselftest-efivarfs.yaml"
+          }
+        ]
+      }
+    },
+    {
+      "command": "lava_test_shell",
+      "parameters": {
+        "timeout": 1800,
+        "testdef_repos": [
+          {
+            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
+            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
+          }
+        ]
+      }
+    },
+    {
+      "command": "lava_test_shell",
+      "parameters": {
+        "timeout": 1800,
+        "testdef_repos": [
+          {
+            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
+            "testdef": "openembedded/kselftest-net.yaml"
+          }
+        ]
+      }
+    },
+    {
+      "command": "lava_test_shell",
+      "parameters": {
+        "timeout": 1800,
+        "testdef_repos": [
+          {
+            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
+            "testdef": "openembedded/kselftest-ptrace.yaml"
+          }
+        ]
+      }
+    },
+    {
+      "command": "lava_test_shell",
+      "parameters": {
+        "timeout": 1800,
+        "testdef_repos": [
+          {
+            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
+            "testdef": "openembedded/kselftest-vm.yaml"
+          }
+        ]
+      }
+    },
+    {
       "command": "submit_results",
       "parameters": {
         "stream": "${BUNDLE_STREAM_NAME}",
diff --git a/linux-linaro-tracking-ll/lava-job-definitions/juno/template-efi.yaml b/linux-linaro-tracking-ll/lava-job-definitions/juno/template-efi.yaml
index ee1dca5bb2..456b4631a7 100644
--- a/linux-linaro-tracking-ll/lava-job-definitions/juno/template-efi.yaml
+++ b/linux-linaro-tracking-ll/lava-job-definitions/juno/template-efi.yaml
@@ -16,22 +16,6 @@ actions:
     git URL: '${GIT_URL}'
     git branch: '${GIT_BRANCH}'
     git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'expect Start:'
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendcontrol ['
-    - 'sendcontrol M'
-    - 'expect Choice:'
-    - 'sendline 7'
-    - 'expect Start:'
-    - 'sendline 2'
-    - 'expect or any other key to continue.'
-    - 'sendline '
 - command: lava_test_shell
   parameters:
     timeout: 800
@@ -233,10 +217,40 @@ actions:
         TST_CMDFILES: mm
         SKIPFILE: ./common/scripts/ltp/skipfile-lsk-juno
       testdef: openembedded/ltp.yaml
+- command: lava_test_shell
+  parameters:
+    timeout: 10800
+    testdef_repos:
+    - git-repo: git://git.linaro.org/qa/test-definitions.git
+      testdef: openembedded/kselftest-efivarfs.yaml
+- command: lava_test_shell
+  parameters:
+    timeout: 10800
+    testdef_repos:
+    - git-repo: git://git.linaro.org/qa/test-definitions.git
+      testdef: openembedded/kselftest-memory-hotplug.yaml
+- command: lava_test_shell
+  parameters:
+    timeout: 10800
+    testdef_repos:
+    - git-repo: git://git.linaro.org/qa/test-definitions.git
+      testdef: openembedded/kselftest-net.yaml
+- command: lava_test_shell
+  parameters:
+    timeout: 10800
+    testdef_repos:
+    - git-repo: git://git.linaro.org/qa/test-definitions.git
+      testdef: openembedded/kselftest-ptrace.yaml
+- command: lava_test_shell
+  parameters:
+    timeout: 10800
+    testdef_repos:
+    - git-repo: git://git.linaro.org/qa/test-definitions.git
+      testdef: openembedded/kselftest-vm.yaml
 - command: submit_results
   parameters:
     server: 'http://${LAVA_SERVER}'
     stream: '${BUNDLE_STREAM_NAME}'
 device_type: '${DEVICE_TYPE}'
 job_name: '${BUILD_URL}'
-timeout: 18000
\ No newline at end of file
+timeout: 18000
diff --git a/linux-linaro-tracking-ll/lava-job-definitions/juno/template.json b/linux-linaro-tracking-ll/lava-job-definitions/juno/template.json
index 95cfc265cd..9acb016036 100644
--- a/linux-linaro-tracking-ll/lava-job-definitions/juno/template.json
+++ b/linux-linaro-tracking-ll/lava-job-definitions/juno/template.json
@@ -387,6 +387,66 @@
       }
     },
     {
+      "command": "lava_test_shell",
+      "parameters": {
+        "timeout": 1800,
+        "testdef_repos": [
+          {
+            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
+            "testdef": "openembedded/kselftest-efivarfs.yaml"
+          }
+        ]
+      }
+    },
+    {
+      "command": "lava_test_shell",
+      "parameters": {
+        "timeout": 1800,
+        "testdef_repos": [
+          {
+            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
+            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
+          }
+        ]
+      }
+    },
+    {
+      "command": "lava_test_shell",
+      "parameters": {
+        "timeout": 1800,
+        "testdef_repos": [
+          {
+            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
+            "testdef": "openembedded/kselftest-net.yaml"
+          }
+        ]
+      }
+    },
+    {
+      "command": "lava_test_shell",
+      "parameters": {
+        "timeout": 1800,
+        "testdef_repos": [
+          {
+            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
+            "testdef": "openembedded/kselftest-ptrace.yaml"
+          }
+        ]
+      }
+    },
+    {
+      "command": "lava_test_shell",
+      "parameters": {
+        "timeout": 1800,
+        "testdef_repos": [
+          {
+            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
+            "testdef": "openembedded/kselftest-vm.yaml"
+          }
+        ]
+      }
+    },
+    {
       "command": "submit_results",
       "parameters": {
         "stream": "${BUNDLE_STREAM_NAME}",
diff --git a/linux-linaro-tracking-ll/lava-job-definitions/juno/template.yaml b/linux-linaro-tracking-ll/lava-job-definitions/juno/template.yaml
index 298fb32c01..8866eca759 100644
--- a/linux-linaro-tracking-ll/lava-job-definitions/juno/template.yaml
+++ b/linux-linaro-tracking-ll/lava-job-definitions/juno/template.yaml
@@ -214,10 +214,40 @@ actions:
         TST_CMDFILES: mm
         SKIPFILE: ./common/scripts/ltp/skipfile-lsk-juno
       testdef: openembedded/ltp.yaml
+- command: lava_test_shell
+  parameters:
+    timeout: 10800
+    testdef_repos:
+    - git-repo: git://git.linaro.org/qa/test-definitions.git
+      testdef: openembedded/kselftest-efivarfs.yaml
+- command: lava_test_shell
+  parameters:
+    timeout: 10800
+    testdef_repos:
+    - git-repo: git://git.linaro.org/qa/test-definitions.git
+      testdef: openembedded/kselftest-memory-hotplug.yaml
+- command: lava_test_shell
+  parameters:
+    timeout: 10800
+    testdef_repos:
+    - git-repo: git://git.linaro.org/qa/test-definitions.git
+      testdef: openembedded/kselftest-net.yaml
+- command: lava_test_shell
+  parameters:
+    timeout: 10800
+    testdef_repos:
+    - git-repo: git://git.linaro.org/qa/test-definitions.git
+      testdef: openembedded/kselftest-ptrace.yaml
+- command: lava_test_shell
+  parameters:
+    timeout: 10800
+    testdef_repos:
+    - git-repo: git://git.linaro.org/qa/test-definitions.git
+      testdef: openembedded/kselftest-vm.yaml
 - command: submit_results
   parameters:
     server: 'http://${LAVA_SERVER}'
     stream: '${BUNDLE_STREAM_NAME}'
 device_type: '${DEVICE_TYPE}'
 job_name: '${BUILD_URL}'
-timeout: 18000
\ No newline at end of file
+timeout: 18000