clean opnfv/opnfv-docs.yml

- make 'opnfv-docs-*' jobs run against all repositories which has docs
  directory.

- remove docs builder from yardstick-project-jobs

JIRA: RELENG-133

Change-Id: Id0cf6e600ed112c6f082f6bc924eaeccb0481e49
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>

4 files changed, 22 insertions, 40 deletions

diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml
index 2b3f98a4e..0c11757ec 100644
--- a/jjb/opnfv/opnfv-docs.yml
+++ b/jjb/opnfv/opnfv-docs.yml
@@ -51,15 +51,19 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
             projects:
-              - project-compare-type: 'REG_EXP'
-#Left out arno projects oscar|octopus|functest|genesis
-                project-pattern: 'vswitchperf|apex|armband|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest|genesisreq|models|domino|netready'
+              - project-compare-type: 'ANT'
+                project-pattern: '(?!yardstick)'
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**'
+              - project-compare-type: 'ANT'
+                project-pattern: 'yardstick'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     builders:
         - upload-review-docs
@@ -90,14 +94,19 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'remerge'
             projects:
-              - project-compare-type: 'REG_EXP'
-                project-pattern: 'vswitchperf|apex|armband|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest|genesisreq|models|domino|netready'
+              - project-compare-type: 'ANT'
+                project-pattern: '(?!yardstick)'
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**'
+              - project-compare-type: 'ANT'
+                project-pattern: 'yardstick'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     builders:
         - upload-merged-docs
diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index cbb8f9545..f3e776c83 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -61,14 +61,9 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
 
     builders:
-        - build-opnfv-composite-docs
-        - upload-under-review-docs-to-opnfv-artifacts
-        - report-docs-build-result-to-gerrit
+        - check-bash-syntax
 
 - job-template:
     name: 'opnfvdocs-merge-{stream}'
@@ -105,15 +100,9 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
 
     builders:
-        - build-opnfv-composite-docs
-        - upload-generated-docs-to-opnfv-artifacts
-        - report-docs-build-result-to-gerrit
-        - remove-old-docs-from-opnfv-artifacts
+        - check-bash-syntax
 
 - job-template:
     name: 'opnfvdocs-daily-{stream}'
@@ -146,13 +135,6 @@
         - timed: '0 H/6 * * *'
 
     builders:
-        - build-opnfv-composite-docs
+        - build-html-and-pdf-docs-output
 #        - upload-generated-docs-to-opnfv-artifacts
 
-- builder:
-    name: build-opnfv-composite-docs
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            export PATH=$PATH:/usr/local/bin/
-            GERRIT_COMMENT=gerrit_comment.txt ./build-composite.sh
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index a69badbf4..0c4cb8fff 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -412,3 +412,8 @@
         - upload-generated-docs-to-opnfv-artifacts
         - report-docs-build-result-to-gerrit
         - remove-old-docs-from-opnfv-artifacts
+
+- builder:
+    name: check-bash-syntax
+    builders:
+        - shell: "find . -name '*.sh' | xargs bash -n"
diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index 7656c920e..64031b75a 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -59,8 +59,6 @@
                     branch-pattern: '**/{branch}'
     builders:
         - yardstick-unit-tests-and-docs-build
-        - upload-under-review-docs-to-opnfv-artifacts
-        - report-docs-build-result-to-gerrit
 
 - job-template:
     name: 'yardstick-merge-{stream}'
@@ -97,9 +95,6 @@
 
     builders:
         - yardstick-unit-tests-and-docs-build
-        - upload-generated-docs-to-opnfv-artifacts
-        - report-docs-build-result-to-gerrit
-        - remove-old-docs-from-opnfv-artifacts
 
 ################################
 # job builders
@@ -127,13 +122,4 @@
             # unit tests
             ./run_tests.sh
 
-            pip install Sphinx==1.3.1 doc8 docutils sphinxcontrib-httpdomain
-
-            # generate api doc sources
-            sphinx-apidoc -o docs/apidocs yardstick
-
-            # build docs
-            git clone ssh://gerrit.opnfv.org:29418/opnfvdocs docs_build/_opnfvdocs
-            GERRIT_COMMENT=gerrit_comment.txt ./docs_build/_opnfvdocs/scripts/docs-build.sh
-
             deactivate