job builder skips failed builds and templates cleanup

jobs-from-api.py:
For the expected defconfig counts to work, we need to fetch all results
including the fails and then filter them out before building jobs

device-map:
Remove NFS boots from apq8016-sbc as they just don't work

templates:
Cleanup indentation for future includes/extends

12 files changed, 179 insertions, 163 deletions

diff --git a/templates/base/kernel-ci-base-tftp-deploy.jinja2 b/templates/base/kernel-ci-base-tftp-deploy.jinja2
index 6df7e68..43b366c 100644
--- a/templates/base/kernel-ci-base-tftp-deploy.jinja2
+++ b/templates/base/kernel-ci-base-tftp-deploy.jinja2
@@ -8,30 +8,30 @@
 {% block deploy %}
 actions:
 - deploy:
-   timeout:
-     minutes: 2
-   to: tftp
-   kernel:
-       url: {{ kernel_url }}
-       type: {{ kernel_image.lower() }}
+    timeout:
+      minutes: 2
+    to: tftp
+    kernel:
+      url: {{ kernel_url }}
+      type: {{ kernel_image.lower() }}
 {%- if nfsrootfs_url %}
-   nfsrootfs:
-       url: {{ nfsrootfs_url }}
-       compression: xz
+    nfsrootfs:
+      url: {{ nfsrootfs_url }}
+      compression: xz
 {%- endif %}
 {%- if initrd_url %}
-   ramdisk:
-       url: {{ initrd_url }}
-       compression: gz
+    ramdisk:
+      url: {{ initrd_url }}
+      compression: gz
 {%- endif %}
 {%- if modules_url %}
-   modules:
-       url: {{ modules_url }}
-       compression: xz
+    modules:
+      url: {{ modules_url }}
+      compression: xz
 {%- endif %}
 {%- if dtb_url %}
-   dtb:
-       url: {{ dtb_url }}
+    dtb:
+      url: {{ dtb_url }}
 {%- endif %}
-   os: oe
+    os: oe
 {% endblock %}
diff --git a/templates/boot-be/generic-uboot-tftp-ramdisk-boot-be-template.jinja2 b/templates/boot-be/generic-uboot-tftp-ramdisk-boot-be-template.jinja2
index a5c2937..03d2999 100644
--- a/templates/boot-be/generic-uboot-tftp-ramdisk-boot-be-template.jinja2
+++ b/templates/boot-be/generic-uboot-tftp-ramdisk-boot-be-template.jinja2
@@ -10,11 +10,13 @@
 {{ super () }}
 {%- endblock %}
 
-  - boot:
-     method: u-boot
-     commands: ramdisk
-     prompts:
-       - 'linaro-test'
-       - 'root@debian:~#'
-       - '/ #'
+- boot:
+    timeout:
+      minutes: 5
+    method: u-boot
+    commands: ramdisk
+    prompts:
+      - 'linaro-test'
+      - 'root@debian:~#'
+      - '/ #'
 {% endblock %}
diff --git a/templates/boot-nfs/generic-grub-tftp-nfs-template.jinja2 b/templates/boot-nfs/generic-grub-tftp-nfs-template.jinja2
index 382f2bc..b3feaf4 100644
--- a/templates/boot-nfs/generic-grub-tftp-nfs-template.jinja2
+++ b/templates/boot-nfs/generic-grub-tftp-nfs-template.jinja2
@@ -10,11 +10,13 @@
 {{ super () }}
 {%- endblock %}
 
-  - boot:
-     method: grub
-     commands: nfs
-     prompts:
-       - 'linaro-test'
-       - 'root@debian:~#'
-       - '/ #'
+- boot:
+    timeout:
+      minutes: 5
+    method: grub
+    commands: nfs
+    prompts:
+      - 'linaro-test'
+      - 'root@debian:~#'
+      - '/ #'
 {% endblock %}
diff --git a/templates/boot-nfs/generic-ipxe-tftp-nfs-template.jinja2 b/templates/boot-nfs/generic-ipxe-tftp-nfs-template.jinja2
index 7110b34..01413f6 100644
--- a/templates/boot-nfs/generic-ipxe-tftp-nfs-template.jinja2
+++ b/templates/boot-nfs/generic-ipxe-tftp-nfs-template.jinja2
@@ -10,11 +10,13 @@
 {{ super () }}
 {%- endblock %}
 
-  - boot:
-     method: ipxe
-     commands: nfs
-     prompts:
-       - 'linaro-test'
-       - 'root@debian:~#'
-       - '/ #'
+- boot:
+    timeout:
+      minutes: 5
+    method: ipxe
+    commands: nfs
+    prompts:
+      - 'linaro-test'
+      - 'root@debian:~#'
+      - '/ #'
 {% endblock %}
diff --git a/templates/boot-nfs/generic-uboot-tftp-nfs-template.jinja2 b/templates/boot-nfs/generic-uboot-tftp-nfs-template.jinja2
index cdca1ff..d088535 100644
--- a/templates/boot-nfs/generic-uboot-tftp-nfs-template.jinja2
+++ b/templates/boot-nfs/generic-uboot-tftp-nfs-template.jinja2
@@ -10,11 +10,13 @@
 {{ super () }}
 {%- endblock %}
 
-  - boot:
-     method: u-boot
-     commands: nfs
-     prompts:
-       - 'linaro-test'
-       - 'root@debian:~#'
-       - '/ #'
+- boot:
+    timeout:
+      minutes: 5
+    method: u-boot
+    commands: nfs
+    prompts:
+      - 'linaro-test'
+      - 'root@debian:~#'
+      - '/ #'
 {% endblock %}
diff --git a/templates/boot/generic-grub-tftp-ramdisk-template.jinja2 b/templates/boot/generic-grub-tftp-ramdisk-template.jinja2
index 45e954a..0397256 100644
--- a/templates/boot/generic-grub-tftp-ramdisk-template.jinja2
+++ b/templates/boot/generic-grub-tftp-ramdisk-template.jinja2
@@ -11,10 +11,12 @@
 {%- endblock %}
 
 - boot:
-   method: grub
-   commands: ramdisk
-   prompts:
-     - 'linaro-test'
-     - 'root@debian:~#'
-     - '/ #'
+    timeout:
+      minutes: 5
+    method: grub
+    commands: ramdisk
+    prompts:
+      - 'linaro-test'
+      - 'root@debian:~#'
+      - '/ #'
 {% endblock %}
diff --git a/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2 b/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2
index 8399c11..90f1a7c 100644
--- a/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2
+++ b/templates/boot/generic-ipxe-tftp-ramdisk-template.jinja2
@@ -11,10 +11,12 @@
 {%- endblock %}
 
 - boot:
-   method: ipxe
-   commands: ramdisk
-   prompts:
-     - 'linaro-test'
-     - 'root@debian:~#'
-     - '/ #'
+    timeout:
+      minutes: 5
+    method: ipxe
+    commands: ramdisk
+    prompts:
+      - 'linaro-test'
+      - 'root@debian:~#'
+      - '/ #'
 {% endblock %}
diff --git a/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2 b/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2
index 6236b35..03d2999 100644
--- a/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2
+++ b/templates/boot/generic-uboot-tftp-ramdisk-template.jinja2
@@ -11,10 +11,12 @@
 {%- endblock %}
 
 - boot:
-   method: u-boot
-   commands: ramdisk
-   prompts:
-     - 'linaro-test'
-     - 'root@debian:~#'
-     - '/ #'
+    timeout:
+      minutes: 5
+    method: u-boot
+    commands: ramdisk
+    prompts:
+      - 'linaro-test'
+      - 'root@debian:~#'
+      - '/ #'
 {% endblock %}
diff --git a/templates/boot/qemu-generic-boot-template.jinja2 b/templates/boot/qemu-generic-boot-template.jinja2
index 7c47334..b246509 100644
--- a/templates/boot/qemu-generic-boot-template.jinja2
+++ b/templates/boot/qemu-generic-boot-template.jinja2
@@ -31,14 +31,16 @@ actions:
     to: tmpfs
     os: oe
     images:
-        kernel:
-          image_arg: '-kernel {kernel} -append "console={{ console_dev }},115200 root=/dev/ram0 debug verbose"'
-          url: {{ kernel_url }}
-        ramdisk:
-          image_arg: '-initrd {ramdisk}'
-          url: {{ initrd_url }}
+      kernel:
+        image_arg: '-kernel {kernel} -append "console={{ console_dev }},115200 root=/dev/ram0 debug verbose"'
+        url: {{ kernel_url }}
+      ramdisk:
+        image_arg: '-initrd {ramdisk}'
+        url: {{ initrd_url }}
 
 - boot:
+    timeout:
+      minutes: 5
     method: qemu
     media: tmpfs
     prompts:
diff --git a/templates/kselftest/generic-grub-tftp-ramdisk-kselftest-template.jinja2 b/templates/kselftest/generic-grub-tftp-ramdisk-kselftest-template.jinja2
index 56970c0..87fed7b 100644
--- a/templates/kselftest/generic-grub-tftp-ramdisk-kselftest-template.jinja2
+++ b/templates/kselftest/generic-grub-tftp-ramdisk-kselftest-template.jinja2
@@ -2,36 +2,36 @@
 {% block actions %}
 {{ super () }}
 
-  - test:
-      timeout:
-        minutes: 10
-      definitions:
-      - repository:
-          metadata:
-            format: Lava-Test Test Definition 1.0
-            name: kselftest
-            description: "kselftest"
-            os:
-            - debian
-            scope:
-            - functional
-          parse:
-            pattern: "^selftests:\\s(?P<test_case_id>\\S+)\\s[[](?P<result>(FAIL|PASS|SKIP))[]]"
-            fixupdict:
-              PASS: pass
-              FAIL: fail
-              SKIP: skip
-          run:
-            steps:
-            - rm -f /etc/resolv.conf
-            - udhcpc
-            - wget http://storage.kernelci.org/images/selftests/{{ arch }}/kselftest.tar.gz
-            - gunzip kselftest.tar.gz
-            - tar xvf kselftest.tar
-            - cd kselftest
-            - ./run_kselftest.sh
-        from: inline
-        name: kselftest
-        path: inline/kselftest.yaml
+- test:
+    timeout:
+      minutes: 10
+    definitions:
+    - repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: kselftest
+          description: "kselftest"
+          os:
+          - debian
+          scope:
+          - functional
+        parse:
+          pattern: "^selftests:\\s(?P<test_case_id>\\S+)\\s[[](?P<result>(FAIL|PASS|SKIP))[]]"
+          fixupdict:
+            PASS: pass
+            FAIL: fail
+            SKIP: skip
+        run:
+          steps:
+          - rm -f /etc/resolv.conf
+          - udhcpc
+          - wget http://storage.kernelci.org/images/selftests/{{ arch }}/kselftest.tar.gz
+          - gunzip kselftest.tar.gz
+          - tar xvf kselftest.tar
+          - cd kselftest
+          - ./run_kselftest.sh
+      from: inline
+      name: kselftest
+      path: inline/kselftest.yaml
 
 {% endblock %}
diff --git a/templates/kselftest/generic-ipxe-tftp-ramdisk-kselftest-template.jinja2 b/templates/kselftest/generic-ipxe-tftp-ramdisk-kselftest-template.jinja2
index c36f167..c1f47e6 100644
--- a/templates/kselftest/generic-ipxe-tftp-ramdisk-kselftest-template.jinja2
+++ b/templates/kselftest/generic-ipxe-tftp-ramdisk-kselftest-template.jinja2
@@ -2,36 +2,36 @@
 {% block actions %}
 {{ super () }}
 
-  - test:
-      timeout:
-        minutes: 10
-      definitions:
-      - repository:
-          metadata:
-            format: Lava-Test Test Definition 1.0
-            name: kselftest
-            description: "kselftest"
-            os:
-            - debian
-            scope:
-            - functional
-          parse:
-            pattern: "^selftests:\\s(?P<test_case_id>\\S+)\\s[[](?P<result>(FAIL|PASS|SKIP))[]]"
-            fixupdict:
-              PASS: pass
-              FAIL: fail
-              SKIP: skip
-          run:
-            steps:
-            - rm -f /etc/resolv.conf
-            - udhcpc
-            - wget http://storage.kernelci.org/images/selftests/{{ arch }}/kselftest.tar.gz
-            - gunzip kselftest.tar.gz
-            - tar xvf kselftest.tar
-            - cd kselftest
-            - ./run_kselftest.sh
-        from: inline
-        name: kselftest
-        path: inline/kselftest.yaml
+- test:
+    timeout:
+      minutes: 10
+    definitions:
+    - repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: kselftest
+          description: "kselftest"
+          os:
+          - debian
+          scope:
+          - functional
+        parse:
+          pattern: "^selftests:\\s(?P<test_case_id>\\S+)\\s[[](?P<result>(FAIL|PASS|SKIP))[]]"
+          fixupdict:
+            PASS: pass
+            FAIL: fail
+            SKIP: skip
+        run:
+          steps:
+          - rm -f /etc/resolv.conf
+          - udhcpc
+          - wget http://storage.kernelci.org/images/selftests/{{ arch }}/kselftest.tar.gz
+          - gunzip kselftest.tar.gz
+          - tar xvf kselftest.tar
+          - cd kselftest
+          - ./run_kselftest.sh
+      from: inline
+      name: kselftest
+      path: inline/kselftest.yaml
 
 {% endblock %}
diff --git a/templates/kselftest/generic-uboot-tftp-ramdisk-kselftest-template.jinja2 b/templates/kselftest/generic-uboot-tftp-ramdisk-kselftest-template.jinja2
index d89cee4..e8eb063 100644
--- a/templates/kselftest/generic-uboot-tftp-ramdisk-kselftest-template.jinja2
+++ b/templates/kselftest/generic-uboot-tftp-ramdisk-kselftest-template.jinja2
@@ -2,36 +2,36 @@
 {% block actions %}
 {{ super () }}
 
-  - test:
-      timeout:
-        minutes: 10
-      definitions:
-      - repository:
-          metadata:
-            format: Lava-Test Test Definition 1.0
-            name: kselftest
-            description: "kselftest"
-            os:
-            - debian
-            scope:
-            - functional
-          parse:
-            pattern: "^selftests:\\s(?P<test_case_id>\\S+)\\s[[](?P<result>(FAIL|PASS|SKIP))[]]"
-            fixupdict:
-              PASS: pass
-              FAIL: fail
-              SKIP: skip
-          run:
-            steps:
-            - rm -f /etc/resolv.conf
-            - udhcpc
-            - wget http://storage.kernelci.org/images/selftests/{{ arch }}/kselftest.tar.gz
-            - gunzip kselftest.tar.gz
-            - tar xvf kselftest.tar
-            - cd kselftest
-            - ./run_kselftest.sh
-        from: inline
-        name: kselftest
-        path: inline/kselftest.yaml
+- test:
+    timeout:
+      minutes: 10
+    definitions:
+    - repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: kselftest
+          description: "kselftest"
+          os:
+          - debian
+          scope:
+          - functional
+        parse:
+          pattern: "^selftests:\\s(?P<test_case_id>\\S+)\\s[[](?P<result>(FAIL|PASS|SKIP))[]]"
+          fixupdict:
+            PASS: pass
+            FAIL: fail
+            SKIP: skip
+        run:
+          steps:
+          - rm -f /etc/resolv.conf
+          - udhcpc
+          - wget http://storage.kernelci.org/images/selftests/{{ arch }}/kselftest.tar.gz
+          - gunzip kselftest.tar.gz
+          - tar xvf kselftest.tar
+          - cd kselftest
+          - ./run_kselftest.sh
+      from: inline
+      name: kselftest
+      path: inline/kselftest.yaml
 
 {% endblock %}