diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-06 18:16:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-06 18:16:36 +0000 |
| commit | faea5b91141406c82bd2e029da9aeeb9afa8a200 (patch) | |
| tree | 67807a7407f261bac1d1d4221303e36b4da2f953 /tools | |
| parent | 3ba4b45b3a88aaf51f76affea545fbf6ce20e820 (diff) | |
| parent | cef39561ac21c23d8a58222b66244505826394a0 (diff) | |
| download | kolla-faea5b91141406c82bd2e029da9aeeb9afa8a200.tar.gz kolla-faea5b91141406c82bd2e029da9aeeb9afa8a200.zip | |
Merge "packing and uploading registry"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/gate_run.sh | 14 | ||||
| -rwxr-xr-x | tools/setup_gate.sh | 5 |
2 files changed, 19 insertions, 0 deletions
diff --git a/tools/gate_run.sh b/tools/gate_run.sh index e4301e735..b5bab3ea0 100755 --- a/tools/gate_run.sh +++ b/tools/gate_run.sh @@ -75,7 +75,21 @@ function collect_logs { set -o errexit } +function pack_registry { + sudo mkdir "images" + FILENAME=${BASE_DISTRO}-${INSTALL_TYPE}-${ZUUL_BRANCH}-registry.tar.gz + sudo docker stop registry + sudo tar -zcf "images/$FILENAME" -C /tmp/kolla_registry . + sudo docker start registry + sudo chmod 755 -R images +} + + trap collect_logs EXIT tools/setup_gate.sh tox -e $ACTION-$BASE_DISTRO-$INSTALL_TYPE + +if [[ -n $PACK_REGISTRY ]] && [[ $ACTION == "build" ]]; then + pack_registry +fi diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index a7b635e54..8a3243d50 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -42,6 +42,11 @@ 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 + if [[ "${DISTRO}" == "Debian" ]]; then # Infra does not sign their mirrors so we ignore gpg signing in the gate echo "RUN echo 'APT::Get::AllowUnauthenticated \"true\";' > /etc/apt/apt.conf" | sudo tee -a /etc/kolla/header |