openstack
/
kolla-kubernetes
Code Issues Proposed changes

Gate fix 4 

This PS changes the permissions on the built images so that the
tarballs.openstack.org site will allow them to be downloaded.
Also uploads both 2.x and 3.x containers.

Change-Id: Ice85b3a4efe0c17e6949fb3e5a7fb944109ed0cf
This commit is contained in:
Kevin Fox 2017-01-29 14:09:19 -08:00
parent ebb1eeb6c2
commit 299d58486a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/bin/build_docker_images.sh
View File

@ -2,17 +2,19 @@ LOGS="$1"
DISTRO="$2"
TYPE="$3"
CONFIG="$4"
PIPELINE="$5"
BRANCH="$5"
PIPELINE="$6"
sudo docker images | awk '{if($1!="REPOSITORY"){print $1 ":" $2}}' | sort -u > $LOGS/docker_images.txt
cat $LOGS/docker_images.txt | grep kolla | sed 's@^kolla@docker.io/kolla@' | sort -u > $LOGS/docker_kolla_images.txt
cat $LOGS/docker_images.txt | grep -v kolla | sed 's@^kolla@docker.io/kolla@' | sort -u > $LOGS/docker_kubernetes_images.txt
if [ "x$PIPELINE" == "xperiodic" ]; then
sudo docker save -o $WORKSPACE/UPLOAD_CONTAINERS/kubernetes.tar $(cat $LOGS/docker_kubernetes_images.txt)
sudo docker save -o $WORKSPACE/UPLOAD_CONTAINERS/$DISTRO-$TYPE-$CONFIG.tar $(cat $LOGS/docker_kolla_images.txt)
sudo docker save -o $WORKSPACE/UPLOAD_CONTAINERS/$DISTRO-$TYPE-$BRANCH-$CONFIG.tar $(cat $LOGS/docker_kolla_images.txt)
sudo chown $USER $WORKSPACE/UPLOAD_CONTAINERS/*
chmod 644 $WORKSPACE/UPLOAD_CONTAINERS/*
bzip2 $WORKSPACE/UPLOAD_CONTAINERS/kubernetes.tar
bzip2 $WORKSPACE/UPLOAD_CONTAINERS/$DISTRO-$TYPE-$CONFIG.tar
bzip2 $WORKSPACE/UPLOAD_CONTAINERS/$DISTRO-$TYPE-$BRANCH-$CONFIG.tar
cp $LOGS/docker_kubernetes_images.txt $WORKSPACE/UPLOAD_CONTAINERS/kubernetes-containers.txt
cp $LOGS/docker_kubernetes_images.txt $WORKSPACE/UPLOAD_CONTAINERS/$DISTRO-$TYPE-$CONFIG-containers.txt
cp $LOGS/docker_kolla_images.txt $WORKSPACE/UPLOAD_CONTAINERS/$DISTRO-$TYPE-$BRANCH-$CONFIG-containers.txt
fi

2
tools/setup_gate.sh
View File

@ -218,4 +218,4 @@ kubectl get pods --namespace=kolla
kubectl get svc --namespace=kolla
tests/bin/basic_tests.sh
tests/bin/cleanup_tests.sh
tests/bin/build_docker_images.sh $WORKSPACE/logs $DISTRO $TYPE $CONFIG $PIPELINE
tests/bin/build_docker_images.sh $WORKSPACE/logs $DISTRO $TYPE $CONFIG $BRANCH $PIPELINE

2
tools/setup_gate_iscsi.sh
View File

@ -129,4 +129,4 @@ sudo lvs >> $WORKSPACE/logs/lvs.txt
tests/bin/basic_tests.sh
tests/bin/cleanup_tests.sh
tests/bin/build_docker_images.sh $WORKSPACE/logs $DISTRO $TYPE $CONFIG $PIPELINE
tests/bin/build_docker_images.sh $WORKSPACE/logs $DISTRO $TYPE $CONFIG $BRANCH $PIPELINE