diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-20 02:56:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-20 02:56:17 +0000 |
| commit | dc063ce776ee26234de4af8b2ecefab748245541 (patch) | |
| tree | 6da9faeb5ad25e29f4c90805b1ebcc725b56f8f9 /tools/setup_gate.sh | |
| parent | a0b14cfebf26c475490530c23a1360bc2bd41949 (diff) | |
| parent | 85d218ec447b180f0dc7b2a7270f8c798938df79 (diff) | |
| download | kolla-dc063ce776ee26234de4af8b2ecefab748245541.tar.gz kolla-dc063ce776ee26234de4af8b2ecefab748245541.zip | |
Merge "Fix the gate failure"
Diffstat (limited to 'tools/setup_gate.sh')
| -rwxr-xr-x | tools/setup_gate.sh | 6 |
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 |