Fix lxc templates

[Bug/Feature]   Tests was failing on some images
[Cause]         N/A
[Solution]      N/A
[Verification]  Build, install, run tests

Change-Id: I9b2029539a4c5567b6eaed178ef1df2b7dce3c44

diff --git a/tests/unit_tests/lxc/templates/minimal-dbus1.sh b/tests/unit_tests/lxc/templates/minimal-dbus1.sh
index 35f816f..ff1f2de 100755 (executable)
--- a/tests/unit_tests/lxc/templates/minimal-dbus1.sh
+++ b/tests/unit_tests/lxc/templates/minimal-dbus1.sh
@@ -23,6 +23,7 @@ done
 ROOTFS_DIRS="\
 ${rootfs}/bin \
 ${rootfs}/dev \
+${rootfs}/dev/pts \
 ${rootfs}/etc \
 ${rootfs}/home \
 ${rootfs}/lib \
@@ -34,6 +35,7 @@ ${rootfs}/sbin \
 ${rootfs}/sys \
 ${rootfs}/tmp \
 ${rootfs}/usr \
+${rootfs}/opt \
 ${rootfs}/var \
 ${rootfs}/var/run
 "
@@ -62,6 +64,7 @@ lxc.mount.entry = /etc etc none ro,bind 0 0
 lxc.mount.entry = /lib lib none ro,bind 0 0
 lxc.mount.entry = /sbin sbin none ro,bind 0 0
 lxc.mount.entry = /usr usr none ro,rbind 0 0
+lxc.mount.entry = /opt opt none ro,rbind 0 0
 lxc.mount.entry = /tmp/ut-run1 var/run none rw,bind 0 0
 EOF
 

diff --git a/tests/unit_tests/lxc/templates/minimal-dbus2.sh b/tests/unit_tests/lxc/templates/minimal-dbus2.sh
index f8f963e..86984b7 100755 (executable)
--- a/tests/unit_tests/lxc/templates/minimal-dbus2.sh
+++ b/tests/unit_tests/lxc/templates/minimal-dbus2.sh
@@ -23,6 +23,7 @@ done
 ROOTFS_DIRS="\
 ${rootfs}/bin \
 ${rootfs}/dev \
+${rootfs}/dev/pts \
 ${rootfs}/etc \
 ${rootfs}/home \
 ${rootfs}/lib \
@@ -34,6 +35,7 @@ ${rootfs}/sbin \
 ${rootfs}/sys \
 ${rootfs}/tmp \
 ${rootfs}/usr \
+${rootfs}/opt \
 ${rootfs}/var \
 ${rootfs}/var/run
 "
@@ -62,6 +64,7 @@ lxc.mount.entry = /etc etc none ro,bind 0 0
 lxc.mount.entry = /lib lib none ro,bind 0 0
 lxc.mount.entry = /sbin sbin none ro,bind 0 0
 lxc.mount.entry = /usr usr none ro,rbind 0 0
+lxc.mount.entry = /opt opt none ro,rbind 0 0
 lxc.mount.entry = /tmp/ut-run2 var/run none rw,bind 0 0
 EOF
 

diff --git a/tests/unit_tests/lxc/templates/minimal-dbus3.sh b/tests/unit_tests/lxc/templates/minimal-dbus3.sh
index 68f4f11..034b4fd 100755 (executable)
--- a/tests/unit_tests/lxc/templates/minimal-dbus3.sh
+++ b/tests/unit_tests/lxc/templates/minimal-dbus3.sh
@@ -23,6 +23,7 @@ done
 ROOTFS_DIRS="\
 ${rootfs}/bin \
 ${rootfs}/dev \
+${rootfs}/dev/pts \
 ${rootfs}/etc \
 ${rootfs}/home \
 ${rootfs}/lib \
@@ -34,6 +35,7 @@ ${rootfs}/sbin \
 ${rootfs}/sys \
 ${rootfs}/tmp \
 ${rootfs}/usr \
+${rootfs}/opt \
 ${rootfs}/var \
 ${rootfs}/var/run
 "
@@ -62,6 +64,7 @@ lxc.mount.entry = /etc etc none ro,bind 0 0
 lxc.mount.entry = /lib lib none ro,bind 0 0
 lxc.mount.entry = /sbin sbin none ro,bind 0 0
 lxc.mount.entry = /usr usr none ro,rbind 0 0
+lxc.mount.entry = /opt opt none ro,rbind 0 0
 lxc.mount.entry = /tmp/ut-run3 var/run none rw,bind 0 0
 EOF
 

diff --git a/tests/unit_tests/lxc/templates/minimal.sh b/tests/unit_tests/lxc/templates/minimal.sh
index 547661e..873277e 100755 (executable)
--- a/tests/unit_tests/lxc/templates/minimal.sh
+++ b/tests/unit_tests/lxc/templates/minimal.sh
@@ -23,6 +23,7 @@ done
 ROOTFS_DIRS="\
 ${rootfs}/bin \
 ${rootfs}/dev \
+${rootfs}/dev/pts \
 ${rootfs}/etc \
 ${rootfs}/home \
 ${rootfs}/lib \
@@ -33,7 +34,8 @@ ${rootfs}/run \
 ${rootfs}/sbin \
 ${rootfs}/sys \
 ${rootfs}/tmp \
-${rootfs}/usr
+${rootfs}/usr \
+${rootfs}/opt
 "
 /bin/mkdir ${ROOTFS_DIRS}
 
@@ -52,6 +54,9 @@ lxc.haltsignal = SIGTERM
 lxc.pts = 256
 lxc.tty = 0
 
+#lxc.loglevel = TRACE
+#lxc.logfile = /tmp/${name}.log
+
 lxc.cgroup.devices.deny = a
 
 lxc.mount.auto = proc sys cgroup
@@ -60,6 +65,7 @@ lxc.mount.entry = /etc etc none ro,bind 0 0
 lxc.mount.entry = /lib lib none ro,bind 0 0
 lxc.mount.entry = /sbin sbin none ro,bind 0 0
 lxc.mount.entry = /usr usr none ro,rbind 0 0
+lxc.mount.entry = /opt opt none ro,rbind 0 0
 EOF
 
 if [ "$(uname -m)" = "x86_64" ]; then