LKFT: LAVA templates: Adding LTP sub testsuites

Adding more LTP sub testsuites to run on LKFT OE builds
 - cap_bounds
 - commands
 - containers
 - fcntl-locktests
 - filecaps
 - fs
 - fs_bind
 - fs_perms_simple
 - fsx
 - hugetlb
 - io
 - ipc
 - math
 - nptl
 - pty
 - sched
 - securebits
 - timers

Updated submit_for_testing.sh take the master-template-ltp.yaml.jinja2
as base and create each ltp sub test suites template.

Change-Id: I471a883c961df3dddab7ed9ef699a1759487dd5c
Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Dan Rue <dan.rue@linaro.org>
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>

5 files changed, 31 insertions, 52 deletions

diff --git a/openembedded-lkft/builders.sh b/openembedded-lkft/builders.sh
index d7ffcf7c1a..a987ce69ff 100755
--- a/openembedded-lkft/builders.sh
+++ b/openembedded-lkft/builders.sh
@@ -20,13 +20,16 @@ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
   sleep 15
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
 fi
-pkg_list="android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-requests texinfo vim-tiny whiptail"
+pkg_list="python-pip android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-requests texinfo vim-tiny whiptail"
 if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
   echo "INFO: apt install error - try again in a moment"
   sleep 15
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
 fi
 
+# Install jinja2-cli
+pip install jinja2-cli
+
 set -ex
 
 mkdir -p ${HOME}/bin
diff --git a/openembedded-lkft/lava-job-definitions/hi6220-hikey/template-ltp.yaml b/openembedded-lkft/lava-job-definitions/hi6220-hikey/master-template-ltp.yaml.jinja2
index 138aeca03a..28ac5619fa 100644
--- a/openembedded-lkft/lava-job-definitions/hi6220-hikey/template-ltp.yaml
+++ b/openembedded-lkft/lava-job-definitions/hi6220-hikey/master-template-ltp.yaml.jinja2
@@ -2,7 +2,7 @@ context:
   test_character_delay: 10
 
 device_type: hi6220-hikey
-job_name: lkft-ltp-${KERNEL_BRANCH}-${BUILD_NUMBER}
+job_name: lkft-ltp-{{testname}}-${KERNEL_BRANCH}-${BUILD_NUMBER}
 timeouts:
   job:
     minutes: 60
@@ -22,14 +22,9 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
-  kselftest__url: ${KSELFTESTS_MAINLINE_URL}
-  kselftest__version: "${KSELFTESTS_MAINLINE_VERSION}"
-  libhugetlbfs__url: ${LIBHUGETLBFS_URL}
-  libhugetlbfs__version: "${LIBHUGETLBFS_VERSION}"
-  libhugetlbfs__revision: "${LIBHUGETLBFS_REVISION}"
-  ltp-syscalls-tests__url: ${LTP_URL}
-  ltp-syscalls-tests__version: "${LTP_VERSION}"
-  ltp-syscalls-tests__revision: "${LTP_REVISION}"
+  ltp-{{testname}}-tests__url: ${LTP_URL}
+  ltp-{{testname}}-tests__version: "${LTP_VERSION}"
+  ltp-{{testname}}-tests__revision: "${LTP_REVISION}"
   build-url: ${BUILD_URL}
   build-location: ${SNAPSHOTS_URL}/${BASE_URL}
   series: lkft
@@ -162,26 +157,9 @@ actions:
       path: automated/linux/ltp/ltp.yaml
       parameters:
         SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'syscalls'
+        TST_CMDFILES: '{{testname}}'
         SKIPFILE: 'skipfile-lkft-hikey'
         TIMEOUT_MULTIPLIER: 3
-      name: ltp-syscalls-tests
+      name: ltp-{{testname}}-tests
       timeout:
         minutes: 60
-
-- test:
-   namespace: tlxc
-   timeout:
-     minutes: 5
-   definitions:
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: dummy-tests
-          description: "Dummy tests"
-        run:
-          steps:
-          - ls
-      name: dummy-test
-      path: inline/dummy.yaml
diff --git a/openembedded-lkft/lava-job-definitions/juno-r2/template-ltp.yaml b/openembedded-lkft/lava-job-definitions/juno-r2/master-template-ltp.yaml.jinja2
index aa6429ca1e..174769f57c 100644
--- a/openembedded-lkft/lava-job-definitions/juno-r2/template-ltp.yaml
+++ b/openembedded-lkft/lava-job-definitions/juno-r2/master-template-ltp.yaml.jinja2
@@ -2,7 +2,7 @@ context:
  bootloader_prompt: juno#
 
 device_type: juno-r2
-job_name: lkft-ltp-${KERNEL_BRANCH}-${BUILD_NUMBER}
+job_name: lkft-ltp-{{testname}}-${KERNEL_BRANCH}-${BUILD_NUMBER}
 timeouts:
   job:
     minutes: 60
@@ -32,14 +32,9 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
-  kselftest__url: ${KSELFTESTS_MAINLINE_URL}
-  kselftest__version: "${KSELFTESTS_MAINLINE_VERSION}"
-  libhugetlbfs__url: ${LIBHUGETLBFS_URL}
-  libhugetlbfs__version: "${LIBHUGETLBFS_VERSION}"
-  libhugetlbfs__revision: "${LIBHUGETLBFS_REVISION}"
-  ltp-syscalls-tests__url: ${LTP_URL}
-  ltp-syscalls-tests__version: "${LTP_VERSION}"
-  ltp-syscalls-tests__revision: "${LTP_REVISION}"
+  ltp-{{testname}}-tests__url: ${LTP_URL}
+  ltp-{{testname}}-tests__version: "${LTP_VERSION}"
+  ltp-{{testname}}-tests__revision: "${LTP_REVISION}"
   build-url: ${BUILD_URL}
   build-location: ${SNAPSHOTS_URL}/${BASE_URL}
   series: lkft
@@ -85,8 +80,8 @@ actions:
       path: automated/linux/ltp/ltp.yaml
       parameters:
         SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'syscalls'
+        TST_CMDFILES: '{{testname}}'
         TIMEOUT_MULTIPLIER: 3
-      name: ltp-syscalls-tests
+      name: ltp-{{testname}}-tests
       timeout:
         minutes: 60
diff --git a/openembedded-lkft/lava-job-definitions/x86/template-ltp.yaml b/openembedded-lkft/lava-job-definitions/x86/master-template-ltp.yaml.jinja2
index 2c52f1706d..ddde33a400 100644
--- a/openembedded-lkft/lava-job-definitions/x86/template-ltp.yaml
+++ b/openembedded-lkft/lava-job-definitions/x86/master-template-ltp.yaml.jinja2
@@ -2,7 +2,7 @@ context:
   test_character_delay: 10
 
 device_type: x86
-job_name: lkft-ltp-${KERNEL_BRANCH}-${BUILD_NUMBER}
+job_name: lkft-ltp-{{testname}}-${KERNEL_BRANCH}-${BUILD_NUMBER}
 timeouts:
   job:
     minutes: 90
@@ -20,14 +20,9 @@ metadata:
   git describe: ${KERNEL_DESCRIBE}
   make_kernelversion: "${MAKE_KERNELVERSION}"
   kernel-config: ${KERNEL_CONFIG_URL}
-  kselftest__url: ${KSELFTESTS_MAINLINE_URL}
-  kselftest__version: "${KSELFTESTS_MAINLINE_VERSION}"
-  libhugetlbfs__url: ${LIBHUGETLBFS_URL}
-  libhugetlbfs__version: "${LIBHUGETLBFS_VERSION}"
-  libhugetlbfs__revision: "${LIBHUGETLBFS_REVISION}"
-  ltp-syscalls-tests__url: ${LTP_URL}
-  ltp-syscalls-tests__version: "${LTP_VERSION}"
-  ltp-syscalls-tests__revision: "${LTP_REVISION}"
+  ltp-{{testname}}-tests__url: ${LTP_URL}
+  ltp-{{testname}}-tests__version: "${LTP_VERSION}"
+  ltp-{{testname}}-tests__revision: "${LTP_REVISION}"
   build-url: ${BUILD_URL}
   build-location: ${SNAPSHOTS_URL}/${BASE_URL}
   series: lkft
@@ -68,8 +63,8 @@ actions:
       path: automated/linux/ltp/ltp.yaml
       parameters:
         SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'syscalls'
+        TST_CMDFILES: '{{testname}}'
         TIMEOUT_MULTIPLIER: 3
-      name: ltp-syscalls-tests
+      name: ltp-{{testname}}-tests
       timeout:
         minutes: 90
diff --git a/openembedded-lkft/submit_for_testing.sh b/openembedded-lkft/submit_for_testing.sh
index 9f6f83fdb7..748a5497b5 100755
--- a/openembedded-lkft/submit_for_testing.sh
+++ b/openembedded-lkft/submit_for_testing.sh
@@ -13,6 +13,14 @@ fi
 rm -rf configs
 git clone --depth 1 http://git.linaro.org/ci/job/configs.git
 
+# Pre install jinja2-cli
+# Create LTP sub test suite templates
+LTP_TESTS="cap_bounds commands containers fcntl-locktests filecaps fs fs_bind fs_perms_simple fsx hugetlb io ipc math nptl pty sched securebits syscalls timers"
+for ltptest in ${LTP_TESTS}; do
+    jinja2 -D testname=${ltptest} configs/openembedded-lkft/lava-job-definitions/${DEVICE_TYPE}/master-template-ltp.yaml.jinja2 > configs/openembedded-lkft/lava-job-definitions/${DEVICE_TYPE}/template-ltp-${ltptest}.yaml
+    LTP_TEMPLATES="${LTP_TEMPLATES} template-ltp-${ltptest}.yaml"
+done
+
 [ -z "${DEVICE_TYPE}" ] || \
 python configs/openembedded-lkft/submit_for_testing.py \
   --device-type ${DEVICE_TYPE} \
@@ -22,4 +30,4 @@ python configs/openembedded-lkft/submit_for_testing.py \
   --qa-server-team lkft \
   --qa-server-project ${QA_SERVER_PROJECT} \
   --git-commit ${QA_BUILD_VERSION} \
-  --template-names template-kselftest.yaml template-ltp.yaml template-libhugetlbfs.yaml
+  --template-names template-kselftest.yaml template-libhugetlbfs.yaml ${LTP_TEMPLATES}