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 53f2e22..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
@@ -48,6 +48,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 3
@@ -62,6 +63,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -95,19 +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}'
 
@@ -116,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
@@ -157,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:
@@ -198,32 +193,49 @@
             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:
         - description-setter:
             description: "Built on $NODE_NAME"
         - multijob:
-            name: build
+            name: cyclictest-build
             condition: SUCCESSFUL
             projects:
-                - name: 'kvmfornfv-{testname}-daily-build-{stream}'
+                - 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: build
+            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-{testname}-daily-test-{stream}'
+                - name: 'kvmfornfv-packet_forward-daily-test-{stream}'
                   current-parameters: false
                   node-parameters: false
                   git-revision: true
@@ -238,15 +250,10 @@
     concurrent: false
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
         - timeout:
             timeout: 360
             fail: true