Use OpenStack cloud plugin to provision slaves

This requires jenkins-job-builder version 1.6.0 or above,
so requirements.txt is updated to 1.6.1 (current latest).

Change-Id: Ibe282bf3708532d137c18c302b2fc80d9d1d8742
Also-by: Jamo Luhrsen <jluhrsen@redhat.com>
Also-by: Vratko Polak <vrpolak@cisco.com>
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index b695c0c8005ec5f186060f8fd37e8963be5b20cf..5c2e0283d4321210fb0be732d6b0e9994b6b7d1a 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -30,7 +30,7 @@
 
     # 3 Ubuntu VMs in JCloud configuration
     mininet-image: 'gbp-trusty'
-    mininet-cloud-name: 'Ubuntu'
+    mininet-cloud-name: 'ODLRPC'
     mininet-vms: 3
 
     # Features to install

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 07d1d41929d02c1bca54d1cadbc9153706639ef1..1cb1e7b777ef93bdf9c079981930f91ae4493307 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -30,7 +30,7 @@
 
     # 6 Ubuntu VMs in JCloud configuration
     mininet-image: 'gbp-trusty'
-    mininet-cloud-name: 'Ubuntu'
+    mininet-cloud-name: 'ODLRPC'
     mininet-vms: 6
 
     # Features to install

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 032b21437f2465118e98c1ab2ac000583469ab66..f194007259007ff7e8129e303dd2fce2655ec83a 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -194,40 +194,36 @@
     triggers:
         - timed: 'H H * * *'
 
-# Macro: integration-jclouds-controller-mininet
+# Macro: integration-openstack-controller-mininet
 # Operation: this macro will spin the controller and mininet vms
 # Used by: {project}-csit-* job templates
 
 - wrapper:
-    name: integration-jclouds-controller-mininet
+    name: integration-openstack-controller-mininet
     wrappers:
-      - jclouds:
+      - openstack:
           instances:
-            - rk-c7-java:
-                cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
-                count: '{controller-vms}'
-                stop-on-terminate: False
-            - '{mininet-image}':
-                cloud-name: '{mininet-cloud-name}'
-                count: '{mininet-vms}'
-                stop-on-terminate: False
-
-# Macro: integration-jclouds-controller-devstack
+            - cloud-name: 'ODLRPC'
+              template-name: centos7-java
+              count: '{controller-vms}'
+            - cloud-name: '{mininet-cloud-name}'
+              template-name: '{mininet-image}'
+              count: '{mininet-vms}'
+
+# Macro: integration-openstack-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
+    name: integration-openstack-controller-devstack
     wrappers:
-      - jclouds:
+      - openstack:
           instances:
-            - rk-c7-java:
-                cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
-                count: '{controller-vms}'
-                stop-on-terminate: False
-            - rk-c7-devstack:
-                cloud-name: 'Rackspace DFW - Devstack'
-                count: '{openstack-vms}'
-                stop-on-terminate: False
+            - cloud-name: 'ODLRPC'
+              template-name: centos7-java
+              count: '{controller-vms}'
+            - cloud-name: 'ODLRPC'
+              template-name: centos7-devstack
+              count: '{openstack-vms}'
 
 #################
 # Shell Scripts #

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 5d6d4e0551c3ba6bd67655cc9209dc55f697c8e5..2d0729bd58a75b7a41cb85fdc54e2cffc1d4df9a 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -69,7 +69,7 @@
 
     wrappers:
         - build-timeout
-        - integration-jclouds-controller-mininet:
+        - integration-openstack-controller-mininet:
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
@@ -153,7 +153,7 @@
 
     wrappers:
         - build-timeout
-        - integration-jclouds-controller-mininet:
+        - integration-openstack-controller-mininet:
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
@@ -260,7 +260,7 @@
             branch: 'master'
 
     wrappers:
-        - integration-jclouds-controller-mininet:
+        - integration-openstack-controller-mininet:
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
@@ -366,7 +366,7 @@
 
     wrappers:
         - build-timeout
-        - integration-jclouds-controller-mininet:
+        - integration-openstack-controller-mininet:
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
@@ -452,7 +452,7 @@
 
     wrappers:
         - build-timeout
-        - integration-jclouds-controller-mininet:
+        - integration-openstack-controller-mininet:
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
@@ -560,7 +560,7 @@
             branch: 'master'
 
     wrappers:
-        - integration-jclouds-controller-mininet:
+        - integration-openstack-controller-mininet:
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
@@ -663,12 +663,11 @@
 
     wrappers:
           - build-timeout
-          - jclouds:
+          - openstack:
               instances:
-                - rk-c7-devstack:
-                    cloud-name: 'Rackspace DFW - Devstack'
-                    count: '1'
-                    stop-on-terminate: False
+                - cloud-name: 'ODLRPC'
+                  template-name: 'centos7-devstack'
+                  count: '1'
           - ssh-agent-credentials:
               users:
                   - '{ssh-credentials}'
@@ -764,7 +763,7 @@
 
     wrappers:
         - build-timeout
-        - integration-jclouds-controller-devstack:
+        - integration-openstack-controller-devstack:
             controller-vms: 1
             openstack-vms: '{openstack-vms}'
         - ssh-agent-credentials:
@@ -870,7 +869,7 @@
 
     wrappers:
         - build-timeout
-        - integration-jclouds-controller-devstack:
+        - integration-openstack-controller-devstack:
             controller-vms: 3
             openstack-vms: '{openstack-vms}'
         - ssh-agent-credentials:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index b5bde5b97547fca39d666c54564db5bce9c88888..959455bfba98a19596b7090fa2875fea5a87577d 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -220,7 +220,7 @@
 
     wrappers:
         - build-timeout
-        - integration-jclouds-controller-mininet:
+        - integration-openstack-controller-mininet:
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'

diff --git a/jjb/netvirt/netvirt-openstack.yaml b/jjb/netvirt/netvirt-openstack.yaml
index cffb9afeb72efd3480569b620c1401ac4576a3e3..512be70e1e472978cd40acaad3a69dc61dde6203 100644 (file)
--- a/jjb/netvirt/netvirt-openstack.yaml
+++ b/jjb/netvirt/netvirt-openstack.yaml
@@ -29,7 +29,7 @@
         - ssh-agent-credentials:
             users:
                 - '{openstack-gerrit-credentials}'
-        - jclouds:
+        - openstack:
             single-use: true
 
     triggers:

diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
index 8ff295cd5c4847a520e47e9efe2f0e832220a989..ba49ec28058d0c02fd19e54079be3de1ba7e05f2 100644 (file)
--- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml
+++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
@@ -30,7 +30,7 @@
         - ssh-agent-credentials:
             users:
                 - '{openstack-gerrit-credentials}'
-        - jclouds:
+        - openstack:
             single-use: true
 
     triggers:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 02d60f73d9427161579f53e2a0a372c2592bf941..ce581409d8c43264d7a353d74087449f20bb8bce 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -30,7 +30,7 @@
     # Mininet configuration
     mininet-image: 'ubuntu-trusty-mininet'
     mininet-vms: 1
-    mininet-cloud-name: 'Rackspace DFW - Integration Dynamic Lab'
+    mininet-cloud-name: 'ODLRPC'
 
     # In case a CSIT job is merged without Java version specified
     jdk: 'openjdk8'