X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffunctest%2Ffunctest.yml;h=a4466f8a53f68786fe95bc4816263161aaa66316;hb=b193241afed53c2f321483441f5b301361589bf8;hp=b16d0715cb09708e894eb7c338b5cc873c710e0b;hpb=3143fe0cfe2a4cd17d3e3fa166c208e7dfa7c060;p=releng.git

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index b16d0715c..a4466f8a5 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -42,7 +42,7 @@
 
     project-type: freestyle
 
-    node: orange-build
+    node: ericsson-test
 
     logrotate:
         daysToKeep: 30
@@ -109,6 +109,8 @@
 - job-template:
     name: 'functest-daily-{stream}'
 
+    node: master
+
     # Job template for daily builders
     #
     # Required Variables:
@@ -146,10 +148,7 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
-        - shell: |
-           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/functest/docs/
-           gsutil cp docs/*.html gs://artifacts.opnfv.org/functest/docs/
+            !include-raw build-upload-docu.sh
 
     postbuilders:
         - test-macro
@@ -157,6 +156,8 @@
 - job-template:
     name: 'functest-verify'
 
+    node: master
+
     project-type: freestyle
 
     logrotate:
@@ -201,11 +202,13 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
+            !include-raw build-docu-verify.sh
 
 - job-template:
     name: 'functest-merge'
 
+    node: master
+
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
@@ -249,9 +252,5 @@
 
     builders:
         - shell: 
-            !include-raw build-docu.sh
-        - shell: |
-           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/functest/docs/
-           gsutil cp docs/*.html gs://artifacts.opnfv.org/functest/docs/
-
+            !include-raw build-upload-docu.sh