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 d94f030517584d8caacab82a3a4d31d8c9dbdbf4..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,119 @@
                 display-table: true
                 format: csv
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
+
+- job-template:
+    name: '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
+    disabled: false
+
+    project-type: freestyle
+    node: centos7-robot-2c-2g
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
+
+    parameters:
+        - opendaylight-infra-parameters:
+            project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
+        - integration-branch:
+            branch: '{branch}'
+        - integration-distribution-stream:
+            stream: '{stream}'
+        - integration-bundleurl:
+            bundleurl: 'last'
+        - integration-controller-scope:
+            controller-scope: '{scope}'
+        - integration-controller-features:
+            controller-features: 'odl-jolokia,{install-features}'
+        - integration-test-options:
+            test-options: '{robot-options}'
+        - integration-stream-test-plan:
+            stream-test-plan: '{project}-{functionality}-{stream}.txt'
+        - integration-test-plan:
+            test-plan: '{project}-{functionality}.txt'
+        - integration-patch-refspec:
+            branch: 'master'
+        - integration-jdk-version:
+            jdkversion: '{jre}'
+
+    scm:
+        - integration-gerrit-scm:
+            basedir: 'test'
+            refspec: '$PATCHREFSPEC'
+            branch: 'master'
+
+    wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+        - integration-jclouds-controller-docker:
+            controller-image: '{controller-image}'
+            controller-vms: 3
+            docker-image: '{docker-image}'
+            docker-vms: 1
+
+    triggers:
+        - integration-csit-{install}:
+            jobs: '{trigger-jobs}'
+
+    builders:
+        - integration-copy-ssh-keys
+        - integration-cleanup-workspace
+        - integration-install-robotframework
+        - inject:
+            properties-file: 'env.properties'
+        - integration-get-slave-addresses
+        - inject:
+            properties-file: 'slave_addresses.txt'
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
+        - integration-configure-clustering
+        - integration-start-cluster-run-test
+        - integration-cleanup-tmp
+
+    publishers:
+        - integration-robot:
+            unstable-if: 0.0
+            pass-if: 100.0
+        - email-notification:
+            email-prefix: '[{project}]'
+        - plot:
+          - title: '{01-plot-title}'
+            yaxis: '{01-plot-yaxis}'
+            group: '{01-plot-group}'
+            num-builds: '5400'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            series:
+              - file: '{01-plot-data-file}'
+                inclusion-flag: 'off'
+                display-table: true
+                format: csv
+          - title: '{02-plot-title}'
+            yaxis: '{02-plot-yaxis}'
+            group: '{02-plot-group}'
+            num-builds: '5400'
+            keep-records: true
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            series:
+              - file: '{02-plot-data-file}'
+                inclusion-flag: 'off'
+                display-table: true
+                format: csv
+        - integration-csit-archive-build
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -636,7 +746,7 @@
                 display-table: true
                 format: csv
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -688,6 +798,10 @@
             name: ODL_ENABLE_L3_FWD
             default: '{odl-enable-l3}'
             description: 'Enable L3 FWD in ODL for createing br-ex'
+        - string:
+            name: PUBLIC_BRIDGE
+            default: '{public-bridge}'
+            description: 'Specifies public bridge for provider and external networking'
         - string:
             name: ENABLE_OS_SERVICES
             default: '{enable-openstack-services}'
@@ -700,6 +814,10 @@
             name: TENANT_NETWORK_TYPE
             default: '{tenant-network-type}'
             description: 'Tenant Network Type supported by the implementation'
+        - string:
+            name: SECURITY_GROUP_MODE
+            default: '{security-group-mode}'
+            description: 'Security Group Mode to be used in netvirt aclservice config'
     scm:
         - integration-gerrit-scm:
             basedir: 'test'
@@ -735,13 +853,13 @@
         - integration-cleanup-tmp
 
     publishers:
-        - integration-robot:
+        - integration-robot-tempest:
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
             email-prefix: '[{project}]'
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -793,6 +911,10 @@
             name: ODL_ENABLE_L3_FWD
             default: '{odl-enable-l3}'
             description: 'Enable L3 FWD in ODL for createing br-ex'
+        - string:
+            name: PUBLIC_BRIDGE
+            default: '{public-bridge}'
+            description: 'Specifies public bridge for provider and external networking'
         - string:
             name: ENABLE_HAPROXY_FOR_NEUTRON
             default: '{enable-haproxy}'
@@ -809,6 +931,11 @@
             name: TENANT_NETWORK_TYPE
             default: '{tenant-network-type}'
             description: 'Tenant Network Type supported by the implementation'
+        - string:
+            name: SECURITY_GROUP_MODE
+            default: '{security-group-mode}'
+            description: 'Security Group Mode to be used in netvirt aclservice config'
+
     scm:
         - integration-gerrit-scm:
             basedir: 'test'
@@ -845,13 +972,13 @@
         - integration-cleanup-tmp
 
     publishers:
-        - integration-robot:
+        - integration-robot-tempest:
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
             email-prefix: '[{project}]'
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 # Template: {project}-patch-test-{stream}
@@ -860,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
@@ -881,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:
@@ -899,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}'
@@ -954,3 +1087,6 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+
+
+