X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fkvmfornfv%2Fkvmfornfv.yml;h=133c5ef0e36310772a967401116dfe85a260616e;hb=75228835820ca49a6b46466a9e6ecc4939bd6aac;hp=b6a55fe6ad172e4edec01a9710664dc4bcd84688;hpb=03388550bea11566ed3ae90129bab2e3b01eef1a;p=releng.git

diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index b6a55fe6a..133c5ef0e 100644
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -22,13 +22,19 @@
             slave-label: 'intel-pod1'
 #####################################
 # patch verification phases
+#####################################
+    testname:
+        - 'cyclictest'
+        - 'packet_forward'
+#####################################
+# patch verification phases
 #####################################
     jobs:
         - 'kvmfornfv-verify-{stream}'
         - 'kvmfornfv-verify-{phase}-{stream}'
         - 'kvmfornfv-merge-{stream}'
         - 'kvmfornfv-daily-{stream}'
-        - 'kvmfornfv-daily-{phase}-{stream}'
+        - 'kvmfornfv-{testname}-daily-{phase}-{stream}'
 #####################################
 # job templates
 #####################################
@@ -56,6 +62,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -102,7 +109,6 @@
                   node-parameters: false
                   kill-phase-on: FAILURE
                   abort-all-job: true
-
 - job-template:
     name: 'kvmfornfv-verify-{phase}-{stream}'
 
@@ -159,6 +165,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -199,35 +206,52 @@
             choosing-strategy: 'default'
 
     triggers:
-         - timed: '@midnight'
+        - timed: '@midnight'
 
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
         - multijob:
-            name: build
+            name: cyclictest-build
+            condition: SUCCESSFUL
+            projects:
+                - name: 'kvmfornfv-cyclictest-daily-build-{stream}'
+                  current-parameters: false
+                  node-parameters: false
+                  git-revision: true
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+            name: cyclictest-test
             condition: SUCCESSFUL
             projects:
-                - name: 'kvmfornfv-daily-build-{stream}'
+                - name: 'kvmfornfv-cyclictest-daily-test-{stream}'
                   current-parameters: false
                   node-parameters: false
                   git-revision: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
         - multijob:
-            name: test
+            name: packetforward-build
             condition: SUCCESSFUL
             projects:
-                - name: 'kvmfornfv-daily-test-{stream}'
+                - name: 'kvmfornfv-packet_forward-daily-build-{stream}'
+                  current-parameters: false
+                  node-parameters: false
+                  git-revision: true
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+            name: packetforward-test
+            condition: SUCCESSFUL
+            projects:
+                - name: 'kvmfornfv-packet_forward-daily-test-{stream}'
                   current-parameters: false
                   node-parameters: false
                   git-revision: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
-
 
 - job-template:
-    name: 'kvmfornfv-daily-{phase}-{stream}'
+    name: 'kvmfornfv-{testname}-daily-{phase}-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -254,11 +278,15 @@
         - '{slave-label}-defaults'
         - 'kvmfornfv-defaults':
             gs-pathname: '{gs-pathname}'
+        - string:
+            name: TEST_NAME
+            default: '{testname}'
+            description: "Daily job to execute kvmfornfv '{testname}' testcase."
 
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
-        - '{project}-daily-{phase}-macro'
+        - '{project}-{testname}-daily-{phase}-macro'
 #####################################
 # builder macros
 #####################################
@@ -277,20 +305,33 @@
         - shell:
             !include-raw: ./kvmfornfv-test.sh
 - builder:
-    name: 'kvmfornfv-daily-build-macro'
+    name: 'kvmfornfv-cyclictest-daily-build-macro'
     builders:
         - shell:
             !include-raw: ./kvmfornfv-build.sh
         - shell:
             !include-raw: ./kvmfornfv-upload-artifact.sh
 - builder:
-    name: 'kvmfornfv-daily-test-macro'
+    name: 'kvmfornfv-cyclictest-daily-test-macro'
+    builders:
+        - shell:
+            !include-raw: ./kvmfornfv-download-artifact.sh
+        - shell:
+            !include-raw: ./kvmfornfv-test.sh
+- builder:
+    name: 'kvmfornfv-packet_forward-daily-build-macro'
+    builders:
+        - shell:
+            !include-raw: ./kvmfornfv-build.sh
+        - shell:
+            !include-raw: ./kvmfornfv-upload-artifact.sh
+- builder:
+    name: 'kvmfornfv-packet_forward-daily-test-macro'
     builders:
         - shell:
             !include-raw: ./kvmfornfv-download-artifact.sh
         - shell:
             !include-raw: ./kvmfornfv-test.sh
-
 #####################################
 # parameter macros
 #####################################