Fix docker builds (#9805)

* move docker test logic to share/spack/qa
* update Dockerfile for archlinux

.travis.yml

@@ -202,28 +202,6 @@ services:
 
 script:
   - 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:
   - ccache -s

share/spack/docker/Dockerfile

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

share/spack/qa/run-docker-tests

+#!/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