X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-project-jobs.yml;h=c25e4ab4a949a40e16e5d0bdb9770bf5053fcdcd;hb=897562894530a0227e78cf546f629809437925e0;hp=02da04f306971d01b4da58bf06784c06dc9461bd;hpb=d818173b634e7f4c910beb7e93dbee3dd032d6d7;p=releng.git

diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml
index 02da04f30..c25e4ab4a 100644
--- a/jjb/functest/functest-project-jobs.yml
+++ b/jjb/functest/functest-project-jobs.yml
@@ -35,17 +35,21 @@
 
     disabled: '{obj:disabled}'
 
+    project-type: 'multijob'
+
     parameters:
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
-        - 'opnfv-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
         - git-scm-gerrit
 
     triggers:
-        - 'functest-verify-triggers-macro'
+        - 'functest-verify-triggers-macro':
+            project: '{project}'
+            branch: '{branch}'
 
     builders:
         - shell: |
@@ -98,6 +102,11 @@
 
     disabled: '{obj:disabled}'
 
+    wrappers:
+        - ssh-agent-wrapper
+        - build-timeout:
+            timeout: 30
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -128,7 +137,9 @@
         - git-scm
 
     triggers:
-        - 'functest-docs-upload-triggers-macro'
+        - 'functest-docs-upload-triggers-macro':
+            project: '{project}'
+            branch: '{branch}'
 
     builders:
         - functest-upload-doc-artifact