Merge "Fix manuals translation jobs"

modules/jenkins/files/slave_scripts/propose_translation_update_manuals.sh

@@ -17,8 +17,12 @@
 # The script is to pull the translations from Transifex,
 # and push to Gerrit.
 
-PROJECT="openstack-manuals"
+PROJECT=$1
+
 DocFolder="doc"
+if [ $PROJECT = "api-site" ] ; then
+    DocFolder="./"
+fi
 
 COMMIT_MSG="Imported Translations from Transifex"
 

modules/jenkins/files/slave_scripts/upstream_translation_update_manuals.sh

@@ -16,7 +16,12 @@
 
 # The script is to push the updated PoT to Transifex.
 
+PROJECT=$1
+
 DocFolder="doc"
+if [ $PROJECT = "api-site" ] ; then
+    DocFolder="./"
+fi
 
 if [ ! `echo $ZUUL_REFNAME | grep master` ]
 then
@@ -61,6 +66,3 @@ then
     # Push .pot changes to transifex
     tx --debug --traceback push -s
 fi
-
-
-

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -1988,6 +1988,7 @@
 
     jobs:
       - openstack-doc-jobs
+      - manual-translation-jobs
 
       - 'openstack-{manual}'
 
@@ -2050,6 +2051,7 @@
 
     jobs:
       - openstack-doc-jobs
+      - manual-translation-jobs
 
 - project:
     name: manila
@@ -2222,10 +2224,10 @@
 
     jobs:
       - openstack-doc-jobs
+      - manual-translation-jobs
       - '{name}-tox-doc-{envlist}':
           envlist: publishdocs
 
-
 - project:
     name: database-api
     github-org: openstack

modules/openstack_project/files/jenkins_job_builder/config/translation-jobs.yaml

@@ -45,37 +45,31 @@
 
     node: 'proposal'
 
-- job:
-    name: manuals-upstream-translation-update
+- job-template:
+    name: '{name}-manuals-upstream-translation-update'
 
     builders:
       - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/upstream_translation_update_manuals.sh
+          /usr/local/jenkins/slave_scripts/upstream_translation_update_manuals.sh {name}
 
     publishers:
       - console-log
 
     node: 'proposal'
 
-- job:
-    name: manuals-propose-translation-update
+- job-template:
+    name: '{name}-manuals-propose-translation-update'
 
     builders:
       - shell: |
           #!/bin/bash -xe
-          /usr/local/jenkins/slave_scripts/propose_translation_update_manuals.sh
+          /usr/local/jenkins/slave_scripts/propose_translation_update_manuals.sh {name}
 
     publishers:
       - console-log
 
-    scm:
-      - git:
-          url: 'git://git.openstack.org/openstack/openstack-manuals'
-          branches:
-            - 'origin/master'
-
     node: 'proposal'
 
 - job-group:
@@ -84,3 +78,8 @@
       - '{name}-upstream-translation-update'
       - '{name}-propose-translation-update'
 
+- job-group:
+    name: manual-translation-jobs
+    jobs:
+      - '{name}-manuals-upstream-translation-update'
+      - '{name}-manuals-propose-translation-update'

modules/openstack_project/files/zuul/layout.yaml

@@ -294,6 +294,11 @@ project-templates:
       - gate-{name}-tox-checkdeletions
       - gate-{name}-tox-doc-publish-checkbuild
 
+  - name: openstack-doc-translation
+    post:
+      - '{name}-manuals-upstream-translation-update'
+    periodic:
+      - '{name}-manuals-propose-translation-update'
 
 jobs:
   - name: ^.*$
@@ -412,25 +417,29 @@ jobs:
     success-message: Jenkins XML output is unchanged.
 # Continous publishing from master of the following documentation targets:
   - name: openstack-admin-guide-cloud
-    branch: ^master$
+    branch: master
   - name: openstack-docs-site
-    branch: ^master$
+    branch: master
   - name: openstack-cli-reference
-    branch: ^master$
+    branch: master
   - name: openstack-glossary
-    branch: ^master$
+    branch: master
   - name: openstack-ha-guide
-    branch: ^master$
+    branch: master
   - name: openstack-image-guide
-    branch: ^master$
+    branch: master
   - name: openstack-user-guide
-    branch: ^master$
+    branch: master
   - name: openstack-user-guide-admin
-    branch: ^master$
+    branch: master
   - name: openstack-security-guide
-    branch: ^master$
+    branch: master
   - name: openstack-training-guides
-    branch: ^master$
+    branch: master
+  - name: ^.*manuals-propose-translation-update$
+    branch: master
+  - name: ^.*manuals-upstream-translation-update$
+    branch: master
 # Documentation targets for master and future stable branches:
   - name: openstack-config-reference
     branch: ^(?!stable/grizzly).*$
@@ -492,8 +501,6 @@ jobs:
     branch: ^(?!stable/grizzly).*$
   - name: ^gate-requirements-(python27|pypy)$
     branch: ^(?!stable/grizzly).*$
-  - name: manuals-upstream-translation-update
-    branch: ^master$
   - name: gate-hacking-python33
     voting: false
   - name: gate-hacking-pypy
@@ -2284,17 +2291,16 @@ projects:
   - name: openstack/api-site
     template:
       - name: openstack-doc-gate
+      - name: openstack-doc-translation
     post:
       - api-site-tox-doc-publishdocs
       - openstack-api-site
       - openstack-api-ref
-      - manuals-upstream-translation-update
-    periodic:
-      - manuals-propose-translation-update
 
   - name: openstack/openstack-manuals
     template:
       - name: openstack-doc-gate
+      - name: openstack-doc-translation
     check:
       - gate-openstack-manuals-validate
     gate:
@@ -2323,20 +2329,15 @@ projects:
       - openstack-security-guide
       - openstack-user-guide
       - openstack-user-guide-admin
-      - manuals-upstream-translation-update
       - openstack-training-guides
-    periodic:
-      - manuals-propose-translation-update
 
   - name: openstack/operations-guide
     template:
       - name: openstack-doc-gate
+      - name: openstack-doc-translation
     post:
       - openstack-operations-guide
       - openstack-operations-guide-ja
-      - manuals-upstream-translation-update
-    periodic:
-      - manuals-propose-translation-update
 
 # Section: OpenStack development projects