JeOS stands for "Just enough Operating System",
and it's very popular on today's cloud talk.

In order to provide a standard minimal guest
for use in virt tests, that can be easily
downloaded and built, we used the project
buildroot (http://buildroot.uclibc.org/) to
produce a set of images and kernels. Add these
images and kernels to the sample virt test
configuration files. Next step is to make
them the default images to be used on virt
tests.

Signed-off-by: Lucas Meneghel Rodrigues <[email protected]>
Signed-off-by: Cleber Rosa <[email protected]>
---
 client/tests/kvm/tests-shared.cfg.sample |    2 +
 client/tests/kvm/tests.cfg.sample        |   32 ++++++++++++++++++++++++++++++
 client/virt/guest-hw.cfg.sample          |    5 ++++
 client/virt/guest-os.cfg.sample          |   17 +++++++++++++++
 4 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/client/tests/kvm/tests-shared.cfg.sample 
b/client/tests/kvm/tests-shared.cfg.sample
index 9de3b93..8fc07e4 100644
--- a/client/tests/kvm/tests-shared.cfg.sample
+++ b/client/tests/kvm/tests-shared.cfg.sample
@@ -33,6 +33,8 @@ floppy ?<= /tmp/kvm_autotest_root/
 Linux..unattended_install:
     kernel ?<= /tmp/kvm_autotest_root/
     initrd ?<= /tmp/kvm_autotest_root/
+Linux..JeOS:
+    kernel ?<= /tmp/kvm_autotest_root/
 
 # You may provide information about the DTM server for WHQL tests here:
 #whql:
diff --git a/client/tests/kvm/tests.cfg.sample 
b/client/tests/kvm/tests.cfg.sample
index c91a58b..f364331 100644
--- a/client/tests/kvm/tests.cfg.sample
+++ b/client/tests/kvm/tests.cfg.sample
@@ -128,5 +128,37 @@ variants:
         only CustomGuestLinux
         only migrate
 
+    - @qemu_arm_jeos:
+        mem = 256
+        nic_mode = user
+        qemu_binary = /usr/bin/qemu-system-arm
+        qemu_img_binary = /usr/bin/qemu-img
+        qemu_io_binary = /usr/bin/qemu-io
+        only buildroot
+        only smc91c111
+        only scsi
+        only up
+        only no_9p_export
+        only no_pci_assignable
+        only smallpages
+        only JeOS.arm
+        only boot, shutdown
+
+    - @qemu_intel_32_jeos:
+        mem = 256
+        nic_mode = user
+        qemu_binary = /usr/bin/qemu-kvm
+        qemu_img_binary = /usr/bin/qemu-img
+        qemu_io_binary = /usr/bin/qemu-io
+        only buildroot
+        only rtl8139
+        only ide
+        only up
+        only no_9p_export
+        only no_pci_assignable
+        only smallpages
+        only JeOS.intel_32
+        only boot, shutdown
+
 # Choose your test list from the testsets defined
 only qemu_kvm_f16_quick
diff --git a/client/virt/guest-hw.cfg.sample b/client/virt/guest-hw.cfg.sample
index f63bb20..203487c 100644
--- a/client/virt/guest-hw.cfg.sample
+++ b/client/virt/guest-hw.cfg.sample
@@ -36,6 +36,8 @@ variants:
             # Device selection for the NDISTest server machine
             dp_regex_servermsgdev = VirtIO Ethernet Adapter$
             dp_regex_serversupportdev = VirtIO Ethernet Adapter #2$
+    - smc91c111:
+        nic_model = smc91c111
     -xennet:
         # placeholder
 
@@ -81,6 +83,9 @@ variants:
     - qed:
         no ioquit
         image_format = qed
+    # Buildroot images have to be used as is
+    - buildroot:
+        image_format =
 
 variants:
     - @no_pci_assignable:
diff --git a/client/virt/guest-os.cfg.sample b/client/virt/guest-os.cfg.sample
index 5a9b30f..439b2a0 100644
--- a/client/virt/guest-os.cfg.sample
+++ b/client/virt/guest-os.cfg.sample
@@ -99,6 +99,23 @@ variants:
                 #image_name = /dev/mapper/vg_some_label
                 #image_type_raw = yes
 
+            - JeOS:
+                username = default
+                password = default
+                usbs =
+                usb(_.*)? ?= ""
+                shell_prompt = "$"
+                variants:
+                    - intel_32:
+                        kernel = images/jeos_x86_32/bzImage
+                        image_name = jeos_x86_32/rootfs.ext2
+                        kernel_params += ' root=/dev/sda console=tty0 
console=ttyS0,115200'
+                    - arm:
+                        kernel = images/jeos_arm/zImage
+                        image_name = jeos_arm/rootfs.ext2
+                        kernel_params += ' root=/dev/sda console=tty0 
console=ttyAMA0,115200'
+                        extra_params += ' -M versatilepb'
+
             - Fedora:
                 no setup
                 shell_prompt = "^\[.*\][\#\$]\s*$"
-- 
1.7.7.6

_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Reply via email to