hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix docker builds (#9805)

Browse source 
* move docker test logic to share/spack/qa
* update Dockerfile for archlinux
This commit is contained in:
Omar Padron 2018-12-20 14:17:46 -05:00 committed by Todd Gamblin
parent 56cb691fcc
commit 60298787e4
3 changed files with 67 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.travis.yml
View file

@ -202,28 +202,6 @@ services:
script: script:
- share/spack/qa/run-$TEST_SUITE-tests - share/spack/qa/run-$TEST_SUITE-tests
- if [[ "$TEST_SUITE" == "docker build" ]]; then
login_attempted=0; login_success=0;
for config in share/spack/docker/config/* ; do
source "$config" ;
./share/spack/docker/build-image.sh;
if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then
if [ "$login_attempted" '=' '0' ]; then
if echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; then
login_success=1;
fi;
login_attempted=1;
fi;
if [ "$login_success" '=' '1' ]; then
./share/spack/docker/push-image.sh;
fi
fi
done;
fi
- if [[ "$TEST_SUITE" == "unit" || "$TEST_SUITE" == "build" ]]; then
codecov --env PYTHON_VERSION
--required --flags "${TEST_SUITE}${TRAVIS_OS_NAME}";
fi
after_success: after_success:
- ccache -s - ccache -s

22
share/spack/docker/Dockerfile
View file

@ -32,15 +32,27 @@ RUN pacman -Sy --noconfirm \
sudo tcl \ sudo tcl \
&& echo 'nobody ALL=(ALL) NOPASSWD: ALL' > \ && echo 'nobody ALL=(ALL) NOPASSWD: ALL' > \
/etc/sudoers.d/nobody-sudo \ /etc/sudoers.d/nobody-sudo \
&& sudo -u nobody git clone --depth 1 \ && sudo -u nobody git clone \
https://aur.archlinux.org/lua-posix.git /tmp/lua-posix \ 'https://aur.archlinux.org/lua-std-_debug.git' \
&& sudo -u nobody git clone --depth 1 \ '/tmp/lua-std-_debug' \
https://aur.archlinux.org/lmod.git /tmp/lmod \ && sudo -u nobody git clone \
'https://aur.archlinux.org/lua-std-normalize.git' \
'/tmp/lua-std-normalize' \
&& sudo -u nobody git clone \
'https://aur.archlinux.org/lua-posix.git' \
'/tmp/lua-posix' \
&& ( cd /tmp/lua-std-_debug \
&& sudo -u nobody makepkg -si --asdeps --noconfirm ) \
&& ( cd /tmp/lua-std-normalize \
&& sudo -u nobody makepkg -si --asdeps --noconfirm ) \
&& ( cd /tmp/lua-posix \ && ( cd /tmp/lua-posix \
&& sudo -u nobody makepkg -si --asdeps --noconfirm ) \ && sudo -u nobody makepkg -si --asdeps --noconfirm ) \
&& sudo -u nobody git clone \
'https://aur.archlinux.org/lmod.git' '/tmp/lmod' \
&& ( cd /tmp/lmod \ && ( cd /tmp/lmod \
&& sudo -u nobody makepkg -si --noconfirm ) \ && sudo -u nobody makepkg -si --noconfirm ) \
&& rm -rf /tmp/lua-posix /tmp/lmod /etc/sudoers.d/nobody-sudo && rm -rf /tmp/lua-std-_debug /tmp/lua-std-normalize \
/tmp/lmod /etc/sudoers.d/nobody-sudo
MASK [[ $DISTRO =~ (centos|rhel.*) ]] MASK [[ $DISTRO =~ (centos|rhel.*) ]]
RUN yum update -y RUN yum update -y

48
share/spack/qa/run-docker-tests Executable file
View file

@ -0,0 +1,48 @@
#!/bin/bash -e
#
# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
#
# Description:
# Runs Spack docker tests. This builds a docker image for each of the
# configurations in share/spack/docker/config.
#
# Usage:
# run-docker-tests
#
__login_attempted=0
__login_success=1
ensure_docker_login() {
if [ "$__login_attempted" '!=' '0' ] ; then
return $__login_success
fi
echo "$DOCKER_PASSWORD" | \
docker login -u "$DOCKER_USERNAME" --password-stdin
if [ $? '=' '0' ] ; then
__login_success=0
fi
__login_attempted=1
return $__login_success
}
for config in share/spack/docker/config/* ; do
source "$config" ;
./share/spack/docker/build-image.sh;
done
if [ "$TEST_SUITE" '=' "docker build" -a \
"$TRAVIS_EVENT_TYPE" != "pull_request" -a \
ensure_docker_login ] ; then
for config in share/spack/docker/config/* ; do
source "$config"
./share/spack/docker/push-image.sh
done
fi