aboutsummaryrefslogtreecommitdiff
path: root/tools/setup_gate.sh
diff options
context:
space:
mode:
authorJeffrey Zhang <zhang.lei.fly@gmail.com>2017-01-19 10:15:48 +0800
committerJeffrey Zhang <zhang.lei.fly@gmail.com>2017-01-20 01:56:36 +0800
commit85d218ec447b180f0dc7b2a7270f8c798938df79 (patch)
treea1a7be0813570ad4e3c6239ddf459981b08dd1a0 /tools/setup_gate.sh
parentfa09b3e077340c2d07bbe6aad9c34f8d5b372dcb (diff)
downloadkolla-85d218ec447b180f0dc7b2a7270f8c798938df79.tar.gz
kolla-85d218ec447b180f0dc7b2a7270f8c798938df79.zip
Fix the gate failure
* Push images all the time * Pin docker-engine version Change-Id: Ie778f719655c1136e563ede9e494b37817e247fa
Diffstat (limited to 'tools/setup_gate.sh')
-rwxr-xr-xtools/setup_gate.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index 8a3243d50..09a4d687a 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -42,10 +42,8 @@ EOF
# NOTE(Jeffrey4l): use different a docker namespace name in case it pull image from hub.docker.io when deplying
sed -i 's|^#namespace.*|namespace = lokolla|' /etc/kolla/kolla-build.conf
- if [[ -n "${PACK_REGISTRY}" ]] && [[ $ACTION == "build" ]]; then
- sed -i 's|^#registry.*|registry = 127.0.0.1:4000|' /etc/kolla/kolla-build.conf
- sed -i 's|^#push.*|push = true|' /etc/kolla/kolla-build.conf
- fi
+ sed -i 's|^#registry.*|registry = 127.0.0.1:4000|' /etc/kolla/kolla-build.conf
+ sed -i 's|^#push.*|push = true|' /etc/kolla/kolla-build.conf
if [[ "${DISTRO}" == "Debian" ]]; then
# Infra does not sign their mirrors so we ignore gpg signing in the gate