lt-qcom-ubuntu-images*: fix LTP timing out on IFC6410

LTP timing out on IFC6410 https://projects.linaro.org/browse/TICKET-67

IFC6410 takes about 50 minutes to compile and install the latest version
LTP test suite. The current timeout value 1800 seconds is not enough,
that is the reason of the timing out. To address it

* Increase the timeout in the first lava_test_shell to 7200 seconds for
  LTP installation and test
* We have moved LTP installation directory from test folder to /opt. In
  the same LAVA job, except the first lava_test_shell, LTP install steps
  in others are not needed anymore, so skip it to reduce test duration.
  Without the install steps, 3600 seconds is enough.

Change-Id: I6a627af5a2500efc17886c9fa48896e58af27a7b
Signed-off-by: Chase Qi <chase.qi@linaro.org>

2 files changed, 62 insertions, 32 deletions

diff --git a/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-ltp.json b/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-ltp.json
index 636a2c8526..dab1de3ef4 100644
--- a/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-ltp.json
+++ b/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-ltp.json
@@ -26,7 +26,7 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "timeout": 7200,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -42,7 +42,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -58,7 +59,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -74,7 +76,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -90,7 +93,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -106,7 +110,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -122,7 +127,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -138,7 +144,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -154,7 +161,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -170,7 +178,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -186,7 +195,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -202,7 +212,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -218,7 +229,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -234,7 +246,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -250,7 +263,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
@@ -266,7 +280,8 @@
     {
       "command": "lava_test_shell",
       "parameters": {
-        "timeout": 1800,
+        "skip_install": "steps",
+        "timeout": 3600,
         "testdef_repos": [
           {
             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
diff --git a/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-ltp.yaml b/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-ltp.yaml
index be2e547680..80115e96bf 100644
--- a/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-ltp.yaml
+++ b/lt-qcom-ubuntu-images-tracking/lava-job-definitions/ifc6410/template-ltp.yaml
@@ -18,142 +18,157 @@ actions:
             parameters:
               TST_CMDFILES: 'math'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 7200
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'timers'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'fcntl-locktests'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'ipc'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'fsx'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'fs'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'hugetlb'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'io'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'nptl'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'pty'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'containers'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'fs_bind'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'filecaps'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'admin_tools'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'connectors'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: lava_test_shell
       parameters:
+        skip_install: steps
         testdef_repos:
           - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
             testdef: 'ubuntu/ltp.yaml'
             parameters:
               TST_CMDFILES: 'mm'
               SKIPFILE: 'skipfile-lsk-juno'
-        timeout: 1800
+        timeout: 3600
     - command: submit_results
       parameters:
           server: 'http://${LAVA_SERVER}'