From c57639455f84776c893d85e9dc6eba52f93e1e2d Mon Sep 17 00:00:00 2001 From: Artur Zarzycki Date: Fri, 20 Jan 2017 14:59:26 +0100 Subject: [PATCH] Fix mistake in order of deploying and removing images from registry Move operation of removing images after build and deploy stage... Change-Id: Ic0d40e2368da84c97278e04d8e94d348868f329e --- jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh b/jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh index 7ce9b8b..5f95d67 100644 --- a/jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh +++ b/jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh @@ -130,6 +130,9 @@ else ${SCP_COMMAND} -r containers/openstack/ vagrant@"${ADMIN_IP}":/tmp/ccp-repos fi +# Run CCP deployment and OpenStack tests: +${SSH_COMMAND} "pushd fuel-ccp && APT_CACHE_SERVER=http://${APT_CACHE_SERVER_IP}:${APT_CACHE_SERVER_PORT} tox -e multi-deploy -- --openstack-version ${VERSION} --number-of-envs 1 -d" + docker exec "${REGISTRY_HASH}" chgrp -R "${JENKINS_GID}" /var/lib/registry docker exec "${REGISTRY_HASH}" chmod -R g+w /var/lib/registry @@ -137,9 +140,6 @@ for i in `curl http://${REGISTRY_IP}:${REGISTRY_PORT}/v2/_catalog | jq -r '.repo REGISTRY_DATA_DIR=/home/jenkins/registry/data/docker/registry/v2/ /home/jenkins/registry/delete_docker_registry_image.py --image "${i}":"${ZUUL_CHANGE}" done -# Run CCP deployment and OpenStack tests: -${SSH_COMMAND} "pushd fuel-ccp && APT_CACHE_SERVER=http://${APT_CACHE_SERVER_IP}:${APT_CACHE_SERVER_PORT} tox -e multi-deploy -- --openstack-version ${VERSION} --number-of-envs 1 -d" - # Revert to fresh to decrease image size dos.py revert "${FUEL_DEVOPS_ENV_NAME}" "${FUEL_DEVOPS_SNAPSHOT_NAME}"