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

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 0239da9d7..a4466f8a5 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -1,12 +1,15 @@
 - project:
     name: functest
-    
+
     jobs:
         - 'functest-vim_bench-test'
+        - 'functest-vim_tempest-test'
+        - 'functest-odl-test'
+        - 'functest-vims-test'
+        - 'functest-vping-test'
         - 'functest-daily-{stream}'
         - 'functest-merge'
         - 'functest-verify'
-        - 'functest-build-docs'
 
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
@@ -21,7 +24,7 @@
     name: functest-vim_bench-test
 
     project-type: freestyle
-    
+
     node: orange-build
 
     logrotate:
@@ -32,11 +35,82 @@
 
     builders:
         - shell: |
-            rally task start /home/ubuntu/rally/samples/tasks/scenario/opnfv/opnfv-keystone.json
+            python run_rally.py keystone
+
+- job-template:
+    name: functest-vim_tempest-test
+
+    project-type: freestyle
+
+    node: ericsson-test
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - shell: |
+            rally verify start
+
+- job-template:
+    name: functest-odl-test
+
+    project-type: freestyle
+
+    node: ericsson-build
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - shell: |
+            echo "put your CI scenario here"
+
+- job-template:
+    name: functest-vims-test
+
+    project-type: freestyle
+
+    node: ericsson-build
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - shell: |
+            echo "put your CI scenario here"
+
+
+- job-template:
+    name: functest-vping-test
+
+    project-type: freestyle
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - shell: |
+            echo "put your CI scenario here"
+
+
 
 - job-template:
     name: 'functest-daily-{stream}'
 
+    node: master
+
     # Job template for daily builders
     #
     # Required Variables:
@@ -73,10 +147,8 @@
         - test-macro
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "Hello world from functest {somevar} daily"
+        - shell:
+            !include-raw build-upload-docu.sh
 
     postbuilders:
         - test-macro
@@ -84,6 +156,8 @@
 - job-template:
     name: 'functest-verify'
 
+    node: master
+
     project-type: freestyle
 
     logrotate:
@@ -127,66 +201,20 @@
                     branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "verify logic goes here"
+        - shell:
+            !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
 
     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: 'functest'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-
-    builders:
-        - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
-
-- job-template:
-    name: 'functest-build-docs'
-
-    project-type: freestyle
-
     logrotate:
         daysToKeep: 30
         numToKeep: 40
@@ -224,5 +252,5 @@
 
     builders:
         - shell: 
-            !include-raw build-docu.sh
+            !include-raw build-upload-docu.sh