Consolidate common csit params into macro

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 2ab9bb4fc9aa28687f0ebfa9ebfff99cd2c3e6e5..b5e826825e8f0ed2f086f4a2ab7030e113a98be4 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -1,6 +1,34 @@
 ---
 # TODO: Make all bash constants more readable.
 # e.g.: DISTRIBUTION_BRANCH instead of DISTROBRANCH.
+
+- parameter:
+    name: integration-csit-parameters
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: 'integration/test'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      # CSIT
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+      # Controller
+      - integration-controller-scope:
+          controller-scope: '{controller-scope}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
+      - integration-controller-features:
+          controller-features: '{install-features}'
+      - integration-use-features-boot:
+          use-features-boot: '{use-features-boot}'
+
+
 - parameter:
     name: integration-distribution-branch
     parameters:
@@ -327,6 +355,36 @@
       - 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.
@@ -360,6 +418,24 @@
       - 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
+
+- builder:
+    name: integration-get-apex-addresses
+    builders:
+      - shell: !include-raw: integration-get-apex-addresses.sh
+
+# Macro: integration-apex-run-tests
+# Operation: this macro just runs the robot suites
+# Used by: {project}-csit-* apex related job templates
+
+- builder:
+    name: integration-apex-run-tests
+    builders:
+      - shell: !include-raw: integration-apex-run-tests.sh
+
 # Macro: integration-get-slave-addresses
 # Operation: this macro gets the IP addresses of the dynamic vms
 # Used by: {project}-csit-* job templates
@@ -479,6 +555,12 @@
       - shell: !include-raw:
           - integration-deploy-openstack-run-test.sh
 
+- builder:
+    name: integration-apex-image-manager
+    builders:
+      - shell: !include-raw:
+          - ../opendaylight-infra-apex-image-management.sh
+
 - builder:
     name: integration-compare-distributions
     # Operation: will compare an already created distribtion (probably last
@@ -516,30 +598,18 @@
 # Publishers #
 ##############
 
-# Macro: integration-robot
-# Operation: this macro publishes robot results
-# Used by: {project}-csit-* job templates
-
-- publisher:
-    name: integration-robot
-    publishers:
-      - robot:
-          output-path: ''
-          other-files: ''
-          unstable-threshold: '{unstable-if}'
-          pass-threshold: '{pass-if}'
-          only-critical: false
-
 - publisher:
-    name: integration-robot-tempest
+    name: integration-csit-publish
     publishers:
       - robot:
           output-path: ''
-          other-files:
-            - tempest_results.html
-          unstable-threshold: '{unstable-if}'
-          pass-threshold: '{pass-if}'
+          other-files: '{obj:robot_other_files}'
+          unstable-threshold: '{robot-unstable-threshold}'
+          pass-threshold: '{robot-pass-threshold}'
           only-critical: false
+      - integration-csit-archive-build
+      - integration-csit-run-postscript
+      - releng-openstack-stack-delete
 
 - publisher:
     name: integration-csit-archive-build
@@ -556,14 +626,16 @@
               build-steps:
                 - shell: |
                     #!/bin/bash
+                    echo "Archiving csit artifacts"
                     cd $WORKSPACE
                     mkdir -p ./archives
                     for i in `seq 1 ${NUM_ODL_SYSTEM}`; do
                         NODE_FOLDER="./archives/odl_${i}"
                         mkdir -p ${NODE_FOLDER}
-                        mv odl${i}_karaf* ${NODE_FOLDER} || true
+                        mv odl${i}_* ${NODE_FOLDER} || true
                         mv karaf_${i}_*_threads* ${NODE_FOLDER} || true
                         mv *_${i}.png ${NODE_FOLDER} || true
+                        mv /tmp/odl${i}_* ${NODE_FOLDER} || true
                     done
                     curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                     unzip -d ./archives robot-plugin.zip