X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=4426e6b290a010111ec728bfb608a535aee807a6;hb=82024e6aca3c36bbee4e00f34e91f79367955a7a;hp=77eecbbe726a35179d432e8664540a57fe02c8a0;hpb=2091dd357bf42105974dbe11f4b98115152a6ccb;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 77eecbbe7..4426e6b29 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1,5 +1,5 @@
 # Job templates in this file (please update with every new template):
-# 
+#
 # Old templates:
 # {project}-csit-verify-1node-{functionality}-{stream}
 # {project}-csit-1node-imds-{functionality}-{install}-{stream}
@@ -29,6 +29,7 @@
 
 - job-template:
     name: '{project}-csit-verify-1node-{functionality}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -54,6 +55,8 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -68,6 +71,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -79,6 +83,10 @@
             pattern: 'csit/suites/{project}/**'
 
     builders:
+        - integration-cleanup-workspace
+        - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
@@ -86,18 +94,20 @@
         - inject:
             properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-run-test
+        - integration-cleanup-tmp
 
     publishers:
         - integration-robot:
             unstable-if: 0.0
-            pass-if: 0.0
+            pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: 'karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
 
 - job-template:
     name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -125,6 +135,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'stable/helium'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -139,16 +151,21 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
 
+
     triggers:
-        - reverse:
+        - integration-csit-{install}:
             jobs: '{trigger-jobs}'
-            result: 'success'
 
     builders:
+        - integration-cleanup-workspace
+        - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
@@ -156,13 +173,14 @@
         - inject:
             properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-run-test
+        - integration-cleanup-tmp
 
     publishers:
         - integration-robot:
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: 'karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -197,6 +215,7 @@
 
 - job-template:
     name: '{project}-csit-verify-1node-{functionality}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -211,7 +230,7 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
-            branch: 'master'
+            branch: 'stable/beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -222,6 +241,9 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-jdk-version:
+            # Here {jdk} is taken from releng-defaults.yaml
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -236,6 +258,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -247,6 +270,10 @@
             pattern: 'csit/suites/{project}/**'
 
     builders:
+        - integration-cleanup-workspace
+        - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
@@ -254,18 +281,20 @@
         - inject:
             properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-run-test
+        - integration-cleanup-tmp
 
     publishers:
         - integration-robot:
             unstable-if: 0.0
-            pass-if: 0.0
+            pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: 'karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
 
 - job-template:
     name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -293,6 +322,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -307,16 +338,20 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
 
     triggers:
-        - reverse:
+        - integration-csit-{install}:
             jobs: '{trigger-jobs}'
-            result: 'success'
 
     builders:
+        - integration-cleanup-workspace
+        - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
@@ -324,13 +359,14 @@
         - inject:
             properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-run-test
+        - integration-cleanup-tmp
 
     publishers:
         - integration-robot:
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: 'karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -361,6 +397,7 @@
 
 - job-template:
     name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -388,6 +425,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -401,6 +440,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -409,6 +449,10 @@
         - timed: '{schedule}'
 
     builders:
+        - integration-cleanup-workspace
+        - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
@@ -416,13 +460,14 @@
         - inject:
             properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-run-test
+        - integration-cleanup-tmp
 
     publishers:
         - integration-robot:
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log'
+            artifacts: '*.log,karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -453,6 +498,7 @@
 
 - job-template:
     name: '{project}-csit-verify-3node-{functionality}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -467,7 +513,7 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
-            branch: 'master'
+            branch: 'stable/beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -478,6 +524,8 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -492,6 +540,7 @@
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -503,6 +552,10 @@
             pattern: 'csit/suites/{project}/**'
 
     builders:
+        - integration-cleanup-workspace
+        - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
@@ -512,17 +565,20 @@
         - integration-deploy-controller
         - integration-configure-clustering
         - integration-start-cluster-run-test
+        - integration-cleanup-tmp
+
     publishers:
         - integration-robot:
             unstable-if: 0.0
-            pass-if: 0.0
+            pass-if: 100.0
         - archive:
-            artifacts: '*karaf.log'
+            artifacts: '*karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
 
 - job-template:
     name: '{project}-csit-3node-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -550,6 +606,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -564,16 +622,20 @@
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
 
     triggers:
-        - reverse:
+        - integration-csit-{install}:
             jobs: '{trigger-jobs}'
-            result: 'success'
 
     builders:
+        - integration-cleanup-workspace
+        - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
@@ -583,13 +645,14 @@
         - integration-deploy-controller
         - integration-configure-clustering
         - integration-start-cluster-run-test
+        - integration-cleanup-tmp
 
     publishers:
         - integration-robot:
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*karaf.log'
+            artifacts: '*karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -620,6 +683,7 @@
 
 - job-template:
     name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -647,6 +711,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -660,6 +726,7 @@
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -668,6 +735,10 @@
         - timed: '{schedule}'
 
     builders:
+        - integration-cleanup-workspace
+        - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
@@ -677,13 +748,14 @@
         - integration-deploy-controller
         - integration-configure-clustering
         - integration-start-cluster-run-test
+        - integration-cleanup-tmp
 
     publishers:
         - integration-robot:
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*karaf.log'
+            artifacts: '*karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
         - plot: