Allow CSIT jobs to specify cloud name

Macro integration-jclouds-controller-mininet was using cloud name
hardcoded to 'Rackspace DFW - Integration Dynamic Lab'

This change moves that value to releng-defaults.yaml,
so that CSIT job definitions can override it if needed.

Integration templates were changed to forward the default value,
but no CSIT job definition was changed.

Change-Id: Ifcddd7d508126839ba032f622822b5c01195b08e
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 77db9db0b434aa25cd6fef3f17b2db31abf36e4a..4fa342c7016d924d0cd41788812dea77c9c3c6dc 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -161,7 +161,7 @@
                 count: '{controller-vms}'
                 stop-on-terminate: False
             - '{mininet-image}':
-                cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
+                cloud-name: '{mininet-cloud-name}'
                 count: '{mininet-vms}'
                 stop-on-terminate: False
 

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 77eecbbe726a35179d432e8664540a57fe02c8a0..99fdc2dca4840a53bc063a46f38b89d96e96bd20 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -68,6 +68,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -139,6 +140,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -236,6 +238,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -307,6 +310,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -401,6 +405,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -492,6 +497,7 @@
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -564,6 +570,7 @@
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
@@ -660,6 +667,7 @@
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 2a4b45f1a0fb26c49e0fbefa3f3b624cd7874db5..ccf7acc60e6520672493e5f4032288523941fe60 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -233,6 +233,7 @@
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
+            mininet-cloud-name: '{mininet-cloud-name}'
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index efa8e971ea79dd7968d79211330619c989a926d3..11bc33c3c1296a0777c9087da4b4af5572b272f3 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -97,3 +97,4 @@
     # Mininet configuration
     mininet-image: 'rk-c-el6-mininet'
     mininet-vms: 1
+    mininet-cloud-name: 'Rackspace DFW - Integration Dynamic Lab'