X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfvdocs%2Fopnfvdocs.yml;h=6e7b40bf277086134d7c3ae391e9b19cbe463a7b;hb=a8ced6b99a496fd01db2744e4b68f05d66582fe4;hp=327747f7f88d074bed375613bd6c6c57e4ee13d3;hpb=bb53ad031cefd54b306e04cf1f4690acd4e9e4f2;p=releng.git

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 327747f7f..6e7b40bf2 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -1,11 +1,9 @@
 - project:
     name: opnfvdocs
     jobs:
-        - 'opnfvdocs-test'
-        - 'opnfvdocs-daily-master'
+        - 'opnfvdocs-daily-{stream}'
         - 'opnfvdocs-merge'
         - 'opnfvdocs-verify'
-        - 'opnfvdocs-build-docs'
 
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
@@ -14,25 +12,11 @@
             branch: 'master'
 
     project: 'opnfvdocs'
-    somevar: 'foo'
 
 - job-template:
-    name: opnfvdocs-test
+    name: 'opnfvdocs-daily-{stream}'
 
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - shell: |
-            echo "Hello world from opnfvdocs"
-
-- job-template:
-    name: 'opnfvdocs-daily-master'
+    node: gce-opnfv-docker-1
 
     # Job template for daily builders
     #
@@ -41,7 +25,6 @@
     #     branch:    branch (eg. stable)
 
     project-type: freestyle
-    varsetabove: '{somevar}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -66,21 +49,15 @@
     triggers:
         - timed: 'H H * * *'
 
-    prebuilders:
-        - test-macro
-
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "Hello world from opnfvdocs {somevar} daily"
-
-    postbuilders:
-        - test-macro
+        - shell:
+            !include-raw docu-build.sh
 
 - job-template:
     name: 'opnfvdocs-verify'
 
+    node: gce-opnfv-docker-1
+
     project-type: freestyle
 
     logrotate:
@@ -124,14 +101,14 @@
                     branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "verify logic goes here"
+        - shell:
+            !include-raw docu-build.sh
 
 - job-template:
     name: 'opnfvdocs-merge'
 
+    node: gce-opnfv-docker-1
+
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
@@ -174,54 +151,6 @@
                       branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
-
-
-
-- job-template:
-    name: 'opnfvdocs-build-docs'
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
-    triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'opnfvdocs'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-
-    builders:
-        - shell: |
-            !include-raw build-docu.sh
+        - shell:
+            !include-raw docu-build.sh