X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=9d4dc33bc68f01d27924102e651811bb7f5db56a;hb=refs%2Ftags%2Frelease%2Fberyllium-sr2;hp=38b39a849acbbf5d3f033abb01047304caf6c515;hpb=4eb7732e9d7cdc769141de603a789e8b2f298819;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 38b39a849..9d4dc33bc 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -344,7 +344,7 @@
         - 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:
@@ -390,7 +390,6 @@
         - integration-get-bundle-vars
         - inject:
             properties-file: 'bundle_vars.txt'
-        - integration-deploy-controller
         - integration-configure-clustering
         - integration-start-cluster-run-test
         - integration-cleanup-tmp
@@ -429,7 +428,7 @@
         - 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:
@@ -474,7 +473,6 @@
         - integration-get-bundle-vars
         - inject:
             properties-file: 'bundle_vars.txt'
-        - integration-deploy-controller
         - integration-configure-clustering
         - integration-start-cluster-run-test
         - integration-cleanup-tmp
@@ -538,7 +536,7 @@
         - 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:
@@ -581,7 +579,6 @@
         - integration-get-bundle-vars
         - inject:
             properties-file: 'bundle_vars.txt'
-        - integration-deploy-controller
         - integration-configure-clustering
         - integration-start-cluster-run-test
         - integration-cleanup-tmp
@@ -690,6 +687,189 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: 'devstacklog.txt,*karaf*'
+            artifacts: '*log*'
+        - email-notification:
+            email-prefix: '[{project}]'
+
+- job-template:
+    name: '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
+    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: '{branch}'
+        - integration-distribution-stream:
+            stream: '{stream}'
+        - integration-bundleurl:
+            bundleurl: 'last'
+        - integration-controller-features:
+            controller-features: '{install-features}'
+        - integration-test-plan:
+            test-plan: '{project}-1node-openstack.txt'
+        - integration-patch-refspec:
+            branch: 'master'
+        - integration-jdk-version:
+            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}'
+            basedir: 'test'
+            refspec: '$PATCHREFSPEC'
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - integration-jclouds-controller-devstack:
+            controller-vms: 1
+            openstack-vms: '{openstack-vms}'
+        - ssh-agent-credentials:
+            users:
+              - '{ssh-credentials}'
+
+    triggers:
+        - 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-run-test
+        - integration-deploy-openstack-run-test
+        - integration-cleanup-tmp
+
+    publishers:
+        - integration-robot:
+            unstable-if: 0.0
+            pass-if: 100.0
+        - archive:
+            artifacts: '*log*'
         - email-notification:
-            email-prefix: '[project]'
+            email-prefix: '[{project}]'
+
+- job-template:
+    name: '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
+    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: '{branch}'
+        - integration-distribution-stream:
+            stream: '{stream}'
+        - integration-bundleurl:
+            bundleurl: 'last'
+        - integration-controller-features:
+            controller-features: 'odl-jolokia,{install-features}'
+        - integration-test-plan:
+            test-plan: '{project}-3node-openstack.txt'
+        - integration-patch-refspec:
+            branch: 'master'
+        - integration-jdk-version:
+            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}'
+            basedir: 'test'
+            refspec: '$PATCHREFSPEC'
+            branch: 'master'
+
+    wrappers:
+        - build-timeout
+        - integration-jclouds-controller-devstack:
+            controller-vms: 3
+            openstack-vms: '{openstack-vms}'
+        - ssh-agent-credentials:
+            users:
+              - '{ssh-credentials}'
+
+    triggers:
+        - 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-configure-clustering
+        - integration-start-cluster-run-test
+        - integration-deploy-openstack-run-test
+        - integration-cleanup-tmp
+
+    publishers:
+        - integration-robot:
+            unstable-if: 0.0
+            pass-if: 100.0
+        - archive:
+            artifacts: '*log*'
+        - email-notification:
+            email-prefix: '[{project}]'