X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=4426e6b290a010111ec728bfb608a535aee807a6;hb=92edcb7273183a92cc329b2d9d016b41d6d896e1;hp=9833f911e5b08aa9ca0791d382a13c428cba4cef;hpb=0dd3e4137a32a69c009b314aed1075e59013e3e3;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 9833f911e..4426e6b29 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -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:
@@ -104,6 +107,7 @@
 
 - job-template:
     name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -131,6 +135,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'stable/helium'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -150,10 +156,10 @@
             users:
                 - '{ssh-credentials}'
 
+
     triggers:
-        - reverse:
+        - integration-csit-{install}:
             jobs: '{trigger-jobs}'
-            result: 'success'
 
     builders:
         - integration-cleanup-workspace
@@ -209,6 +215,7 @@
 
 - job-template:
     name: '{project}-csit-verify-1node-{functionality}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -223,7 +230,7 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
-            branch: 'master'
+            branch: 'stable/beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -234,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:
@@ -284,6 +294,7 @@
 
 - job-template:
     name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -311,6 +322,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -331,9 +344,8 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - reverse:
+        - integration-csit-{install}:
             jobs: '{trigger-jobs}'
-            result: 'success'
 
     builders:
         - integration-cleanup-workspace
@@ -385,6 +397,7 @@
 
 - job-template:
     name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -412,6 +425,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -452,7 +467,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log*'
+            artifacts: '*.log,karaf.log*'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -483,6 +498,7 @@
 
 - job-template:
     name: '{project}-csit-verify-3node-{functionality}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -497,7 +513,7 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
-            branch: 'master'
+            branch: 'stable/beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -508,6 +524,8 @@
             test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -560,6 +578,7 @@
 
 - job-template:
     name: '{project}-csit-3node-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -587,6 +606,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
@@ -607,9 +628,8 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - reverse:
+        - integration-csit-{install}:
             jobs: '{trigger-jobs}'
-            result: 'success'
 
     builders:
         - integration-cleanup-workspace
@@ -663,6 +683,7 @@
 
 - job-template:
     name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+    disabled: false
 
     project-type: freestyle
     node: dynamic_robot
@@ -690,6 +711,8 @@
             test-plan: '{project}-{functionality}.txt'
         - integration-patch-refspec:
             branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm: