From ae7818772f405159b595db3ef8b08b03c18c3b91 Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Wed, 16 Jul 2014 21:26:33 +1000 Subject: [PATCH] Builder macros for generating indexes Add in new macros for generating indexes and uploading files with or without them. Change-Id: Ia10ad3d62631744266bc9ed2a813dc91e52666d2 --- .../files/jenkins_job_builder/config/macros.yaml | 9 ++++++++- .../files/jenkins_job_builder/config/python-jobs.yaml | 3 ++- .../files/slave_scripts/grab_console_log.sh | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) 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 3a8b012520..cc6ac52d6b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml @@ -327,9 +327,16 @@ builders: - shell: "/usr/local/jenkins/slave_scripts/grab_console_log.sh" - zuul_swift_upload_logs: - upload_source: '/tmp/consoleText' + upload_source: '/tmp/console.txt' +- builder: + name: zuul_swift_upload_logs_with_console + builders: + - shell: "/usr/local/jenkins/slave_scripts/grab_console_log.sh" + - zuul_swift_upload_logs: + upload_source: '{upload_source} /tmp/console.txt' + # ====================================================================== diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml index 75883204d6..aec6d8e32b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml @@ -44,7 +44,8 @@ - pep8: github-org: '{github-org}' project: '{name}' - - zuul_swift_upload_console_log + - zuul_swift_upload_logs_with_console: + upload_source: '.tox/pep8/log' publishers: - console-log diff --git a/modules/openstack_project/files/slave_scripts/grab_console_log.sh b/modules/openstack_project/files/slave_scripts/grab_console_log.sh index 0d64800177..6a5bd8918f 100755 --- a/modules/openstack_project/files/slave_scripts/grab_console_log.sh +++ b/modules/openstack_project/files/slave_scripts/grab_console_log.sh @@ -3,4 +3,4 @@ echo "Grabbing consoleLog" console_log_path='consoleText' -wget -P /tmp --no-check-certificate $BUILD_URL$console_log_path +wget -P /tmp/console.txt --no-check-certificate $BUILD_URL$console_log_path