Move document generation to gce-opnfv-docker-1

[releng.git] / jjb / opnfvdocs / opnfvdocs.yml

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 326c27d..6e7b40b 100644 (file)
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -1,8 +1,7 @@
 - project:
     name: opnfvdocs
     jobs:
-        - 'opnfvdocs-test'
-        - 'opnfvdocs-daily-master'
+        - 'opnfvdocs-daily-{stream}'
         - 'opnfvdocs-merge'
         - 'opnfvdocs-verify'
 
@@ -13,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
     #
@@ -40,7 +25,6 @@
     #     branch:    branch (eg. stable)
 
     project-type: freestyle
-    varsetabove: '{somevar}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -65,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:
@@ -123,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
@@ -173,13 +151,6 @@
                       branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
-
-
-
-
-
+        - shell:
+            !include-raw docu-build.sh