Merge "Remove odlparent-3.0.x jobs"
[releng/builder.git] / jjb / integration / integration-macros.yaml
index b5e826825e8f0ed2f086f4a2ab7030e113a98be4..b9e448a037128fde0800b03266154778bb5bc2a8 100644 (file)
           repo-url: '{repo-url}'
       - integration-test-options:
           test-options: '{robot-options}'
-      # Controller
-      - integration-controller-scope:
-          controller-scope: '{controller-scope}'
-      - integration-controller-debug-map:
+      - integration-controller-parameters:
           controller-debug-map: '{debug-map}'
-      - integration-controller-features:
           controller-features: '{install-features}'
-      - integration-use-features-boot:
-          use-features-boot: '{use-features-boot}'
+          controller-scope: '{controller-scope}'
+          controller-use-features-boot: '{use-features-boot}'
+
+- parameter:
+    name: integration-controller-parameters
+    parameters:
+      - string:
+          name: CONTROLLERSCOPE
+          default: '{controller-scope}'
+          description: 'Feature Only or Feature All test'
+
+      - string:
+          name: CONTROLLERFEATURES
+          default: '{controller-features}'
+          description: 'Features to install in the controller separated by comma'
+
+      - string:
+          name: CONTROLLERDEBUGMAP
+          default: '{controller-debug-map}'
+          description: |
+              Key:Value map of debugs to enable on the controller separated by spaces.
+              The module should not include org.opendaylight.
+              The levels must be one of: ERROR, WARN, INFO, DEBUG, TRACE.
+              (ex. ovsdb.lib:ERROR netvirt.vpnservice:INFO)
+
+      - string:
+          name: USEFEATURESBOOT
+          default: '{controller-use-features-boot}'
+          description: 'Boolean to toggle whether featuresBoot is appended or ignored'
 
 
 - parameter:
           default: '{jdkversion}'
           description: 'Parameter to indicate JAVA Version'
 
-- parameter:
-    name: integration-controller-scope
-    parameters:
-      - string:
-          name: CONTROLLERSCOPE
-          default: '{controller-scope}'
-          description: 'Feature Only or Feature All test'
-
-- parameter:
-    name: integration-controller-features
-    parameters:
-      - string:
-          name: CONTROLLERFEATURES
-          default: '{controller-features}'
-          description: 'Features to install in the controller separated by comma'
-
-- parameter:
-    name: integration-controller-debug-map
-    parameters:
-      - string:
-          name: CONTROLLERDEBUGMAP
-          default: '{controller-debug-map}'
-          description: |
-              Key:Value map of debugs to enable on the controller separated by spaces.
-              The module should not include org.opendaylight.
-              The levels must be one of: ERROR, WARN, INFO, DEBUG, TRACE.
-              (ex. ovsdb.lib:ERROR netvirt.vpnservice:INFO)
-
 - parameter:
     name: integration-distribution-stream
     parameters:
           default: '{branch}'
           description: 'Integration Patch Refspec'
 
-- parameter:
-    name: integration-use-features-boot
-    parameters:
-      - string:
-          name: USEFEATURESBOOT
-          default: '{use-features-boot}'
-          description: 'Boolean to toggle whether featuresBoot is appended or ignored'
-
 # Macro: integration-gerrit-scm
 # Operation: this macro downloads a project gerrit
 # Used by: all csit jobs
 # 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