X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=6319d5c1e5b6f72c7f9334375c3aaa6051784523;hb=d7c3880fe4578a70a16e2237bb8be8a1742c0291;hp=5ade45a1b1bd49d50fb477a280bb2ceeb46c9452;hpb=0d27c179f6a36800d4acfd0dcf2b5597de88ab88;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 5ade45a1b..4e2ccf0de 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -1,90 +1,135 @@
+---
+# TODO: Make all bash constants more readable.
+# e.g.: DISTRIBUTION_BRANCH instead of DISTROBRANCH.
 - parameter:
-    name: integration-branch
+    name: integration-distribution-branch
     parameters:
-        - string:
-            name: BRANCH
-            default: '{branch}'
-            description: 'Distribution GIT branch'
+      - string:
+          name: DISTROBRANCH
+          default: '{branch}'
+          description: 'Distribution GIT branch'
 
 - parameter:
-    name: integration-bundleurl
+    name: distribution-karaf-version
+    # Arguments:
+    #   karaf-version: Provide, otherwise releng-defaults value is used.
     parameters:
-        - string:
-            name: BUNDLEURL
-            default: '{bundleurl}'
-            description: 'URL to karaf distribution zip'
+      - string:
+          name: KARAF_VERSION
+          default: '{karaf-version}'
+          description: 'karaf3 or karaf4, affects ODL deploy scripts'
+
+- parameter:
+    name: integration-bundle-url
+    parameters:
+      - string:
+          name: BUNDLE_URL
+          default: '{bundle-url}'
+          description: 'URL to karaf distribution zip'
 
 - parameter:
     name: integration-jdk-version
     parameters:
-        - string:
-            name: JDKVERSION
-            default: '{jdkversion}'
-            description: 'Parameter to indicate JAVA Version'
+      - string:
+          name: JDKVERSION
+          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'
+      - 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'
+      - 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:
-        - string:
-            name: DISTROSTREAM
-            default: '{stream}'
-            description: 'Distribution stream string, for suites to know which behavior to expect'
+      - string:
+          name: DISTROSTREAM
+          default: '{stream}'
+          description: 'Distribution stream string, for suites to know which behavior to expect'
 
 - parameter:
     name: integration-stream-test-plan
     parameters:
-        - string:
-            name: STREAMTESTPLAN
-            default: '{stream-test-plan}'
-            description: 'Stream-specific test plan we will run'
+      - string:
+          name: STREAMTESTPLAN
+          default: '{stream-test-plan}'
+          description: 'Stream-specific test plan we will run'
 
 - parameter:
     name: integration-test-plan
     parameters:
-        - string:
-            name: TESTPLAN
-            default: '{test-plan}'
-            description: 'General test plan we will run unless stream-specific one is found'
+      - string:
+          name: TESTPLAN
+          default: '{test-plan}'
+          description: 'General test plan we will run unless stream-specific one is found'
+
+- parameter:
+    name: integration-test-suites
+    parameters:
+      - string:
+          name: SUITES
+          default: '{test-suites}'
+          description: |
+              List of space-separated suites. Useful when running specific suites within a testplan.
+              Do not include ${{WORKSPACE}}/test/csit/suites/ in the values:
+              (ex. openstack/connectivity/l2.robot openstack/tempest/tempest.robot
+              integration/test/csit/suites/netvirt/ElanService/).
 
 - parameter:
     name: integration-test-options
     parameters:
-        - string:
-            name: TESTOPTIONS
-            default: '{test-options}'
-            description: 'Robot command options'
+      - string:
+          name: TESTOPTIONS
+          default: '{test-options}'
+          description: 'Robot command options'
 
 - parameter:
     name: integration-distribution-git-url
     parameters:
-        - string:
-            name: DISTROGITURL
-            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/integration/distribution'
-            description: 'Distribution GIT URL (do not modify)'
+      - string:
+          name: DISTROGITURL
+          default: '{git-url}/integration/distribution'
+          description: 'Distribution GIT URL (do not modify)'
 
 - parameter:
     name: integration-patch-refspec
     parameters:
-        - string:
-            name: PATCHREFSPEC
-            default: '{branch}'
-            description: 'Integration Patch Refspec'
+      - string:
+          name: PATCHREFSPEC
+          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
@@ -93,15 +138,15 @@
 - scm:
     name: integration-gerrit-scm
     scm:
-        - git:
-            credentials-id: 'opendaylight-jenkins-ssh'
-            url: '$GIT_BASE'
-            basedir: '{basedir}'
-            refspec: '{refspec}'
-            branches:
-                - 'origin/{branch}'
-            skip-tag: true
-            choosing-strategy: 'gerrit'
+      - git:
+          credentials-id: 'opendaylight-jenkins-ssh'
+          url: '$GIT_BASE'
+          basedir: '{basedir}'
+          refspec: '{refspec}'
+          branches:
+            - 'origin/{branch}'
+          skip-tag: true
+          choosing-strategy: 'gerrit'
 
 # Macro: integration-distribution-scm
 # Operation: this macro downloads the integration/distribution repo using distribution as basedir
@@ -110,82 +155,61 @@
 - scm:
     name: integration-distribution-scm
     scm:
-        - git:
-            credentials-id: 'opendaylight-jenkins-ssh'
-            basedir: 'distribution'
-            url: '$DISTROGITURL'
-            refspec: ''
-            branches:
-                - 'origin/{branch}'
-            skip-tag: true
+      - git:
+          credentials-id: 'opendaylight-jenkins-ssh'
+          basedir: 'distribution'
+          url: '$DISTROGITURL'
+          refspec: ''
+          branches:
+            - 'origin/{branch}'
+          skip-tag: true
 
 # Macro: integration-trigger-patch-submitted
-# Operation: this macro sets a trigger for patch submitted on a path pattern
-# Used by: {project}-verify-csit-* job templates
-
+# This is a single macro to use for all csit jobs who vote on every (relevant) patch set.
+# Only 'recheck' trigger word is supported, it always triggers the full set of relevant jobs,
+# in order to prevent Jenkins from starting only a subset and still voting Verified+1.
+# Contrary to gerrit-trigger-patch-submitted, this votes +1 also on unstable runs.
+# Arguments:
+#     gerrit-server-name: name of gerrit server to listen to
+#     project: pattern to match triggering projects
+#     branch: triggering branch name
+#     files: pattern to match triggering filepaths
 - trigger:
     name: integration-trigger-patch-submitted
     triggers:
-        - gerrit:
-            server-name: '{server-name}'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'true'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'true'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            override-votes: true
-            gerrit-build-unstable-verified-value: +1
-            gerrit-build-unstable-codereview-value: 0
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{name}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: 'ANT'
-                    pattern: '{pattern}'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: true
+                exclude-trivial-rebase: false
+                exclude-no-code-change: false
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: recheck
+          override-votes: true
+          gerrit-build-unstable-verified-value: +1
+          gerrit-build-unstable-codereview-value: 0
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: '{files}'
 
 # Macro: integration-csit-only
 # Operation: this macro sets a trigger on reverse job list
 # Used by: csit -only- job templates
 
 - trigger:
-    name: integration-csit-only
-    triggers:
-        - reverse:
-            jobs: '{jobs}'
-            result: 'success'
-
-# Macro: integration-csit-all
-# Operation: this macro sets a periodic trigger
-# Used by: csit -all- job teamplates
-
-- trigger:
-    name: integration-csit-all
+    name: integration-csit-trigger
     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}'
+      - reverse:
+          jobs: '{jobs}'
+          result: 'success'
 
 # Macro: integration-openstack-controller-mininet
 # Operation: this macro will spin the controller and mininet vms
@@ -203,21 +227,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
@@ -233,126 +242,130 @@
               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:
-        - 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."
-
-# Macro: integration-get-slave-addresses
-# Operation: this macro gets the IP addresses of the dynamic vms
+      - 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-get-slave-addresses
+    name: integration-infra-stack-3-type
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-get-slave-addresses.sh
-
-# Macro: integration-get-bundle-vars
-# Operation: this macro gets all bundle related variables
-# Used by: {project}-csit-3node-* job templates
+      - 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-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-get-bundle-vars
+    name: integration-infra-stack-4-type
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-get-bundle-vars.sh
+      - 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-distribution-check
-# Operation: this macro deploys the controller with all fetures
-# Used by: {project}-distribution-check-{stream} job template
+# Macro: integration-get-slave-addresses
+# Operation: this macro gets the IP addresses of the dynamic vms
+# Used by: {project}-csit-* job templates
 
 - builder:
-    name: integration-distribution-check
+    name: integration-get-slave-addresses
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-distribution-check.sh
-
-# Macro: integration-deploy-controller-verify
-# Operation: this macro deploys the controller with all fetures
-# Used by: integration-distribution-deploy-{stream} job template
+      - shell: !include-raw: integration-get-slave-addresses.sh
 
 - builder:
-    name: integration-deploy-controller-verify
+    name: integration-set-variables
+    # Operation: Construct variables not requiring online detection and export using set_variables.env
+    # Required bash variables:
+    #   KARAF_VERSION: 'karaf4' or 'karaf3'. Use distribution-karaf-version macro to set.
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-deploy-controller-verify.sh
-
-# Macro: integration-deploy-controller-offline
-# Operation: this macro deploys the controller with no external repo configuration
-# Used by: integration-distrbution-offline-{stream} job template
+      - shell: !include-raw: integration-set-variables.sh
+      - inject:
+          properties-file: set_variables.env
 
 - builder:
-    name: integration-deploy-controller-offline
+    name: integration-detect-variables
+    # Operation: Construct variables including online detection and export using detect_variables.env
+    #   This calls integration-set-variables internally.
+    # Required bash variables:
+    #   KARAF_VERSION: 'karaf4' or 'karaf3'. Use distribution-karaf-version macro to set.
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-deploy-controller-offline.sh
+      - integration-set-variables
+      - shell: !include-raw: integration-detect-variables.sh
+      - inject:
+          properties-file: detect_variables.env
 
 # Macro: integration-deply-controller-run-test
 # Operation: this macro deploys single contoller and runs test
@@ -361,9 +374,9 @@
 - builder:
     name: integration-deploy-controller-run-test
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-deploy-controller-run-test.sh
+      - shell: !include-raw:
+          - common-functions.sh
+          - integration-deploy-controller-run-test.sh
 
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
@@ -372,9 +385,9 @@
 - builder:
     name: integration-configure-clustering
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-configure-clustering.sh
+      - shell: !include-raw:
+          - common-functions.sh
+          - integration-configure-clustering.sh
 
 # Macro: integration-start-cluster-run-test
 # Operation: this macro starts the 3-node cluster and runs test
@@ -383,31 +396,7 @@
 - builder:
     name: integration-start-cluster-run-test
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-start-cluster-run-test.sh
-
-# Macro: integration-get-bundle-url
-# Operation: this macro gets the job generated distribution URL from distribution pom.xml
-# Used by: integration-patch-test-{stream} job template
-
-- builder:
-    name: integration-get-bundle-url
-    builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-get-bundle-url.sh
-
-# Macro: integration-get-bundle-url-root
-# Operation: this macro gets the job generated distribution URL from root pom.xml
-# Used by: integration-distribution-verify-{stream} job template
-
-- builder:
-    name: integration-get-bundle-url-root
-    builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-get-bundle-url-root.sh
+      - shell: !include-raw: integration-start-cluster-run-test.sh
 
 # Macro: integration-install-robotframework
 # Operation: Installs robotframework using pip to a virtualenv
@@ -416,9 +405,7 @@
 - builder:
     name: integration-install-robotframework
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-install-robotframework.sh
+      - shell: !include-raw: integration-install-robotframework.sh
 
 # Macro: integration-cleanup-tmp
 # Operation: Cleans up temporary files created by build
@@ -427,9 +414,7 @@
 - builder:
     name: integration-cleanup-tmp
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-cleanup-tmp.sh
+      - shell: !include-raw: integration-cleanup-tmp.sh
 
 # Macro: integration-multipatch-builder
 # Operation: checks out multiple patches and builds custom distribution
@@ -438,38 +423,64 @@
 - builder:
     name: integration-multipatch-builder
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-multipatch-distribution-test.sh
+      - shell: !include-raw: multipatch-distribution.sh
 
-# Macro: integration-cleanup-worspace
+# Macro: integration-cleanup-workspace
 # Operation: Cleans up files possibly left there by the previous build
 # Used by: {project}-csit-* job templates
 
 - builder:
     name: integration-cleanup-workspace
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-cleanup-workspace.sh
+      - shell: !include-raw: integration-cleanup-workspace.sh
 
 # Macro: integration-rebase-patch
-# Operation: For cloned project, rebase checked-out Gerrit patch onto $BRANCH.
+# Operation: For cloned project, rebase checked-out Gerrit patch onto $DISTROBRANCH.
 # Used by: integration-patch-distribution-* job template
 
 - builder:
     name: integration-rebase-gerrit-patch
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-rebase-gerrit-patch.sh
+      - shell: !include-raw: integration-rebase-gerrit-patch.sh
 
 - builder:
     name: integration-deploy-openstack-run-test
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-deploy-openstack-run-test.sh
+      - shell: !include-raw: integration-deploy-openstack-run-test.sh
+
+- builder:
+    name: integration-compare-distributions
+    # Operation: will compare an already created distribtion (probably last
+    # published to nexus) to the current distribution being created.
+    # The comparison is done to find the list of patches that are new to the
+    # current distribution.
+    # Required bash variables:
+    #   KARAF_ARTIFACT: 'karaf' or 'distribution-karaf'. Use integration-set-variables.
+    builders:
+      - shell: !include-raw: integration-compare-distributions.sh
+
+- builder:
+    name: integration-upload-distribution
+    # Upload distribution karaf artifact to Nexus SNAPSHOT repo for testing.
+    # Arguments:
+    #   {dist-pom} path to pom file containing the version
+    # Required bash variables:
+    #   KARAF_VERSION: 'karaf4' or 'karaf3'.
+    #     Use distribution-karaf-version macro to customize.
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: global-settings
+              variable: GLOBAL_SETTINGS_FILE
+            - file-id: integration-settings
+              variable: SETTINGS_FILE
+      - integration-set-variables
+      - inject:
+          properties-content: BUNDLE_POM={dist-pom}
+      - shell: !include-raw-escape: integration-upload-distribution.sh
+      - inject:
+          properties-file: integration-upload-distribution.env
+
 ##############
 # Publishers #
 ##############
@@ -481,35 +492,67 @@
 - publisher:
     name: integration-robot
     publishers:
-        - robot:
-            output-path: ''
-            other-files: ''
-            unstable-threshold: '{unstable-if}'
-            pass-threshold: '{pass-if}'
-            only-critical: false
+      - robot:
+          output-path: ''
+          other-files: ''
+          unstable-threshold: '{unstable-if}'
+          pass-threshold: '{pass-if}'
+          only-critical: false
 
 - publisher:
     name: integration-robot-tempest
     publishers:
-        - robot:
-            output-path: ''
-            other-files:
-                - tempest_results.html
-            unstable-threshold: '{unstable-if}'
-            pass-threshold: '{pass-if}'
-            only-critical: false
+      - robot:
+          output-path: ''
+          other-files:
+            - tempest_results.html
+          unstable-threshold: '{unstable-if}'
+          pass-threshold: '{pass-if}'
+          only-critical: false
 
 - publisher:
     name: integration-csit-archive-build
     publishers:
-        - postbuildscript:
-            builders:
-                - shell: |
-                    #!/bin/bash
-                    mkdir $WORKSPACE/archives
-                    curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
-                    unzip -d $WORKSPACE/archives robot-plugin.zip
-                    mv *log* *.log *.log.gz *.csv *.png $WORKSPACE/archives || true  # Don't fail if file missing
-            script-only-if-succeeded: False
-            script-only-if-failed: False
-            mark-unstable-if-failed: True
+      - postbuildscript:
+          builders:
+            - shell: |
+                #!/bin/bash
+                cd $WORKSPACE
+                mkdir -p ./archives
+                curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
+                unzip -d ./archives robot-plugin.zip
+                mv *log* *.log *.log.gz *.csv *.png ./archives || true  # Don't fail if file missing
+                # TODO: Can the following line ever fail?
+                find . -type f -name *.hprof -print0 | tar -cvf - --null -T - | xz -9 > ./archives/hprof.tar.xz
+                # TODO: Tweak the compression level if better ratio (or speed) is needed.
+          script-only-if-succeeded: 'False'
+          script-only-if-failed: 'False'
+          mark-unstable-if-failed: 'True'
+
+- publisher:
+    name: integration-csit-run-postscript
+    publishers:
+      - postbuildscript:
+          builders:
+            - config-file-provider:
+                files:
+                  - file-id: 'odl-elastic-cloud'
+                    target: '${HOME}/.netrc'
+            - shell: |
+                #!/bin/bash
+                #The following script runs any configurable postplan stored in test/csit/postplans.
+                if [ -f "${WORKSPACE}/test/csit/postplans/${TESTPLAN}" ]; then
+                    echo "postplan exists!!!"
+                    echo "Changing the postplan path..."
+                    script_name=${WORKSPACE}/test/csit/postplans/${TESTPLAN}
+                    cat ${script_name} | sed "s:integration:${WORKSPACE}:" > postplan.txt
+                    cat postplan.txt
+                    egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' postplan.txt | while read -r line ; do
+                        echo "Executing ${line}..."
+                        ${line}
+                    done
+                fi
+                rm ${HOME}/.netrc
+          script-only-if-succeeded: 'False'
+          script-only-if-failed: 'False'
+          mark-unstable-if-failed: 'True'