From d9df6e7aa91ac751ee9e6b1800e92635e820b87f Mon Sep 17 00:00:00 2001 From: Artur Zarzycki Date: Wed, 25 Jan 2017 10:28:40 +0100 Subject: [PATCH] Support for diagnostic snapshot in simple-deployment jobs Failed job create diagnostic snapshot, in this patch we download this snapshot from vm to workspace and then in publisher we send it to logs server. Change-Id: I5a087b7f9950fb4832dcc8f1d72eb716431e4405 Depends-On: I84f480dc3f2ff33e1fc600c9a146cd8063b5a5a0 --- jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh | 4 ++++ jenkins-tp/jobs/fuel-ccp-simple-deployment.yaml | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh b/jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh index 27e7a42..a523dd4 100644 --- a/jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh +++ b/jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh @@ -137,6 +137,10 @@ docker exec "${REGISTRY_HASH}" chgrp -R "${JENKINS_GID}" /var/lib/registry docker exec "${REGISTRY_HASH}" chmod -R g+w /var/lib/registry set +e +# download snapshot if exists +${SCP_COMMAND} vagrant@"${ADMIN_IP}":/tmp/ccp-diag/*.tar.gz . + +# remove images from local registry for i in `curl http://${REGISTRY_IP}:${REGISTRY_PORT}/v2/_catalog | jq -r '.repositories[]'`; do REGISTRY_DATA_DIR=/home/jenkins/registry/data/docker/registry/v2/ /home/jenkins/registry/delete_docker_registry_image.py --image "${i}":"${ZUUL_CHANGE}" done diff --git a/jenkins-tp/jobs/fuel-ccp-simple-deployment.yaml b/jenkins-tp/jobs/fuel-ccp-simple-deployment.yaml index 559dac1..a83b2a5 100644 --- a/jenkins-tp/jobs/fuel-ccp-simple-deployment.yaml +++ b/jenkins-tp/jobs/fuel-ccp-simple-deployment.yaml @@ -12,6 +12,13 @@ - shell: !include-raw-escape 'builders/fuel-ccp-simple-deployment.sh' publishers: + - ssh: + site: logs.mcp.fuel-infra.org + target: /srv/static/logs/snapshots/ + source: $WORKSPACE/*.tar.gz + fail-on-error: false + always-publish-from-master: true + flatten: true - post-tasks: - matches: - log-text: ''