Merge "Add sfc features and update carbon project branch"

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 75237d852d891035b6caac7d5cef1e9db32a76ae..ab8cf510ddee523b22dbb8f126eb93b0b76b8d0a 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -44,9 +44,9 @@
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts}'
         - integration-branch:
-            branch: 'stable/beryllium'
+            branch: 'stable/boron'
         - integration-distribution-stream:
-            stream: 'beryllium'
+            stream: 'boron'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -56,12 +56,11 @@
         - integration-test-options:
             test-options: '{robot-options}'
         - integration-stream-test-plan:
-            stream-test-plan: '{project}-{functionality}-beryllium.txt'
+            stream-test-plan: '{project}-{functionality}-boron.txt'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
-            # TODO: Switch to openjdk8 from Boron on.
+            jdkversion: 'openjdk8'
 
     scm:
         - integration-gerrit-scm:
@@ -106,7 +105,7 @@
         - email-notification:
             email-prefix: '[{project}]'
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -217,7 +216,7 @@
                 display-table: true
                 format: csv
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -327,7 +326,7 @@
                 display-table: true
                 format: csv
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -350,9 +349,9 @@
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts}'
         - integration-branch:
-            branch: 'stable/beryllium'
+            branch: 'stable/boron'
         - integration-distribution-stream:
-            stream: 'beryllium'
+            stream: 'boron'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -362,12 +361,11 @@
         - integration-test-options:
             test-options: '{robot-options}'
         - integration-stream-test-plan:
-            stream-test-plan: '{project}-{functionality}-beryllium.txt'
+            stream-test-plan: '{project}-{functionality}-boron.txt'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
-            # TODO: Switch to openjdk8 from Boron on.
+            jdkversion: 'openjdk8'
 
     scm:
         - integration-gerrit-scm:
@@ -413,7 +411,7 @@
         - email-notification:
             email-prefix: '[{project}]'
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -525,7 +523,7 @@
                 display-table: true
                 format: csv
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -637,7 +635,7 @@
                 display-table: true
                 format: csv
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -748,7 +746,7 @@
                 display-table: true
                 format: csv
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -861,7 +859,7 @@
         - email-notification:
             email-prefix: '[{project}]'
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -980,7 +978,7 @@
         - email-notification:
             email-prefix: '[{project}]'
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 # Template: {project}-patch-test-{stream}
@@ -989,7 +987,7 @@
 # triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
 
 - job-template:
-    name: '{project}-patch-test-{stream}'
+    name: '{project}-patch-test-{feature}-{stream}'
 
     project-type: maven
     node: centos7-java-builder-2c-8g
@@ -1010,6 +1008,10 @@
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-git-url
+        - string:
+            name: feature
+            default: 'all'
+            description: 'Specific feature test for patch'
 
     scm:
         - integration-gerrit-scm:
@@ -1028,7 +1030,9 @@
             server-name: 'OpenDaylight'
             trigger-on:
                 - comment-added-contains-event:
-                    comment-contains-value: 'test-{project}'
+                    comment-contains-value: 'test-{project}-all'
+                - comment-added-contains-event:
+                    comment-contains-value: 'test-{project}-{feature}'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'