LKFT: LTP: Use skipfile-lkft.yaml

Pass board (DEVICE_TYPE), branch (KERNEL_VERSION), and environment names
to ltp, and it will generate a skiplist from skipfile-lkft.yaml.

This introduces the concept of 'environment', which is defaulted to
'production' but set to 'staging' in such a case.

Introduce a variable "KERNEL_VERSION_OVERRIDE" for the cases, as in
mainline and next, where KERNEL_VERSION isn't suitable from a skiplist
context.

Change-Id: I573b8f659e936d307423b1d45d6aa744ee2b222d
Signed-off-by: Dan Rue <dan.rue@linaro.org>

10 files changed, 12 insertions, 17 deletions

diff --git a/lkft-staging-no-skiplist.yaml b/lkft-staging-no-skiplist.yaml
index 00460d7ab2..aea67b8d87 100644
--- a/lkft-staging-no-skiplist.yaml
+++ b/lkft-staging-no-skiplist.yaml
@@ -100,6 +100,7 @@
             export MANIFEST_BRANCH=morty
             export SNAPSHOTS_URL=https://snapshots.linaro.org
             export BASE_URL=openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NAME}/latest
+            export ENVIRONMENT=staging
 
             export SNAPSHOTS_BASE_URL=${SNAPSHOTS_URL}/${BASE_URL}
 
@@ -155,7 +156,6 @@
                 export KSELFTEST_PATH=/opt/kselftests/mainline/
                 ;;
             esac
-            export LTP_SKIPFILE="skipfiles/skipfile-lkft-minimal"
             export NFSROOTFS_URL="${BUILD_LOCATION}/${NFS_FILENAME}"
             export BOOT_URL="${BUILD_LOCATION}/${BOOT_FILENAME}"
             export SYSTEM_URL="${BUILD_LOCATION}/${ROOTFS_FILENAME}"
diff --git a/openembedded-lkft-linux-mainline.yaml b/openembedded-lkft-linux-mainline.yaml
index eddd010967..428d3162d2 100644
--- a/openembedded-lkft-linux-mainline.yaml
+++ b/openembedded-lkft-linux-mainline.yaml
@@ -25,6 +25,9 @@
             name: KERNEL_VERSION
             default: 'git'
         - string:
+            name: KERNEL_VERSION_OVERRIDE
+            default: 'mainline'
+        - string:
             name: KERNEL_RECIPE
             default: 'linux-generic-mainline'
         - string:
diff --git a/openembedded-lkft-linux-next.yaml b/openembedded-lkft-linux-next.yaml
index f5f944af07..75e5f39409 100644
--- a/openembedded-lkft-linux-next.yaml
+++ b/openembedded-lkft-linux-next.yaml
@@ -25,6 +25,9 @@
             name: KERNEL_VERSION
             default: 'git'
         - string:
+            name: KERNEL_VERSION_OVERRIDE
+            default: 'next'
+        - string:
             name: KERNEL_RECIPE
             default: 'linux-generic-next'
         - string:
diff --git a/openembedded-lkft/lava-job-definitions/devices/b2260 b/openembedded-lkft/lava-job-definitions/devices/b2260
index 47eaf94292..1df30b6617 100644
--- a/openembedded-lkft/lava-job-definitions/devices/b2260
+++ b/openembedded-lkft/lava-job-definitions/devices/b2260
@@ -1,8 +1,5 @@
 {% extends "lkft-nfs.jinja2" %}
 
-{# set proper skip file for LTP #}
-{% set ltp_skipfile = "skipfile-lkft-b2260" %}
-
 {% block global_settings %}
 context:
   test_character_delay: 10
diff --git a/openembedded-lkft/lava-job-definitions/devices/hi6220-hikey b/openembedded-lkft/lava-job-definitions/devices/hi6220-hikey
index b0c360f61f..30de3952ed 100644
--- a/openembedded-lkft/lava-job-definitions/devices/hi6220-hikey
+++ b/openembedded-lkft/lava-job-definitions/devices/hi6220-hikey
@@ -1,8 +1,5 @@
 {% extends "lkft-fastboot.jinja2" %}
 
-{# set proper skip file for LTP #}
-{% set ltp_skipfile = "skipfile-lkft-hikey" %}
-
 {% block device_type %}hi6220-hikey{% endblock %}
 
 {% block deploy_target %}
diff --git a/openembedded-lkft/lava-job-definitions/devices/juno-r2 b/openembedded-lkft/lava-job-definitions/devices/juno-r2
index 2dfe8ec63e..019118e34f 100644
--- a/openembedded-lkft/lava-job-definitions/devices/juno-r2
+++ b/openembedded-lkft/lava-job-definitions/devices/juno-r2
@@ -1,8 +1,5 @@
 {% extends "lkft-nfs.jinja2" %}
 
-{# set proper skip file for LTP #}
-{% set ltp_skipfile = "skipfile-lkft-juno" %}
-
 {% block global_settings %}
 context:
   bootloader_prompt: juno#
diff --git a/openembedded-lkft/lava-job-definitions/devices/x15 b/openembedded-lkft/lava-job-definitions/devices/x15
index c9ed9a8edb..a42d35e952 100644
--- a/openembedded-lkft/lava-job-definitions/devices/x15
+++ b/openembedded-lkft/lava-job-definitions/devices/x15
@@ -4,9 +4,6 @@
 {% set libhuggetlbfs_word_size = 32 %}
 {% block device_type %}x15{% endblock %}
 
-{# set proper skip file for LTP #}
-{% set ltp_skipfile = "skipfile-lkft-x15" %}
-
 {% block deploy_target %}
 - deploy:
     timeout:
diff --git a/openembedded-lkft/lava-job-definitions/devices/x86 b/openembedded-lkft/lava-job-definitions/devices/x86
index c333f317ec..98e676d493 100644
--- a/openembedded-lkft/lava-job-definitions/devices/x86
+++ b/openembedded-lkft/lava-job-definitions/devices/x86
@@ -1,8 +1,5 @@
 {% extends "lkft-nfs.jinja2" %}
 
-{# set proper skip file for LTP #}
-{% set ltp_skipfile = "skipfile-lkft-x86" %}
-
 {% block global_settings %}
 context:
   test_character_delay: 10
diff --git a/openembedded-lkft/lava-job-definitions/master/template-ltp.yaml.jinja2 b/openembedded-lkft/lava-job-definitions/master/template-ltp.yaml.jinja2
index 86e487a4b2..2a1263fd63 100644
--- a/openembedded-lkft/lava-job-definitions/master/template-ltp.yaml.jinja2
+++ b/openembedded-lkft/lava-job-definitions/master/template-ltp.yaml.jinja2
@@ -19,7 +19,10 @@
       parameters:
         SKIP_INSTALL: 'true'
         TST_CMDFILES: '{{testname}}'
-        {% if LTP_SKIPFILE is defined %}SKIPFILE: '{{LTP_SKIPFILE}}'{% elif ltp_skipfile is defined %}SKIPFILE: '{{ltp_skipfile}}'{% endif %}
+        SKIPFILE: skipfile-lkft.yaml
+        BOARD: '{{ DEVICE_TYPE }}'
+        BRANCH: '{{ KERNEL_VERSION_OVERRIDE|default(KERNEL_VERSION) }}'
+        ENVIRONMENT: '{{ ENVIRONMENT|default('production') }}'
         TIMEOUT_MULTIPLIER: 3
       name: ltp-{{testname}}-tests
       timeout:
diff --git a/openembedded-lkft/test_submit_for_testing.sh b/openembedded-lkft/test_submit_for_testing.sh
index 443fced6f6..7a05df175a 100755
--- a/openembedded-lkft/test_submit_for_testing.sh
+++ b/openembedded-lkft/test_submit_for_testing.sh
@@ -23,6 +23,7 @@ export KERNEL_RECIPE=linux-hikey-mainline
 export KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 export KERNEL_URL=${BASE_URL}/${PUB_DEST}/Image--4.13+git0+ff5abbe799-r0-hikey-20171012090440-346.bin
 export KERNEL_VERSION=git
+export KERNEL_VERSION_OVERRIDE=mainline
 export KSELFTEST_PATH="/opt/"
 export KSELFTESTS_URL=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.xz
 export KSELFTESTS_VERSION=4.13