sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add testing for the Gentoo element"

Browse source
This commit is contained in:
Jenkins 2016-03-21 07:59:55 +00:00 committed by Gerrit Code Review
commit ac94cf2a4e
5 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
elements/gentoo/bin/install-packages
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
} }

2
elements/gentoo/root.d/10-gentoo-image
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

1
elements/gentoo/test-elements/build-succeeds/README.rst Normal file
View file

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

1
elements/gentoo/test-elements/build-succeeds/element-deps Normal file
View file

@ -0,0 +1 @@
base

3
tests/install_test_deps.sh
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 \