From b01478d14065593fb5c5bee1ffda91dde5bb59f0 Mon Sep 17 00:00:00 2001
From: Tyler Baker <tyler.baker@linaro.org>
Date: Mon, 20 Apr 2015 10:35:16 -0700
Subject: kernel-ci: modules -> overlays

---
 templates/boot-kvm/generic-arm64-boot-kvm-template.json                 | 2 +-
 templates/boot/generic-arm-dtb-kernel-ci-boot-template.json             | 2 +-
 templates/boot/generic-arm-kernel-ci-boot-template.json                 | 2 +-
 templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json           | 2 +-
 templates/boot/generic-arm64-kernel-ci-boot-template.json               | 2 +-
 templates/boot/generic-x86-kernel-ci-boot-template.json                 | 2 +-
 templates/boot/ifc6410-arm-dtb-kernel-ci-boot-template.json             | 2 +-
 templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json              | 2 +-
 .../generic-arm-dtb-kernel-ci-cpufreq-ljt-stress-test-template.json     | 1 +
 templates/kselftest/generic-arm-dtb-kernel-ci-kselftest-template.json   | 2 +-
 templates/ltp-mm/generic-arm-dtb-kernel-ci-ltp-mm-template.json         | 1 +
 templates/ltp-mm/generic-arm64-uboot-dtb-kernel-ci-ltp-mm-template.json | 1 +
 templates/ltp-mm/juno-arm64-dtb-kernel-ci-ltp-mm-template.json          | 1 +
 .../ltp-syscalls/generic-arm-dtb-kernel-ci-ltp-syscalls-template.json   | 1 +
 .../generic-arm64-uboot-dtb-kernel-ci-ltp-syscalls-template.json        | 1 +
 .../ltp-syscalls/juno-arm64-dtb-kernel-ci-ltp-syscalls-template.json    | 1 +
 16 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/templates/boot-kvm/generic-arm64-boot-kvm-template.json b/templates/boot-kvm/generic-arm64-boot-kvm-template.json
index dc7a221..c320129 100644
--- a/templates/boot-kvm/generic-arm64-boot-kvm-template.json
+++ b/templates/boot-kvm/generic-arm64-boot-kvm-template.json
@@ -38,7 +38,7 @@
         {
             "dtb": "{dtb_url}",
             "kernel": "{kernel_url}",
-            "modules": "{modules_url}",
+            "overlays": ["{modules_url}"],
             "nfsrootfs": "http://releases.linaro.org/15.03/ubuntu/utopic-images/nano-arm64/linaro-utopic-nano-20150309-90.tar.gz",
             "target_type": "ubuntu",
             "role": "host"
diff --git a/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json b/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json
index 3bfaa7a..827bfe3 100644
--- a/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json
@@ -16,7 +16,7 @@
             "parameters": {
                 "dtb": "{dtb_url}",
                 "kernel": "{kernel_url}",
-                "modules": "{modules_url}",
+                "overlays": ["{modules_url}"],
                 "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/armel/rootfs.cpio.gz"
             }
         },
diff --git a/templates/boot/generic-arm-kernel-ci-boot-template.json b/templates/boot/generic-arm-kernel-ci-boot-template.json
index 749bcf4..e766db9 100644
--- a/templates/boot/generic-arm-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm-kernel-ci-boot-template.json
@@ -14,7 +14,7 @@
             },
             "parameters": {
                 "kernel": "{kernel_url}",
-                "modules": "{modules_url}",
+                "overlays": ["{modules_url}"],
                 "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/armel/rootfs.cpio.gz"
             }
         },
diff --git a/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json b/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json
index 74c5684..c36b429 100644
--- a/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json
@@ -16,7 +16,7 @@
             "parameters": {
                 "dtb": "{dtb_url}",
                 "kernel": "{kernel_url}",
-                "modules": "{modules_url}",
+                "overlays": ["{modules_url}"],
                 "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/rootfs.cpio.gz"
             }
         },
diff --git a/templates/boot/generic-arm64-kernel-ci-boot-template.json b/templates/boot/generic-arm64-kernel-ci-boot-template.json
index d27374d..9f2ee2c 100644
--- a/templates/boot/generic-arm64-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm64-kernel-ci-boot-template.json
@@ -14,7 +14,7 @@
             },
             "parameters": {
                 "kernel": "{kernel_url}",
-                "modules": "{modules_url}",
+                "overlays": ["{modules_url}"],
                 "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/rootfs.cpio.gz"
             }
         },
diff --git a/templates/boot/generic-x86-kernel-ci-boot-template.json b/templates/boot/generic-x86-kernel-ci-boot-template.json
index fe824a8..f7eaab0 100644
--- a/templates/boot/generic-x86-kernel-ci-boot-template.json
+++ b/templates/boot/generic-x86-kernel-ci-boot-template.json
@@ -15,7 +15,7 @@
             "parameters": {
                 "bootloadertype": "ipxe",
                 "kernel": "{kernel_url}",
-                "modules": "{modules_url}",
+                "overlays": ["{modules_url}"],
                 "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/x86/rootfs.cpio.gz"
             }
         },
diff --git a/templates/boot/ifc6410-arm-dtb-kernel-ci-boot-template.json b/templates/boot/ifc6410-arm-dtb-kernel-ci-boot-template.json
index fb1ff64..bb22f8c 100644
--- a/templates/boot/ifc6410-arm-dtb-kernel-ci-boot-template.json
+++ b/templates/boot/ifc6410-arm-dtb-kernel-ci-boot-template.json
@@ -16,7 +16,7 @@
             "parameters": {
                 "dtb": "{dtb_url}",
                 "kernel": "{kernel_url}",
-                "modules": "{modules_url}",
+                "overlays": ["{modules_url}"],
                 "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/armel/rootfs.cpio.gz"
             }
         },
diff --git a/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json b/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json
index 34eb886..2e51a38 100644
--- a/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json
+++ b/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json
@@ -16,7 +16,7 @@
             "parameters": {
                 "dtb": "{dtb_url}",
                 "kernel": "{kernel_url}",
-                "modules": "{modules_url}",
+                "overlays": ["{modules_url}"],
                 "nfsrootfs": "http://releases.linaro.org/15.01/openembedded/aarch64/linaro-image-minimal-genericarmv8-20150123-736.rootfs.tar.gz"
             }
         },
diff --git a/templates/cpufreq-ljt-stress-test/generic-arm-dtb-kernel-ci-cpufreq-ljt-stress-test-template.json b/templates/cpufreq-ljt-stress-test/generic-arm-dtb-kernel-ci-cpufreq-ljt-stress-test-template.json
index 92902fe..fdc1cf4 100644
--- a/templates/cpufreq-ljt-stress-test/generic-arm-dtb-kernel-ci-cpufreq-ljt-stress-test-template.json
+++ b/templates/cpufreq-ljt-stress-test/generic-arm-dtb-kernel-ci-cpufreq-ljt-stress-test-template.json
@@ -20,6 +20,7 @@
             "parameters": {
                 "dtb": "{dtb_url}",
                 "kernel": "{kernel_url}",
+                "overlays": ["{modules_url}"],
                 "nfsrootfs": "http://releases.linaro.org/15.03/ubuntu/utopic-images/nano/linaro-utopic-nano-20150319-701.tar.gz",
                 "target_type": "ubuntu"
             }
diff --git a/templates/kselftest/generic-arm-dtb-kernel-ci-kselftest-template.json b/templates/kselftest/generic-arm-dtb-kernel-ci-kselftest-template.json
index 68486dd..a938fab 100644
--- a/templates/kselftest/generic-arm-dtb-kernel-ci-kselftest-template.json
+++ b/templates/kselftest/generic-arm-dtb-kernel-ci-kselftest-template.json
@@ -19,7 +19,7 @@
             },
             "parameters": {
                 "dtb": "{dtb_url}",
-                "modules": "{modules_url}",
+                "overlays": ["{modules_url}"],
                 "kernel": "{kernel_url}",
                 "nfsrootfs": "http://releases.linaro.org/15.03/ubuntu/utopic-images/nano/linaro-utopic-nano-20150319-701.tar.gz",
                 "target_type": "ubuntu"
diff --git a/templates/ltp-mm/generic-arm-dtb-kernel-ci-ltp-mm-template.json b/templates/ltp-mm/generic-arm-dtb-kernel-ci-ltp-mm-template.json
index 3fa1aa3..cd48394 100644
--- a/templates/ltp-mm/generic-arm-dtb-kernel-ci-ltp-mm-template.json
+++ b/templates/ltp-mm/generic-arm-dtb-kernel-ci-ltp-mm-template.json
@@ -20,6 +20,7 @@
             "parameters": {
                 "dtb": "{dtb_url}",
                 "kernel": "{kernel_url}",
+                "overlays": ["{modules_url}"],
                 "nfsrootfs": "http://releases.linaro.org/15.02/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150222-322.rootfs.tar.gz"
             }
         },
diff --git a/templates/ltp-mm/generic-arm64-uboot-dtb-kernel-ci-ltp-mm-template.json b/templates/ltp-mm/generic-arm64-uboot-dtb-kernel-ci-ltp-mm-template.json
index 938adf7..f02754f 100644
--- a/templates/ltp-mm/generic-arm64-uboot-dtb-kernel-ci-ltp-mm-template.json
+++ b/templates/ltp-mm/generic-arm64-uboot-dtb-kernel-ci-ltp-mm-template.json
@@ -20,6 +20,7 @@
             "parameters": {
                 "dtb": "{dtb_url}",
                 "kernel": "{kernel_url}",
+                "overlays": ["{modules_url}"],
                 "nfsrootfs": "http://releases.linaro.org/15.02/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150222-741.rootfs.tar.gz"
             }
         },
diff --git a/templates/ltp-mm/juno-arm64-dtb-kernel-ci-ltp-mm-template.json b/templates/ltp-mm/juno-arm64-dtb-kernel-ci-ltp-mm-template.json
index 938adf7..f02754f 100644
--- a/templates/ltp-mm/juno-arm64-dtb-kernel-ci-ltp-mm-template.json
+++ b/templates/ltp-mm/juno-arm64-dtb-kernel-ci-ltp-mm-template.json
@@ -20,6 +20,7 @@
             "parameters": {
                 "dtb": "{dtb_url}",
                 "kernel": "{kernel_url}",
+                "overlays": ["{modules_url}"],
                 "nfsrootfs": "http://releases.linaro.org/15.02/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150222-741.rootfs.tar.gz"
             }
         },
diff --git a/templates/ltp-syscalls/generic-arm-dtb-kernel-ci-ltp-syscalls-template.json b/templates/ltp-syscalls/generic-arm-dtb-kernel-ci-ltp-syscalls-template.json
index 47b80d7..46fb23f 100644
--- a/templates/ltp-syscalls/generic-arm-dtb-kernel-ci-ltp-syscalls-template.json
+++ b/templates/ltp-syscalls/generic-arm-dtb-kernel-ci-ltp-syscalls-template.json
@@ -20,6 +20,7 @@
             "parameters": {
                 "dtb": "{dtb_url}",
                 "kernel": "{kernel_url}",
+                "overlays": ["{modules_url}"],
                 "nfsrootfs": "http://releases.linaro.org/15.02/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150222-322.rootfs.tar.gz"
             }
         },
diff --git a/templates/ltp-syscalls/generic-arm64-uboot-dtb-kernel-ci-ltp-syscalls-template.json b/templates/ltp-syscalls/generic-arm64-uboot-dtb-kernel-ci-ltp-syscalls-template.json
index 15bb31b..735f3ef 100644
--- a/templates/ltp-syscalls/generic-arm64-uboot-dtb-kernel-ci-ltp-syscalls-template.json
+++ b/templates/ltp-syscalls/generic-arm64-uboot-dtb-kernel-ci-ltp-syscalls-template.json
@@ -20,6 +20,7 @@
             "parameters": {
                 "dtb": "{dtb_url}",
                 "kernel": "{kernel_url}",
+                "overlays": ["{modules_url}"],
                 "nfsrootfs": "http://releases.linaro.org/15.02/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150222-741.rootfs.tar.gz"
             }
         },
diff --git a/templates/ltp-syscalls/juno-arm64-dtb-kernel-ci-ltp-syscalls-template.json b/templates/ltp-syscalls/juno-arm64-dtb-kernel-ci-ltp-syscalls-template.json
index 15bb31b..735f3ef 100644
--- a/templates/ltp-syscalls/juno-arm64-dtb-kernel-ci-ltp-syscalls-template.json
+++ b/templates/ltp-syscalls/juno-arm64-dtb-kernel-ci-ltp-syscalls-template.json
@@ -20,6 +20,7 @@
             "parameters": {
                 "dtb": "{dtb_url}",
                 "kernel": "{kernel_url}",
+                "overlays": ["{modules_url}"],
                 "nfsrootfs": "http://releases.linaro.org/15.02/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150222-741.rootfs.tar.gz"
             }
         },
-- 
cgit v1.2.3