Merge "Builder macros for generating indexes"

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'
+
 
 # ======================================================================
 

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

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