summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorOmar Padron <omar.padron@kitware.com>2019-01-24 13:08:38 -0500
committerTodd Gamblin <tgamblin@llnl.gov>2019-01-24 10:08:38 -0800
commit7d64994cbd4e0f45cea0106bfae4032007f4ad4d (patch)
tree7aaef962199cba287a90e2bbb4c2fe91eede2138 /share
parent7d12ff6e16bf0414143c984d0ba936884dee9229 (diff)
downloadspack-7d64994cbd4e0f45cea0106bfae4032007f4ad4d.tar.gz
spack-7d64994cbd4e0f45cea0106bfae4032007f4ad4d.tar.bz2
spack-7d64994cbd4e0f45cea0106bfae4032007f4ad4d.tar.xz
spack-7d64994cbd4e0f45cea0106bfae4032007f4ad4d.zip
fix issue where docker images were being pushed without login (#10379)
Diffstat (limited to 'share')
-rwxr-xr-xshare/spack/qa/run-docker-tests4
1 files changed, 1 insertions, 3 deletions
diff --git a/share/spack/qa/run-docker-tests b/share/spack/qa/run-docker-tests
index 398889be26..8613c7e728 100755
--- a/share/spack/qa/run-docker-tests
+++ b/share/spack/qa/run-docker-tests
@@ -38,9 +38,7 @@ for config in share/spack/docker/config/* ; do
done
if [ "$TEST_SUITE" '=' "docker" -a \
- "$TRAVIS_EVENT_TYPE" != "pull_request" -a \
- ensure_docker_login ] ; then
-
+ "$TRAVIS_EVENT_TYPE" != "pull_request" ] && ensure_docker_login ; then
for config in share/spack/docker/config/* ; do
source "$config"
./share/spack/docker/push-image.sh