From 4cac7ec6ec36694acb5a180c7c2075edca87e1c9 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Thu, 26 Dec 2013 11:17:47 -0800
Subject: [PATCH] Update python-bitrot-jobs; remove periodic macros

Sync the builder and publisher configuration from python-jobs
to pythot-bitrot-jobs (as much as possible).

Remove unneeded macros related to periodic jobs.

Change-Id: Ib66ebe63269c1a42f29fdcb21e49ebd42673a8c8
---
 .../jenkins_job_builder/config/macros.yaml    | 34 ++-----------------
 .../config/python-bitrot-jobs.yaml            | 24 ++++---------
 2 files changed, 9 insertions(+), 49 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 17f5fb3ac5..bb6204b8e7 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -218,11 +218,8 @@
     builders:
       - shell: |
           #!/bin/sh
-          if test "$LOG_PATH" ; then
-              echo "Detailed logs: http://logs.openstack.org/$LOG_PATH/"
-          else
-              echo "Detailed logs: http://logs.openstack.org/periodic/$JOB_NAME/$NODE_NAME/$BUILD_NUMBER/"
-          fi
+          echo "Detailed logs: http://logs.openstack.org/$LOG_PATH/"
+
 
 - builder:
     name: update-pypi-mirror
@@ -268,15 +265,6 @@
               copy-console: true
               copy-after-failure: true
 
-- publisher:
-    name: console-log-periodic
-    publishers:
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'logs/periodic/$JOB_NAME/$NODE_NAME/$BUILD_NUMBER'
-              copy-console: true
-              copy-after-failure: true
 
 - publisher:
     name: devstack-logs
@@ -297,24 +285,6 @@
               keep-hierarchy: false
               copy-after-failure: true
 
-- publisher:
-    name: devstack-logs-periodic
-    publishers:
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'logs/periodic/$JOB_NAME/$NODE_NAME/$BUILD_NUMBER'
-              source: 'logs/**'
-              keep-hierarchy: true
-              copy-after-failure: true
-            - target: 'logs/periodic/$JOB_NAME/$NODE_NAME/$BUILD_NUMBER'
-              source: '**/testr_results.html.gz'
-              keep-hierarchy: false
-              copy-after-failure: true
-            - target: 'logs/periodic/$JOB_NAME/$NODE_NAME/$BUILD_NUMBER'
-              source: '**/subunit_log.txt.gz'
-              keep-hierarchy: false
-              copy-after-failure: true
 
 - publisher:
     name: coverage-log
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
index 3668b80d8f..976fe817cf 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
@@ -11,16 +11,11 @@
       - python26:
           github-org: '{github-org}'
           project: '{name}'
+      - assert-no-extra-files
 
     publishers:
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
-              source: '**/*nose_results.html'
-              keep-hierarchy: false
-              copy-after-failure: true
-      - console-log-periodic
+      - test-results
+      - console-log
 
     scm:
       - git:
@@ -44,16 +39,11 @@
       - python27:
           github-org: '{github-org}'
           project: '{name}'
+      - assert-no-extra-files
 
     publishers:
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
-              source: '**/*nose_results.html'
-              keep-hierarchy: false
-              copy-after-failure: true
-      - console-log-periodic
+      - test-results
+      - console-log
 
     scm:
       - git:
@@ -79,7 +69,7 @@
           project: '{name}'
 
     publishers:
-      - console-log-periodic
+      - console-log
 
     scm:
       - git: