From 7055442a8da4b65e14d2f1d36ba6caf66af02026 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Tue, 12 Jan 2016 18:03:33 +0000
Subject: [PATCH] publish from openstack/releases to releases.openstack.org

Change the site where the releases information is published to go to
releases.openstack.org.

Depends-On: I41221d84e6c985bcc55f9b2a6f15210d2410bc84
Change-Id: I547f1c3731e86353c3338035c65e5b887d9deee5
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
---
 jenkins/jobs/projects.yaml     |  3 ++-
 jenkins/jobs/release-jobs.yaml | 20 --------------------
 zuul/layout.yaml               |  2 +-
 3 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 jenkins/jobs/release-jobs.yaml

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 5446113e0c..37cfa911ff 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -6730,6 +6730,7 @@
     node: bare-trusty
     tarball-site: tarballs.openstack.org
     doc-publisher-site: docs.openstack.org
+    docroot: releases
 
     jobs:
       - 'gate-{name}-docs'
@@ -6738,7 +6739,7 @@
       - 'gate-{name}-tox-{envlist}':
           envlist: list-changes
       - gate-{name}-pep8
-      - publish-release-history
+      - 'static-{name}-publish'
 
 - project:
     name: renderspec
diff --git a/jenkins/jobs/release-jobs.yaml b/jenkins/jobs/release-jobs.yaml
deleted file mode 100644
index 2bf436c35d..0000000000
--- a/jenkins/jobs/release-jobs.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# This job is meant to be used *only* by the openstack/releases
-# repository for publishing the release history after building the
-# documentation in that repository.
-- job-template:
-    name: publish-release-history
-    node: '{node}'
-
-    builders:
-        - revoke-sudo
-        - gerrit-git-prep
-        - docs
-
-    publishers:
-        - console-log
-        - ftp:
-            site: '{doc-publisher-site}'
-            source: 'doc/build/html/**'
-            target: 'releases'
-            remove-prefix: 'doc/build/html'
-            excludes: ''
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 720653361d..3a9f5fbde2 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -8968,7 +8968,7 @@ projects:
       - gate-releases-tox-validate
       - gate-releases-docs
     release-post:
-      - publish-release-history
+      - static-releases-publish
 
   - name: openstack/renderspec
     template: