From 984bff8d3451e75b8117ccc120efd05aa66d4b2f Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Thu, 29 May 2014 21:19:51 +0200
Subject: [PATCH] Cleanup some {lang} manual jobs

A couple of smaller changes:
For 'openstack-operations-guide-{lang}:
* The job was listed as part of openstack-manuals but belongs to
  operations-guide, place it correctly in projects.yaml.
* The job used the non-existing openstack-ops repository instead of
  operations-guide.
* Move the job from manuals.yaml to manuals-jobs.yaml, thus deleting
  file manuals.yaml.
* Small cleanups: Remove github-org, set node via projects.yaml.
For 'openstack-misc-guides-{lang}:
* Use upload-to-docs-site macro. It's slightly more generic but will
  work fine for this job like it does for the other {lang} jobs.

Change-Id: I925dae61be182ad9407e235102e0089e877365af
---
 .../config/manuals-jobs.yaml                  | 22 ++++++++++++++-----
 .../jenkins_job_builder/config/manuals.yaml   | 16 --------------
 .../jenkins_job_builder/config/projects.yaml  |  4 ++--
 3 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
index a13458b534..b83786a4db 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
@@ -28,11 +28,23 @@
 
     publishers:
       - console-log
-      - ftp:
-          site: docs.openstack.org
-          source: 'publish-docs/{lang}/**'
-          target: '/{lang}/'
-          remove-prefix: 'publish-docs/{lang}/'
+      - upload-to-docs-site
+
+- job-template:
+    name: 'openstack-operations-guide-{lang}'
+    node: '{node}'
+
+    builders:
+      - revoke-sudo
+      - gerrit-git-prep
+      - shell: |
+          #!/bin/bash -xe
+          source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack operations-guide
+          tox -v -e buildlang -- {lang}
+
+    publishers:
+      - console-log
+      - upload-to-docs-site
 
 - job-template:
     name: 'gate-{name}-tox-doc-publish-{envlist}'
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
deleted file mode 100644
index 97f871cb9d..0000000000
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-- job-template:
-    name: 'openstack-operations-guide-{lang}'
-    node: bare-precise
-    github-org: openstack
-
-    builders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - shell: |
-          #!/bin/bash -xe
-          source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack openstack-ops
-          tox -v -e buildlang -- {lang}
-
-    publishers:
-      - console-log
-      - upload-to-docs-site
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index a709dca7db..164fb7d03b 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2232,8 +2232,6 @@
 
       - openstack-misc-guides-{lang}
 
-      - openstack-operations-guide-{lang}
-
 - project:
     name: operations-guide
     github-org: openstack
@@ -2244,6 +2242,8 @@
       - manual-translation-jobs
       - '{name}-tox-doc-{envlist}':
           envlist: publishdocs
+      - openstack-operations-guide-{lang}:
+          lang: ja
 
 - project:
     name: manila