From a1b4f1db5c249ff7a09757ce6079fd8b961d56cc Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Wed, 21 May 2014 13:47:37 +1000 Subject: [PATCH] Add in JJB macros for pushing to swift Two new macros for pushing to swift. zuul_swift_upload which takes 'upload_source' to push using zuul_swift_upload.py slavescript and zuul_swift_upload_console which uses grab_console_log.sh to download the console log via wget from the jenkins web UI and then pushes it with the former macro Change-Id: I1c7619e2b67e2d4ddafec1faad0597076385c350 --- .../jenkins_job_builder/config/macros.yaml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml index d97f282532..b0aceca222 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml @@ -293,6 +293,29 @@ fi +- builder: + name: zuul_swift_upload + builders: + - shell: "/usr/local/jenkins/slave_scripts/zuul_swift_upload.py --name {zuul_log_instruction_set} {upload_source}" + + +- builder: + name: zuul_swift_upload_logs + builders: + - zuul_swift_upload: + zuul_log_instruction_set: logs + upload_source: '{upload_source}' + + +- builder: + name: zuul_swift_upload_console_log + builders: + - shell: "/usr/local/jenkins/slave_scripts/grab_console_log.sh" + - zuul_swift_upload_logs: + upload_source: '/tmp/consoleText' + + + # ====================================================================== - publisher: