lt-qcom-linux-integration: LAVA change {base_,}template to template-bootrr

We will have functional testing that requires storage so not
base_template for bootrr (ramdisk) testing is needed.

Change-Id: I9486e294cf83b6194056d86c188c661ef226f150
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>

9 files changed, 129 insertions, 70 deletions

diff --git a/lt-qcom-linux-integration/lava-job-definitions/boards/base_template.yaml b/lt-qcom-linux-integration/lava-job-definitions/boards/template-bootrr.yaml
index e5c6e9eb4d..8d60bbd388 100644
--- a/lt-qcom-linux-integration/lava-job-definitions/boards/base_template.yaml
+++ b/lt-qcom-linux-integration/lava-job-definitions/boards/template-bootrr.yaml
@@ -1,3 +1,19 @@
+device_type: ${LAVA_DEVICE_TYPE}
+job_name: lt-qcom-linux-integration-bootrr-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 90
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: high
+visibility: public
+
+metadata:
+  source: https://git.linaro.org/ci/job/configs.git
+  path: lt-qcom-linux-integration/lava-job-definitions/${LAVA_DEVICE_TYPE}/template-bootrr.yaml
+
 protocols:
   lava-lxc:
     name: lxc-${LAVA_DEVICE_TYPE}-test
@@ -118,3 +134,51 @@ actions:
     timeout:
       minutes: 15
     method: fastboot
+
+- test:
+    namespace: ${LAVA_DEVICE_TYPE}
+    name: qcomlt-linux-integration-smoke
+    timeout:
+      minutes: 5
+    definitions:
+    - from: inline
+      name: qcomlt-linux-integration-smoke
+      path: inline/qcomlt-linux-integration-smoke.yaml
+      repository:
+        metadata:
+          description: QCOM LT linux integration smoke
+          format: Lava-Test Test Definition 1.0
+          name: qcomlt-linux-integration-smoke 
+        run:
+          steps:
+          - uname -a
+          - df
+          - free
+          - ls -l /dev
+          - ls -l /sys
+          - ls -l /proc
+          - echo "linux_integration_smoke:" "pass"
+
+- test:
+    namespace: ${LAVA_DEVICE_TYPE}
+    name: qcomlt-linux-integration-bootrr
+    timeout:
+      minutes: 5
+    definitions:
+    - from: inline
+      name: qcomlt-linux-integration-bootrr
+      path: inline/qcomlt-linux-integration-bootrr.yaml
+      repository:
+        metadata:
+          description: QCOM LT linux integration bootrr
+          format: Lava-Test Test Definition 1.0
+          name: qcomlt-linux-integration-bootrr
+        run:
+          steps:
+          - if [ "${LAVA_DEVICE_TYPE}" == "dragonboard-410c" ]; then
+          -     qcom,apq8016-sbc
+          - elif [ "${LAVA_DEVICE_TYPE}" == "dragonboard-820c" ]; then
+          -     arrow,apq8096-db820c
+          - elif [ "${LAVA_DEVICE_TYPE}" == "sdm845-mtp" ]; then
+          -     qcom,sdm845-mtp
+          - fi
diff --git a/lt-qcom-linux-integration/lava-job-definitions/boards/template.yaml b/lt-qcom-linux-integration/lava-job-definitions/boards/template.yaml
deleted file mode 100644
index 11d44afb49..0000000000
--- a/lt-qcom-linux-integration/lava-job-definitions/boards/template.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- test:
-    namespace: ${LAVA_DEVICE_TYPE}
-    name: qcomlt-linux-integration-smoke
-    timeout:
-      minutes: 5
-    definitions:
-    - from: inline
-      name: qcomlt-linux-integration-smoke
-      path: inline/qcomlt-linux-integration-smoke.yaml
-      repository:
-        metadata:
-          description: QCOM LT linux integration smoke
-          format: Lava-Test Test Definition 1.0
-          name: qcomlt-linux-integration-smoke 
-        run:
-          steps:
-          - uname -a
-          - df
-          - free
-          - ls -l /dev
-          - ls -l /sys
-          - ls -l /proc
-          - echo "linux_integration_smoke:" "pass"
-
-- test:
-    namespace: ${LAVA_DEVICE_TYPE}
-    name: qcomlt-linux-integration-bootrr
-    timeout:
-      minutes: 5
-    definitions:
-    - from: inline
-      name: qcomlt-linux-integration-bootrr
-      path: inline/qcomlt-linux-integration-bootrr.yaml
-      repository:
-        metadata:
-          description: QCOM LT linux integration bootrr
-          format: Lava-Test Test Definition 1.0
-          name: qcomlt-linux-integration-bootrr
-        run:
-          steps:
-          - if [ "${LAVA_DEVICE_TYPE}" == "dragonboard-410c" ]; then
-          -     qcom,apq8016-sbc
-          - elif [ "${LAVA_DEVICE_TYPE}" == "dragonboard-820c" ]; then
-          -     arrow,apq8096-db820c
-          - elif [ "${LAVA_DEVICE_TYPE}" == "sdm845-mtp" ]; then
-          -     qcom,sdm845-mtp
-          - fi
-
-device_type: ${LAVA_DEVICE_TYPE}
-job_name: lt-qcom-linux-integration-${BUILD_NUMBER}
-timeouts:
-  job:
-    minutes: 90
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: high
-visibility: public
-
-metadata:
-  source: https://git.linaro.org/ci/job/configs.git
-  path: lt-qcom-linux-integration/lava-job-definitions/${LAVA_DEVICE_TYPE}/template.yaml
diff --git a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template.yaml b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template.yaml
deleted file mode 120000
index eb29eb61a7..0000000000
--- a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../boards/base_template.yaml
\ No newline at end of file
diff --git a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/template.yaml b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/template.yaml
deleted file mode 120000
index 7277635d23..0000000000
--- a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../boards/template.yaml
\ No newline at end of file
diff --git a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/base_template.yaml b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/base_template.yaml
deleted file mode 120000
index eb29eb61a7..0000000000
--- a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/base_template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../boards/base_template.yaml
\ No newline at end of file
diff --git a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/template.yaml b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/template.yaml
deleted file mode 120000
index 7277635d23..0000000000
--- a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-820c/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../boards/template.yaml
\ No newline at end of file
diff --git a/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/base_template.yaml b/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/template-bootrr.yaml
index 7735338f33..8754e87ffe 100644
--- a/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/base_template.yaml
+++ b/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/template-bootrr.yaml
@@ -1,3 +1,19 @@
+device_type: ${LAVA_DEVICE_TYPE}
+job_name: lt-qcom-linux-integration-bootrr-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 90
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: high
+visibility: public
+
+metadata:
+  source: https://git.linaro.org/ci/job/configs.git
+  path: lt-qcom-linux-integration/lava-job-definitions/${LAVA_DEVICE_TYPE}/template-bootrr.yaml
+
 protocols:
   lava-lxc:
     name: lxc-${LAVA_DEVICE_TYPE}-test
@@ -113,3 +129,51 @@ actions:
     timeout:
       minutes: 15
     method: fastboot
+
+- test:
+    namespace: ${LAVA_DEVICE_TYPE}
+    name: qcomlt-linux-integration-smoke
+    timeout:
+      minutes: 5
+    definitions:
+    - from: inline
+      name: qcomlt-linux-integration-smoke
+      path: inline/qcomlt-linux-integration-smoke.yaml
+      repository:
+        metadata:
+          description: QCOM LT linux integration smoke
+          format: Lava-Test Test Definition 1.0
+          name: qcomlt-linux-integration-smoke 
+        run:
+          steps:
+          - uname -a
+          - df
+          - free
+          - ls -l /dev
+          - ls -l /sys
+          - ls -l /proc
+          - echo "linux_integration_smoke:" "pass"
+
+- test:
+    namespace: ${LAVA_DEVICE_TYPE}
+    name: qcomlt-linux-integration-bootrr
+    timeout:
+      minutes: 5
+    definitions:
+    - from: inline
+      name: qcomlt-linux-integration-bootrr
+      path: inline/qcomlt-linux-integration-bootrr.yaml
+      repository:
+        metadata:
+          description: QCOM LT linux integration bootrr
+          format: Lava-Test Test Definition 1.0
+          name: qcomlt-linux-integration-bootrr
+        run:
+          steps:
+          - if [ "${LAVA_DEVICE_TYPE}" == "dragonboard-410c" ]; then
+          -     qcom,apq8016-sbc
+          - elif [ "${LAVA_DEVICE_TYPE}" == "dragonboard-820c" ]; then
+          -     arrow,apq8096-db820c
+          - elif [ "${LAVA_DEVICE_TYPE}" == "sdm845-mtp" ]; then
+          -     qcom,sdm845-mtp
+          - fi
diff --git a/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/template.yaml b/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/template.yaml
deleted file mode 120000
index 7277635d23..0000000000
--- a/lt-qcom-linux-integration/lava-job-definitions/sdm845-mtp/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../boards/template.yaml
\ No newline at end of file
diff --git a/lt-qcom-linux-integration/submit_for_testing.sh b/lt-qcom-linux-integration/submit_for_testing.sh
index 5522eee3ef..6041b65275 100755
--- a/lt-qcom-linux-integration/submit_for_testing.sh
+++ b/lt-qcom-linux-integration/submit_for_testing.sh
@@ -35,8 +35,7 @@ case "${MACHINE}" in
         --qa-server-project linux-integration \
         --git-commit ${BUILD_NUMBER} \
         --template-path configs/lt-qcom-linux-integration/lava-job-definitions \
-        --template-base-pre base_template.yaml \
-        --template-names template.yaml
+        --template-names template-bootrr.yaml
     ;;
   *)
     echo "Skip LAVA_DEVICE_TYPE for ${MACHINE}"