diff --git a/tools/gate_run.sh b/tools/gate_run.sh index 1a58f5605e..526893d370 100755 --- a/tools/gate_run.sh +++ b/tools/gate_run.sh @@ -76,15 +76,9 @@ function collect_logs { } function pack_registry { - if [[ "$ZUUL_PIPELINE" == "tag" ]]; then - # ZUUL_REFNAME=refs/tags/4.0.0 - REF_NAME=$(echo $ZUUL_REFNAME | cut -d/ -f3) - else - # ZUUL_REFNAME=stable/ocata or master - REF_NAME=$(echo $ZUUL_REFNAME | cut -d/ -f2) - fi sudo mkdir "images" - FILENAME=${BASE_DISTRO}-${INSTALL_TYPE}-registry-${REF_NAME}.tar.gz + BRANCH=$(echo "$ZUUL_BRANCH" | cut -d/ -f2) + FILENAME=${BASE_DISTRO}-${INSTALL_TYPE}-registry-${BRANCH}.tar.gz sudo docker stop registry sudo tar -zcf "images/$FILENAME" -C /tmp/kolla_registry . sudo docker start registry diff --git a/tools/publisher.sh b/tools/publisher.sh new file mode 100755 index 0000000000..fa06563aea --- /dev/null +++ b/tools/publisher.sh @@ -0,0 +1,64 @@ +# Script which is run in dockerhub publisher pipeline +# It will organize build/deploy gates and then publish images to final place + +export ZUUL_REF=$ZUUL_REF +export BRANCH=$(echo "$ZUUL_BRANCH" | cut -d/ -f2) +export TMP_REGISTRY="tmp/" +export PUBLISHER=1 +export SIGNOFF_FILENAME=${BASE_DISTRO}-${INSTALL_TYPE}-registry-${BRANCH}.txt +export FILENAME=${BASE_DISTRO}-${INSTALL_TYPE}-registry-${BRANCH}.tar.gz + +# Ansible deployment gate to test out images +function deploy_ansible { + export KOLLA_ANSIBLE_DIR=$(mktemp -d) + cat > /tmp/clonemap <> images/$SIGNOFF_FILENAME +} + +# Building images that are supposed to be tested later +if [[ $ACTION == "build" ]]; then + tools/gate_run.sh + sudo touch images/$SIGNOFF_FILENAME + sudo chmod 777 images/$SIGNOFF_FILENAME + + echo http://logs.openstack.org/$LOG_PATH >> images/$SIGNOFF_FILENAME + exit 0 +fi +if [[ $ACTION == "deploy-multinode" ]]; then + if [[ $ORCH_ENGINE == "ansible" ]]; then + deploy_ansible + signoff + exit 0 + fi +fi + +# After all tests pass, move images from temp to final dir on tarballs.o.o +if [[ $ACTION == "save" ]]; then + mkdir -p images/ + wget -q -c -O "/tmp/$FILENAME" \ + "http://tarballs.openstack.org/kolla/images/tmp/$FILENAME" + curl -o /tmp/$SIGNOFF_FILENAME http://tarballs.openstack.org/kolla/images/tmp/$SIGNOFF_FILENAME + gunzip /tmp/$FILENAME + tar -rf /tmp/${BASE_DISTRO}-${INSTALL_TYPE}-registry-${BRANCH}.tar /tmp/$SIGNOFF_FILENAME + gzip /tmp/${BASE_DISTRO}-${INSTALL_TYPE}-registry-${BRANCH}.tar + ls -la /tmp/ + sudo mv /tmp/$FILENAME images/publisher-$FILENAME +fi +