From 3b7a40d7c1cad56a3cb02dbac9561e1bb786f28c Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Sat, 22 Feb 2014 19:49:36 +0100
Subject: [PATCH] Fix publishing of API Reference

We are publishing at api.openstack.org top-level but the job
is copying to an api-ref subdirectory. Changing the Jenkins setup is the
better solution here than copying directly into publish-docs - it would
create a more complex script.

Remove macro upload-to-api-site and add the publisher directly to the
openstack-api-ref job since this is an exception from the other rules -
and this is the only job publishing to api.o.o.

Change-Id: Ib5511ed7cbf8dfc90cb42e295fe68f39aa1e0a8f
---
 .../files/jenkins_job_builder/config/api-jobs.yaml       | 7 +++++--
 .../files/jenkins_job_builder/config/macros.yaml         | 9 ---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
index 182c8f869a..6882c1159f 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/api-jobs.yaml
@@ -22,7 +22,6 @@
     node: '{node}'
 
 
-# this replaces the old openstack-api-site job in Jenkins
 - job:
     name: openstack-api-ref
     concurrent: false
@@ -37,8 +36,12 @@
 
     publishers:
       - console-log
-      - upload-to-api-site
       - upload-doc-build-results
+      - ftp:
+          site: api.openstack.org
+          source: 'publish-docs/api-ref/**'
+          target: '/'
+          remove-prefix: 'publish-docs/api-ref/'
 
 
 # in zuul/layout.yaml specified to only run against master branch.
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 50780a3112..ce6a067754 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -359,15 +359,6 @@
               copy-after-failure: true
 
 
-- publisher:
-    name: upload-to-api-site
-    publishers:
-      - ftp:
-          site: api.openstack.org
-          source: 'publish-docs/**'
-          target: '/'
-          remove-prefix: 'publish-docs/'
-
 - publisher:
     name: upload-to-docs-site
     publishers: