Temporary run "only" OFP test in OFP CSIT

Current MRI integration is impacting OFP CSIT.

Change-Id: I65492ee6529e304697d01e70625904e1f9505df8
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index f09f4e38e82b9e5594f282fe07724bfb602b0540..84f8fc6771e5c8c05867729e1fb0b0092da152d9 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -208,7 +208,7 @@
           repo-url: '{repo-url}'
           robot-options: '{robot-options}'
           # Controller
-          controller-scope: '{scope}'
+          controller-scope: '{install}'
           controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
@@ -447,7 +447,7 @@
           repo-url: '{repo-url}'
           robot-options: '{robot-options}'
           # Controller
-          controller-scope: '{scope}'
+          controller-scope: '{install}'
           controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: '{install-features}'
@@ -628,7 +628,7 @@
           repo-url: '{repo-url}'
           robot-options: '{robot-options}'
           # Controller
-          controller-scope: '{scope}'
+          controller-scope: '{install}'
           controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
@@ -868,7 +868,7 @@
           repo-url: '{repo-url}'
           robot-options: '{robot-options}'
           # Controller
-          controller-scope: '{scope}'
+          controller-scope: '{install}'
           controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'
@@ -938,7 +938,7 @@
           repo-url: '{repo-url}'
           robot-options: '{robot-options}'
           # Controller
-          controller-scope: '{scope}'
+          controller-scope: '{install}'
           controller-max-mem: '{controller-max-mem}'
           debug-map: '{debug-map}'
           install-features: 'odl-jolokia,{install-features}'

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index b595352b1ce39b1d30f86e3136744833d76f24da..3c0b7c64175460018a062bbd2bfd50c26d25c064 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -17,15 +17,14 @@
       - aluminium:
           branch: 'master'
           jre: 'openjdk11'
+          install: 'only'
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'
+          install: 'all'
       - sodium:
           branch: 'stable/sodium'
-
-    install:
-      - all:
-          scope: 'all'
+          install: 'all'
 
     # Job images
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'