Add testing for the Gentoo element

This commit adds testing for the gentoo element based off of the debian
element.  In adding testing support a couple of additional errors were
found and corrected, namely the following.

* shm is not in /proc/mounts though it is valid for use based off of
  the sticky flag.
* The path in ELEMENTS_PATH needs to be pruned to be usable.
* Added uuidgen-runtime to the list of packages installed for Ubuntu
  as the new ubuntu-trusty image does not ship with it.

Change-Id: I0d2768a912b350e1b2cf40d2fd227fdc767b1bcb
This commit is contained in:
Matthew Thode 2016-03-09 16:44:49 -06:00
parent 3fca968164
commit 9707cf5282
No known key found for this signature in database
GPG Key ID: 64A37BEAAE19A4E8
5 changed files with 10 additions and 5 deletions

View File

@ -58,12 +58,14 @@ function unfix_shm {
function install_gentoo_packages { function install_gentoo_packages {
RUN_ONCE_SHM='1' RUN_ONCE_SHM='1'
if ! grep -q /dev/shm /proc/mounts; then if grep -q /dev/shm /proc/mounts; then
emerge $@
elif [[ -k /dev/shm ]]; then
emerge $@
else
fix_shm fix_shm
emerge $@ emerge $@
unfix_shm unfix_shm
else
emerge $@
fi fi
} }

View File

@ -34,7 +34,7 @@ if ! [ 'x86_64' = "${ARCH}" ] ; then
fi fi
# get the element location so we can refrence things relative to it # get the element location so we can refrence things relative to it
ELEMENT_DIR=${ELEMENT_DIR:-"${ELEMENTS_PATH}/gentoo"} ELEMENT_DIR=${ELEMENT_DIR:-"${ELEMENTS_PATH##*:}/gentoo"}
# valid gentoo profiles are as follows # valid gentoo profiles are as follows
# default/linux/amd64/13.0 # default/linux/amd64/13.0
# default/linux/amd64/13.0/no-multilib # default/linux/amd64/13.0/no-multilib

View File

@ -0,0 +1 @@
Test that we can successfully build a gentoo image.

View File

@ -0,0 +1 @@
base

View File

@ -8,7 +8,8 @@ sudo apt-get install -y \
debootstrap \ debootstrap \
inetutils-ping \ inetutils-ping \
kpartx \ kpartx \
qemu-utils || \ qemu-utils \
uuid-runtime || \
sudo yum -y install \ sudo yum -y install \
debootstrap \ debootstrap \
kpartx \ kpartx \