Merge "jjb: infra: bifrost-verify.sh: Replace 'exit' with 'return'"

[releng.git] / jjb / kvmfornfv / kvmfornfv.yml

diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index 4bb0a15..fdce301 100644 (file)
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -8,7 +8,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false
@@ -22,12 +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-{testname}-daily-{phase}-{stream}'
 #####################################
 # job templates
 #####################################
@@ -41,6 +48,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 3
@@ -55,6 +63,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -88,20 +97,19 @@
                   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
-
+#        - 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}'
 
@@ -110,15 +118,10 @@
     concurrent: true
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
         - timeout:
             timeout: 360
             fail: true
@@ -151,13 +154,11 @@
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -192,19 +193,87 @@
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
-    triggers:
-         - timed: '@midnight'
+#    triggers:
+#        - timed: '@midnight'
 
     builders:
-        - shell:
-            !include-raw-escape: ./kvmfornfv-build.sh
-        - shell:
-            !include-raw-escape: ./kvmfornfv-upload-artifact.sh
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - multijob:
+            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
+        - multijob:
+            name: cyclictest-test
+            condition: SUCCESSFUL
+            projects:
+                - 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: 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
+            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-{testname}-daily-{phase}-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    scm:
+        - git-scm
+
+    wrappers:
+        - ssh-agent-wrapper
+        - timeout:
+            timeout: 360
+            fail: true
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - '{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}-{testname}-daily-{phase}-macro'
 #####################################
 # builder macros
 #####################################
@@ -222,6 +291,34 @@
             !include-raw: ./kvmfornfv-download-artifact.sh
         - shell:
             !include-raw: ./kvmfornfv-test.sh
+- builder:
+    name: 'kvmfornfv-cyclictest-daily-build-macro'
+    builders:
+        - shell:
+            !include-raw: ./kvmfornfv-build.sh
+        - shell:
+            !include-raw: ./kvmfornfv-upload-artifact.sh
+- builder:
+    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
 #####################################