adding change discovery tool to run and display merged patches from the running distr...

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 075fe84fa69b77bf3c40892c7b1bbb285a6c45bd..4ac193bc60049a5a6575ce99b3b36921509915cf 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -175,22 +175,6 @@
     triggers:
         - timed: 'H H * * *'
 
-# Macro: integration-jclouds-controller-mininet
-# Operation: this macro will spin the controller and mininet vms
-# Used by: {project}-csit-* job templates
-
-- wrapper:
-    name: integration-jclouds-controller-mininet
-    wrappers:
-      - jclouds:
-          instances:
-            - '{controller-image}':
-                cloud-name: 'ODLPUB'
-                count: '{controller-vms}'
-            - '{mininet-image}':
-                cloud-name: 'ODLPUB'
-                count: '{mininet-vms}'
-
 # Macro: integration-openstack-controller-mininet
 # Operation: this macro will spin the controller and mininet vms
 # Used by: {project}-csit-* job templates
@@ -207,21 +191,6 @@
               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
@@ -237,71 +206,36 @@
               template-name: '{openstack-image}'
               count: '{openstack-vms}'
 
-# Macro: integration-jclouds-controller-docker
-# Operation: this macro will sping the controller and docker vms
-# Used by: {project}-csit-docker job templates
-- wrapper:
-    name: integration-jclouds-controller-docker
-    wrappers:
-      - jclouds:
-          instances:
-            - '{controller-image}':
-                cloud-name: 'ODLPUB'
-                count: '{controller-vms}'
-            - '{docker-image}':
-                cloud-name: 'ODLPUB'
-                count: '{docker-vms}'
-
 #################
 # Shell Scripts #
 #################
 
-# Macro: integration-copy-ssh-keys
-# Operation: Copy ssh public key used as authentication for robot
+# Macro: integration-infra-stack
+# Operation: Sets environment and then calls opendaylight-infra-stack to spin
+#            up csit lab using openstack-heat.
 # Used by: {project}-csit-* job templates
 
 - builder:
-    name: integration-copy-ssh-keys
+    name: integration-infra-stack
     builders:
+        - integration-cleanup-workspace
         - shell: |
             #!/bin/bash
-            function copy-ssh-keys-to-slave() {
-                RETRIES=60
-                for j in $(seq 1 $RETRIES); do
-                    if `ssh-copy-id -i /home/jenkins/.ssh/id_rsa.pub "jenkins@${i}" > /dev/null 2>&1`; then
-                        ssh jenkins@${i} 'echo "$(facter ipaddress_eth0) $(/bin/hostname)" | sudo tee -a /etc/hosts'
-                        echo "Successfully copied public keys to slave ${i}"
-                        break
-                    elif [ $j -eq $RETRIES ]; then
-                        echo "SSH not responding on ${i} after $RETIRES tries. Giving up."
-                        exit 1
-                    else
-                        echo "SSH not responding on ${i}. Retrying in 10 seconds..."
-                        sleep 10
-                    fi
-                done
-            }
-
-            echo "OpenStack IPS are ${JCLOUDS_IPS}"
-
-            IFS=',' read -ra ADDR <<< "${JCLOUDS_IPS}"
-            pids=""
-            for i in "${ADDR[@]}"; do
-                ( copy-ssh-keys-to-slave ) &
-                # Store PID of process
-                pids+=" $!"
-            done
-
-            # Detect when a process failed to copy ssh keys and fail build
-            for p in $pids; do
-                if wait $p; then
-                    echo "Process $p successfully copied ssh keys."
-                else
-                    echo "Process $p failed to copy ssh keys."
-                    exit 1
-                fi
-            done
-            echo "Copying ssh keys complete."
+            # Setup openstack envirnoment file for use by
+            # the opendaylight-infra-stack macro
+            cat > $WORKSPACE/opendaylight-infra-environment.yaml << EOF
+            parameters:
+                vm_0_count: {vm_0_count}
+                vm_0_flavor: {vm_0_flavor}
+                vm_0_image: {vm_0_image}
+                vm_1_count: {vm_1_count}
+                vm_1_flavor: {vm_1_flavor}
+                vm_1_image: {vm_1_image}
+            EOF
+            echo "Contents of opendaylight-infra-environment.yaml ..."
+            cat $WORKSPACE/opendaylight-infra-environment.yaml
+        - opendaylight-infra-stack:
+            stack-template: '{stack-template}'
 
 # Macro: integration-get-slave-addresses
 # Operation: this macro gets the IP addresses of the dynamic vms