Use cluster config file in cluster tests

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index f5a3c4898a092a4dad737a950b81cf9c4e199f67..e1dde447d86b3a60eaeb3146784e176edf5298d1 100644 (file)
--- 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
@@ -651,8 +648,6 @@
             name: TEMPEST_REGEX
             default: 'tempest.api.network'
             description: 'Default grouping of tempest tests to run'
-        - integration-test-plan:
-            test-plan: '{project}-{functionality}.txt'
 
     scm:
         - integration-gerrit-scm:
@@ -692,6 +687,6 @@
             unstable-if: 0.0
             pass-if: 100.0
         - archive:
-            artifacts: '*log*'
+            artifacts: 'devstacklog.txt,*karaf*'
         - email-notification:
             email-prefix: '[project]'