X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fkvmfornfv%2Fkvmfornfv.yml;h=e5b56bf9b0be42c39e2562089a9a16d1ea928e7d;hb=f516cba24f649483a15b20da19ba89afe658d07d;hp=a782ee0fa760c10703622cd6397777569df32e5c;hpb=55c3c221b98fdef67cb074818b8652fc1ef76956;p=releng.git

diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index a782ee0fa..e5b56bf9b 100644
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -11,7 +11,7 @@
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: false
+            disabled: true
 #####################################
 # patch verification phases
 #####################################
@@ -34,7 +34,8 @@
         - 'kvmfornfv-verify-{phase}-{stream}'
         - 'kvmfornfv-merge-{stream}'
         - 'kvmfornfv-daily-{stream}'
-        - 'kvmfornfv-{testname}-daily-{phase}-{stream}'
+        - 'kvmfornfv-daily-build-{stream}'
+        - 'kvmfornfv-{testname}-daily-test-{stream}'
 #####################################
 # job templates
 #####################################
@@ -79,6 +80,10 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                disable-strict-forbidden-file-verification: 'true'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**'
 
     builders:
         - description-setter:
@@ -205,7 +210,7 @@
             name: cyclictest-build
             condition: SUCCESSFUL
             projects:
-                - name: 'kvmfornfv-cyclictest-daily-build-{stream}'
+                - name: 'kvmfornfv-daily-build-{stream}'
                   current-parameters: false
                   node-parameters: false
                   git-revision: true
@@ -221,16 +226,6 @@
                   git-revision: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
-        - multijob:
-            name: packetforward-build
-            condition: SUCCESSFUL
-            projects:
-                - name: 'kvmfornfv-packet_forward-daily-build-{stream}'
-                  current-parameters: false
-                  node-parameters: false
-                  git-revision: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
         - multijob:
             name: packetforward-test
             condition: SUCCESSFUL
@@ -243,7 +238,7 @@
                   abort-all-job: true
 
 - job-template:
-    name: 'kvmfornfv-{testname}-daily-{phase}-{stream}'
+    name: 'kvmfornfv-daily-build-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -261,7 +256,39 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
-        - '{slave-label}-defaults'
+        - 'opnfv-build-ubuntu-defaults'
+        - 'kvmfornfv-defaults':
+            gs-pathname: '{gs-pathname}'
+        - string:
+            name: PHASE
+            default: 'build'
+            description: "Execution of kvmfornfv daily 'build' job ."
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - '{project}-daily-build-macro'
+
+- job-template:
+    name: 'kvmfornfv-{testname}-daily-test-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    scm:
+        - git-scm
+
+    wrappers:
+        - ssh-agent-wrapper
+        - timeout:
+            timeout: 360
+            fail: true
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - 'intel-pod10-defaults'
         - 'kvmfornfv-defaults':
             gs-pathname: '{gs-pathname}'
         - string:
@@ -270,13 +297,13 @@
             description: "Daily job to execute kvmfornfv '{testname}' testcase."
         - string:
             name: PHASE
-            default: '{phase}'
-            description: "Execution of kvmfornfv daily '{phase}' job ."
+            default: 'test'
+            description: "Execution of kvmfornfv daily 'test' job ."
 
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
-        - '{project}-{testname}-daily-{phase}-macro'
+        - '{project}-{testname}-daily-test-macro'
 #####################################
 # builder macros
 #####################################
@@ -295,7 +322,7 @@
         - shell:
             !include-raw: ./kvmfornfv-test.sh
 - builder:
-    name: 'kvmfornfv-cyclictest-daily-build-macro'
+    name: 'kvmfornfv-daily-build-macro'
     builders:
         - shell:
             !include-raw: ./kvmfornfv-build.sh
@@ -310,13 +337,6 @@
             !include-raw: ./kvmfornfv-test.sh
         - shell:
             !include-raw: ./kvmfornfv-upload-artifact.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: