Move devstack testr log copying to macros

So that as each job moves to testr, we don't have messy log stanzas
in the job definitions.

Change-Id: If7a2b5a635c2f41cf7445b6577a0c7bed072eb60

modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml

@@ -95,17 +95,6 @@
     publishers:
       - devstack-logs
       - console-log
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
-              source: '**/testr_results.html.gz'
-              keep-hierarchy: false
-              copy-after-failure: true
-            - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
-              source: '**/subunit_log.txt.gz'
-              keep-hierarchy: false
-              copy-after-failure: true
       - devstack-complete
 
 - job:

modules/openstack_project/files/jenkins_job_builder/config/macros.yaml

@@ -269,6 +269,14 @@
               source: 'logs/**'
               keep-hierarchy: true
               copy-after-failure: true
+            - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
+              source: '**/testr_results.html.gz'
+              keep-hierarchy: false
+              copy-after-failure: true
+            - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
+              source: '**/subunit_log.txt.gz'
+              keep-hierarchy: false
+              copy-after-failure: true
 
 - publisher:
     name: devstack-logs-periodic
@@ -280,6 +288,14 @@
               source: 'logs/**'
               keep-hierarchy: true
               copy-after-failure: true
+            - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
+              source: '**/testr_results.html.gz'
+              keep-hierarchy: false
+              copy-after-failure: true
+            - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
+              source: '**/subunit_log.txt.gz'
+              keep-hierarchy: false
+              copy-after-failure: true
 
 - publisher:
     name: devstack-complete