Move 3node csit tests to public cloud

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 35c39ab1558fa6bcfe43f1edc14c13edb2bb7cee..198f7b30f855f8c2d81aa524c038144f8953b916 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -226,6 +226,21 @@
               template-name: '{mininet-image}'
               count: '{mininet-vms}'
 
+# Macro: integration-jclouds-controller-devstack
+# Operation: this macro will spin the controller and devstack vms
+# Used by: {project}-csit-openstack job templates
+- wrapper:
+    name: integration-jclouds-controller-devstack
+    wrappers:
+      - jclouds:
+          instances:
+            - '{controller-image}':
+                cloud-name: 'ODLPUB'
+                count: '{controller-vms}'
+            - '{openstack-image}':
+                cloud-name: 'ODLPUB'
+                count: '{openstack-vms}'
+
 # Macro: integration-openstack-controller-devstack
 # Operation: this macro will spin the controller and devstack vms
 # Used by: {project}-csit-openstack job templates

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 0a7eea0187341bb5684a113cf3fc0d463c245a33..2ef8b302044357ac168ba3a20c492a163bd1ebd6 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -374,7 +374,7 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-openstack-controller-mininet:
+        - integration-jclouds-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 3
             mininet-image: '{mininet-image}'
@@ -461,7 +461,7 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-openstack-controller-mininet:
+        - integration-jclouds-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 3
             mininet-image: '{mininet-image}'
@@ -810,7 +810,7 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-openstack-controller-devstack:
+        - integration-jclouds-controller-devstack:
             controller-image: '{controller-image}'
             controller-vms: 3
             openstack-image: '{openstack-image}'