X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fkvmfornfv%2Fkvmfornfv.yml;h=e5b56bf9b0be42c39e2562089a9a16d1ea928e7d;hb=bfc2988539f85cd792390e36e24c485fec3ffa7f;hp=fdce301a44a8e1074d3a85b102e2cfaae1e042b9;hpb=8cb5166cee8f446b9759d27e77192a19f94bdddc;p=releng.git

diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index fdce301a4..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
 #####################################
@@ -19,7 +19,7 @@
         - 'build':
             slave-label: 'opnfv-build-ubuntu'
         - 'test':
-            slave-label: 'intel-pod1'
+            slave-label: 'intel-pod10'
 #####################################
 # 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
 #####################################
@@ -57,7 +58,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
@@ -80,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:
@@ -91,25 +95,25 @@
                 - name: 'kvmfornfv-verify-build-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    BRANCH=$BRANCH
+                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                  node-parameters: false
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+        - multijob:
+            name: test
+            condition: SUCCESSFUL
+            projects:
+                - name: 'kvmfornfv-verify-test-{stream}'
+                  current-parameters: false
+                  predefined-parameters: |
+                    BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                   node-parameters: false
                   kill-phase-on: FAILURE
                   abort-all-job: true
-#        - multijob:
-#            name: test
-#            condition: SUCCESSFUL
-#            projects:
-#                - name: 'kvmfornfv-verify-test-{stream}'
-#                  current-parameters: false
-#                  predefined-parameters: |
-#                    GERRIT_BRANCH=$GERRIT_BRANCH
-#                    GERRIT_REFSPEC=$GERRIT_REFSPEC
-#                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-#                  node-parameters: false
-#                  kill-phase-on: FAILURE
-#                  abort-all-job: true
 - job-template:
     name: 'kvmfornfv-verify-{phase}-{stream}'
 
@@ -128,11 +132,14 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - '{slave-label}-defaults'
         - 'kvmfornfv-defaults':
             gs-pathname: '{gs-pathname}'
+        - string:
+            name: PHASE
+            default: '{phase}'
+            description: "Execution of kvmfornfv daily '{phase}' job ."
 
     builders:
         - description-setter:
@@ -147,7 +154,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - 'kvmfornfv-defaults':
@@ -186,7 +192,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - 'kvmfornfv-defaults':
@@ -195,8 +200,8 @@
     scm:
         - git-scm
 
-#    triggers:
-#        - timed: '@midnight'
+    triggers:
+        - timed: '@midnight'
 
     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}'
 
@@ -260,20 +255,55 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             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:
             name: TEST_NAME
             default: '{testname}'
             description: "Daily job to execute kvmfornfv '{testname}' testcase."
+        - string:
+            name: PHASE
+            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
 #####################################
@@ -292,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
@@ -305,11 +335,6 @@
             !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: