X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=9d4dc33bc68f01d27924102e651811bb7f5db56a;hb=8651b7df8d4f0973c495691389ec872e49d2955c;hp=7c6a1276d3f6d12fc3d08b70b2382ca304c6a869;hpb=d40ea95e813e25a7fa74f6338f9ace394e22ffde;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 7c6a1276d..9d4dc33bc 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1,9 +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}
-#
 # New (for Be release):
 # {project}-csit-verify-1node-{functionality}
 # {project}-csit-1node-{functionality}-{install}-{stream}
@@ -15,20 +11,21 @@
 # Parameters:
 #
 # project-parameter: main project integration/test ($PROJECT)
+# jre: (openjdk7 or openjdk8) Java runtime environment to use when launching ODL
 # integration-branch: distribution branch ($BRANCH)
 # integration-controller-bundleurl: distribution URL ($BUNDLEURL)
 # integration-controller-scope: only or all features ($CONTROLLERSCOPE)
 # integration-controller-features: features under test ($CONTROLLER FEATURES)
 # integration-test-options: robot options ($TESTOPTIONS)
-# integration-test-plan: robot test plan ($TESTPLAN)
+# integration-stream-test-plan: stream specific robot test plan ($STREAMTESTPLAN)
+# integration-test-plan: fallback robot test plan ($TESTPLAN)
 # integration-patch-refspec: test branch ($PATCHREFSPEC)
 
 
-
-# Old templates
+# New templates
 
 - job-template:
-    name: '{project}-csit-verify-1node-{functionality}-{stream}'
+    name: '{project}-csit-verify-1node-{functionality}'
     disabled: false
 
     project-type: freestyle
@@ -44,7 +41,9 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
-            branch: 'master'
+            branch: 'stable/beryllium'
+        - integration-distribution-stream:
+            stream: 'beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -53,10 +52,13 @@
             controller-features: '{install-features}'
         - integration-test-options:
             test-options: '{robot-options}'
+        - integration-stream-test-plan:
+            stream-test-plan: '{project}-{functionality}-beryllium.txt'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
             jdkversion: 'openjdk7'
+            # TODO: Switch to openjdk8 from Boron on.
 
     scm:
         - integration-gerrit-scm:
@@ -79,7 +81,7 @@
     triggers:
         - integration-trigger-patch-submitted:
             name: 'integration/test'
-            branch: '{branch}'
+            branch: 'master'
             pattern: 'csit/suites/{project}/**'
 
     builders:
@@ -101,12 +103,12 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[{project}]'
 
 - job-template:
-    name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}'
+    name: '{project}-csit-1node-{functionality}-{install}-{stream}'
     disabled: false
 
     project-type: freestyle
@@ -123,6 +125,8 @@
             project: 'integration/test'
         - integration-branch:
             branch: '{branch}'
+        - integration-distribution-stream:
+            stream: '{stream}'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -131,12 +135,14 @@
             controller-features: '{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: 'stable/helium'
+            branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -156,7 +162,6 @@
             users:
                 - '{ssh-credentials}'
 
-
     triggers:
         - integration-csit-{install}:
             jobs: '{trigger-jobs}'
@@ -180,7 +185,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -190,8 +195,7 @@
             num-builds: '5400'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
-            keep-records: true
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
                 inclusion-flag: 'off'
@@ -203,18 +207,15 @@
             num-builds: '5400'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-1node-imds-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
-            keep-records: true
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'
                 display-table: true
                 format: csv
 
-# New templates
-
 - job-template:
-    name: '{project}-csit-verify-1node-{functionality}'
+    name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
     disabled: false
 
     project-type: freestyle
@@ -230,19 +231,129 @@
         - project-parameter:
             project: 'integration/test'
         - integration-branch:
+            branch: '{branch}'
+        - integration-distribution-stream:
+            stream: '{stream}'
+        - integration-bundleurl:
+            bundleurl: 'last'
+        - integration-controller-scope:
+            controller-scope: '{scope}'
+        - integration-controller-features:
+            controller-features: '{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:
+            credentials-id: '{ssh-credentials}'
+            basedir: 'test'
+            refspec: '$PATCHREFSPEC'
             branch: 'master'
+
+    wrappers:
+        - integration-jclouds-controller-mininet:
+            controller-vms: 1
+            mininet-image: '{mininet-image}'
+            mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - timed: '{schedule}'
+
+    builders:
+        - 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-deploy-controller-run-test
+        - integration-cleanup-tmp
+
+    publishers:
+        - integration-robot:
+            unstable-if: 0.0
+            pass-if: 100.0
+        - archive:
+            artifacts: '*.log,*.log.xz'
+        - email-notification:
+            email-prefix: '[{project}]'
+        - plot:
+          - title: '{01-plot-title}'
+            yaxis: '{01-plot-yaxis}'
+            group: '{01-plot-group}'
+            num-builds: '180'
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-periodic-1node-{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: '180'
+            style: line
+            use-description: false
+            csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            series:
+              - file: '{02-plot-data-file}'
+                inclusion-flag: 'off'
+                display-table: true
+                format: csv
+
+- job-template:
+    name: '{project}-csit-verify-3node-{functionality}'
+    disabled: false
+
+    project-type: freestyle
+    node: dynamic_robot
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration/test'
+        - integration-branch:
+            branch: 'stable/beryllium'
+        - integration-distribution-stream:
+            stream: 'beryllium'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
             controller-scope: 'only'
         - integration-controller-features:
-            controller-features: '{install-features}'
+            controller-features: 'odl-jolokia,{install-features}'
         - integration-test-options:
             test-options: '{robot-options}'
+        - integration-stream-test-plan:
+            stream-test-plan: '{project}-{functionality}-beryllium.txt'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
             jdkversion: 'openjdk7'
+            # TODO: Switch to openjdk8 from Boron on.
 
     scm:
         - integration-gerrit-scm:
@@ -254,7 +365,7 @@
     wrappers:
         - build-timeout
         - integration-jclouds-controller-mininet:
-            controller-vms: 1
+            controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
             mininet-cloud-name: '{mininet-cloud-name}'
@@ -279,7 +390,8 @@
         - integration-get-bundle-vars
         - inject:
             properties-file: 'bundle_vars.txt'
-        - integration-deploy-controller-run-test
+        - integration-configure-clustering
+        - integration-start-cluster-run-test
         - integration-cleanup-tmp
 
     publishers:
@@ -287,12 +399,12 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[{project}]'
 
 - job-template:
-    name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+    name: '{project}-csit-3node-{functionality}-{install}-{stream}'
     disabled: false
 
     project-type: freestyle
@@ -309,20 +421,24 @@
             project: 'integration/test'
         - integration-branch:
             branch: '{branch}'
+        - integration-distribution-stream:
+            stream: '{stream}'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
             controller-scope: '{scope}'
         - integration-controller-features:
-            controller-features: '{install-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: 'openjdk7'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -334,7 +450,7 @@
     wrappers:
         - build-timeout
         - integration-jclouds-controller-mininet:
-            controller-vms: 1
+            controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
             mininet-cloud-name: '{mininet-cloud-name}'
@@ -357,7 +473,8 @@
         - integration-get-bundle-vars
         - inject:
             properties-file: 'bundle_vars.txt'
-        - integration-deploy-controller-run-test
+        - integration-configure-clustering
+        - integration-start-cluster-run-test
         - integration-cleanup-tmp
 
     publishers:
@@ -365,7 +482,7 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
@@ -375,7 +492,7 @@
             num-builds: '5400'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
                 inclusion-flag: 'off'
@@ -387,7 +504,7 @@
             num-builds: '5400'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'
@@ -395,7 +512,7 @@
                 format: csv
 
 - job-template:
-    name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+    name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
     disabled: false
 
     project-type: freestyle
@@ -412,20 +529,24 @@
             project: 'integration/test'
         - integration-branch:
             branch: '{branch}'
+        - integration-distribution-stream:
+            stream: '{stream}'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
             controller-scope: '{scope}'
         - integration-controller-features:
-            controller-features: '{install-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: 'openjdk7'
+            jdkversion: '{jre}'
 
     scm:
         - integration-gerrit-scm:
@@ -436,7 +557,7 @@
 
     wrappers:
         - integration-jclouds-controller-mininet:
-            controller-vms: 1
+            controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
             mininet-cloud-name: '{mininet-cloud-name}'
@@ -458,7 +579,8 @@
         - integration-get-bundle-vars
         - inject:
             properties-file: 'bundle_vars.txt'
-        - integration-deploy-controller-run-test
+        - integration-configure-clustering
+        - integration-start-cluster-run-test
         - integration-cleanup-tmp
 
     publishers:
@@ -466,17 +588,17 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*.log,karaf.log*'
+            artifacts: '*.log,*.log.xz'
         - email-notification:
             email-prefix: '[{project}]'
         - plot:
           - title: '{01-plot-title}'
             yaxis: '{01-plot-yaxis}'
             group: '{01-plot-group}'
-            num-builds: '180'
+            num-builds: '5400'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
                 inclusion-flag: 'off'
@@ -485,10 +607,10 @@
           - title: '{02-plot-title}'
             yaxis: '{02-plot-yaxis}'
             group: '{02-plot-group}'
-            num-builds: '180'
+            num-builds: '5400'
             style: line
             use-description: false
-            csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'
@@ -496,8 +618,7 @@
                 format: csv
 
 - job-template:
-    name: '{project}-csit-verify-3node-{functionality}'
-    disabled: false
+    name: '{project}-openstack-{functionality}-daily-{openstack}-{odl}'
 
     project-type: freestyle
     node: dynamic_robot
@@ -511,59 +632,54 @@
     parameters:
         - project-parameter:
             project: 'integration/test'
-        - integration-branch:
+        - integration-patch-refspec:
             branch: 'master'
-        - integration-bundleurl:
-            bundleurl: 'last'
-        - integration-controller-scope:
-            controller-scope: 'only'
-        - integration-controller-features:
-            controller-features: 'odl-mdsal-clustering,{install-features}'
-        - integration-test-options:
-            test-options: '{robot-options}'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
-        - integration-jdk-version:
-            jdkversion: 'openjdk7'
+        - string:
+            name: OPENSTACK_BRANCH
+            default: '{openstack-branch}'
+            description: 'Openstack branch to use with devstack'
+        - string:
+            name: ODL_VERSION
+            default: '{odl-version}'
+            description: 'OpenDaylight version to use with devstack + networking_odl project'
+        - string:
+            name: TEMPEST_REGEX
+            default: 'tempest.api.network'
+            description: 'Default grouping of tempest tests to run'
 
     scm:
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
             basedir: 'test'
-            refspec: '$GERRIT_REFSPEC'
+            refspec: '$PATCHREFSPEC'
             branch: 'master'
 
     wrappers:
-        - build-timeout
-        - integration-jclouds-controller-mininet:
-            controller-vms: 3
-            mininet-image: '{mininet-image}'
-            mininet-vms: '{mininet-vms}'
-            mininet-cloud-name: '{mininet-cloud-name}'
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
+          - build-timeout
+          - jclouds:
+              instances:
+                - rk-c7-devstack:
+                    cloud-name: 'Rackspace DFW - Devstack'
+                    count: '1'
+                    stop-on-terminate: False
+          - ssh-agent-credentials:
+              users:
+                  - '{ssh-credentials}'
+
+    # Trigger jobs (daily)
     triggers:
-        - integration-trigger-patch-submitted:
-            name: 'integration/test'
-            branch: 'master'
-            pattern: 'csit/suites/{project}/**'
+        - integration-csit-all
 
     builders:
-        - 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-deploy-controller
-        - integration-configure-clustering
-        - integration-start-cluster-run-test
+        - include-raw-integration-deploy-devstack-testing
         - integration-cleanup-tmp
 
     publishers:
@@ -571,12 +687,12 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*karaf.log*'
+            artifacts: '*log*'
         - email-notification:
             email-prefix: '[{project}]'
 
 - job-template:
-    name: '{project}-csit-3node-{functionality}-{install}-{stream}'
+    name: '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
     disabled: false
 
     project-type: freestyle
@@ -593,21 +709,34 @@
             project: 'integration/test'
         - 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-mdsal-clustering,{install-features}'
-        - integration-test-options:
-            test-options: '{robot-options}'
+            controller-features: '{install-features}'
         - integration-test-plan:
-            test-plan: '{project}-{functionality}.txt'
+            test-plan: '{project}-1node-openstack.txt'
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
-
+            jdkversion: '{jre}'
+        - string:
+            name: OPENSTACK_BRANCH
+            default: '{openstack-branch}'
+            description: 'Openstack version to use with devstack'
+        - string:
+            name: ODL_ML2_DRIVER_REPO
+            default: 'https://github.com/openstack/networking-odl'
+            description: 'URL to fetch networking-odl driver'
+        - string:
+            name: ODL_ML2_VERSION
+            default: '{odl-ml2-version}'
+            description: 'Version of networking-odl to checkout from the repo'
+        - string:
+            name: ODL_ENABLE_L3_FWD
+            default: '{odl-enable-l3}'
+            description: 'Enable L3 FWD in ODL for createing br-ex'
     scm:
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
@@ -617,18 +746,15 @@
 
     wrappers:
         - build-timeout
-        - integration-jclouds-controller-mininet:
-            controller-vms: 3
-            mininet-image: '{mininet-image}'
-            mininet-vms: '{mininet-vms}'
-            mininet-cloud-name: '{mininet-cloud-name}'
+        - integration-jclouds-controller-devstack:
+            controller-vms: 1
+            openstack-vms: '{openstack-vms}'
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+              - '{ssh-credentials}'
 
     triggers:
-        - integration-csit-{install}:
-            jobs: '{trigger-jobs}'
+        - integration-csit-all
 
     builders:
         - integration-cleanup-workspace
@@ -641,9 +767,8 @@
         - integration-get-bundle-vars
         - inject:
             properties-file: 'bundle_vars.txt'
-        - integration-deploy-controller
-        - integration-configure-clustering
-        - integration-start-cluster-run-test
+        - integration-deploy-controller-run-test
+        - integration-deploy-openstack-run-test
         - integration-cleanup-tmp
 
     publishers:
@@ -651,37 +776,12 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*karaf.log*'
+            artifacts: '*log*'
         - email-notification:
             email-prefix: '[{project}]'
-        - plot:
-          - title: '{01-plot-title}'
-            yaxis: '{01-plot-yaxis}'
-            group: '{01-plot-group}'
-            num-builds: '5400'
-            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'
-            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
 
 - job-template:
-    name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+    name: '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
     disabled: false
 
     project-type: freestyle
@@ -698,21 +798,38 @@
             project: 'integration/test'
         - 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-mdsal-clustering,{install-features}'
-        - integration-test-options:
-            test-options: '{robot-options}'
+            controller-features: 'odl-jolokia,{install-features}'
         - integration-test-plan:
-            test-plan: '{project}-{functionality}.txt'
+            test-plan: '{project}-3node-openstack.txt'
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
-
+            jdkversion: '{jre}'
+        - string:
+            name: OPENSTACK_BRANCH
+            default: '{openstack-branch}'
+            description: 'Openstack version to use with devstack'
+        - string:
+            name: ODL_ML2_DRIVER_REPO
+            default: 'https://github.com/openstack/networking-odl'
+            description: 'URL to fetch networking-odl driver'
+        - string:
+            name: ODL_ML2_VERSION
+            default: '{odl-ml2-version}'
+            description: 'Version of networking-odl to checkout from the repo'
+        - string:
+            name: ODL_ENABLE_L3_FWD
+            default: '{odl-enable-l3}'
+            description: 'Enable L3 FWD in ODL for createing br-ex'
+        - string:
+            name: ENABLE_HAPROXY_FOR_NEUTRON
+            default: '{enable-haproxy}'
+            description: 'Enable HAProxy for using neutron interface as HA'
     scm:
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
@@ -721,17 +838,16 @@
             branch: 'master'
 
     wrappers:
-        - integration-jclouds-controller-mininet:
+        - build-timeout
+        - integration-jclouds-controller-devstack:
             controller-vms: 3
-            mininet-image: '{mininet-image}'
-            mininet-vms: '{mininet-vms}'
-            mininet-cloud-name: '{mininet-cloud-name}'
+            openstack-vms: '{openstack-vms}'
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+              - '{ssh-credentials}'
 
     triggers:
-        - timed: '{schedule}'
+        - integration-csit-all
 
     builders:
         - integration-cleanup-workspace
@@ -744,9 +860,9 @@
         - integration-get-bundle-vars
         - inject:
             properties-file: 'bundle_vars.txt'
-        - integration-deploy-controller
         - integration-configure-clustering
         - integration-start-cluster-run-test
+        - integration-deploy-openstack-run-test
         - integration-cleanup-tmp
 
     publishers:
@@ -754,31 +870,6 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*karaf.log*'
+            artifacts: '*log*'
         - email-notification:
             email-prefix: '[{project}]'
-        - plot:
-          - title: '{01-plot-title}'
-            yaxis: '{01-plot-yaxis}'
-            group: '{01-plot-group}'
-            num-builds: '5400'
-            style: line
-            use-description: false
-            csv-file-name: '{project}-csit-3node-periodic-{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'
-            style: line
-            use-description: false
-            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
-            series:
-              - file: '{02-plot-data-file}'
-                inclusion-flag: 'off'
-                display-table: true
-                format: csv