Merge "Remove odlparent-3.0.x jobs"

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index b533504f12e72fa5de9816f4dc1e223a1d1e8168..b9e448a037128fde0800b03266154778bb5bc2a8 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -285,126 +285,6 @@
 # Shell Scripts #
 #################
 
-# 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-infra-stack
-    builders:
-      - integration-cleanup-workspace
-      - shell: |
-          #!/bin/bash
-          # 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-infra-stack-3-type
-# 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-infra-stack-3-type
-    builders:
-      - integration-cleanup-workspace
-      - shell: |
-          #!/bin/bash
-          # 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}
-              vm_2_count: {vm_2_count}
-              vm_2_flavor: {vm_2_flavor}
-              vm_2_image: {vm_2_image}
-          EOF
-          echo "Contents of opendaylight-infra-environment.yaml ..."
-          cat $WORKSPACE/opendaylight-infra-environment.yaml
-      - opendaylight-infra-stack:
-          stack-template: 'csit-3-instance-type.yaml'
-
-# Macro: integration-apex-stack-3-type
-# Operation: Sets environment and then calls opendaylight-apex-stack to spin
-#            up csit lab using openstack-heat.
-# Used by: {project}-csit-* apex related job templates
-
-- builder:
-    name: integration-apex-stack-3-type
-    builders:
-      - integration-cleanup-workspace
-      - shell: |
-          #!/bin/bash
-          # 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}
-              vm_2_count: {vm_2_count}
-              vm_2_flavor: {vm_2_flavor}
-              vm_2_image: {vm_2_image}
-          EOF
-          echo "Contents of opendaylight-infra-environment.yaml ..."
-          cat $WORKSPACE/opendaylight-infra-environment.yaml
-      - opendaylight-apex-stack:
-          stack-template: 'csit-apex-3-instance-type.yaml'
-
-# Macro: integration-infra-stack-4-type
-# 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-infra-stack-4-type
-    builders:
-      - integration-cleanup-workspace
-      - shell: |
-          #!/bin/bash
-          # 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}
-              vm_2_count: {vm_2_count}
-              vm_2_flavor: {vm_2_flavor}
-              vm_2_image: {vm_2_image}
-              vm_3_count: {vm_3_count}
-              vm_3_flavor: {vm_3_flavor}
-              vm_3_image: {vm_3_image}
-          EOF
-          echo "Contents of opendaylight-infra-environment.yaml ..."
-          cat $WORKSPACE/opendaylight-infra-environment.yaml
-      - opendaylight-infra-stack:
-          stack-template: 'csit-4-instance-type.yaml'
-
 # Macro: integration-get-apex-addresses
 # Operation: this macro gets the IP addresses of the dynamic vms from apex snapshots
 # Used by: {project}-csit-* apex related job templates