From 6f0a6e07e3975cf9b536d79b4e76981afb2890b9 Mon Sep 17 00:00:00 2001
From: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date: Mon, 23 Nov 2015 22:55:27 +0900
Subject: [PATCH] change document publisher to builder temporarily

Change-Id: I74728be60bcbcbe41d587091ec9b259af3d3e839
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
---
 jjb/opnfv/opnfv-docs.yml |  4 ----
 jjb/releng-macros.yaml   | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml
index ee4b5d75c..b761740ae 100644
--- a/jjb/opnfv/opnfv-docs.yml
+++ b/jjb/opnfv/opnfv-docs.yml
@@ -75,8 +75,6 @@
 
     builders:
         - build-html-and-pdf-docs-output
-
-    publisher:
         - upload-under-review-docs-to-opnfv-artifacts
 
 - job-template:
@@ -126,7 +124,5 @@
 
     builders:
         - build-html-and-pdf-docs-output
-
-    publisher:
         - upload-merged-docs-to-opnfv-artifacts
         - remove-old-docs-from-opnfv-artifacts
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 9e482dca3..38b7afe70 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -144,6 +144,9 @@
     builders:
         - shell: 'mkdir -p $WORKSPACE/target/classes'
 
+
+# New Releng macros
+
 - builder:
     name: build-html-and-pdf-docs-output
     builders:
@@ -182,9 +185,10 @@
                 mv "$_build"/*.pdf "$_output"
             done
 
-- publisher:
+#TODO(r-mibu): change this to publisher
+- builder:
     name: upload-under-review-docs-to-opnfv-artifacts
-    publishers:
+    builders:
         - shell: |
             #!/bin/bash -e
             set -o pipefail
@@ -217,9 +221,10 @@
             echo
             {gerrit-review} -p {project} -m "$gerrit_comment" $GERRIT_PATCHSET_REVISION
 
-- publisher:
+#TODO(r-mibu): change this to publisher
+- builder:
     name: upload-merged-docs-to-opnfv-artifacts
-    publishers:
+    builders:
         - shell: |
             #!/bin/bash -e
             set -o pipefail
@@ -255,9 +260,10 @@
             echo
             {gerrit-review} -p {project} -m "$gerrit_comment" $GERRIT_PATCHSET_REVISION
 
-- publisher:
+#TODO(r-mibu): change this to publisher
+- builder:
     name: remove-old-docs-from-opnfv-artifacts
-    publishers:
+    builders:
         - shell: |
             #!/bin/bash -e
             export PATH=$PATH:/usr/local/bin/
-- 
2.16.6