X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=2cf8eee2efa654ffaac1a014da005c4e1457ce77;hb=68076a37d8f16f8ece6f2d16181cd18262611ced;hp=4511132b4e8b68dd2e1e930f57cc5b8a9d5280ae;hpb=889613a3ed8c1a0259a91aac1e4f2c2b66c4aa91;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 4511132b4..2cf8eee2e 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -1,90 +1,93 @@
+---
+# 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
     parameters:
-        - string:
-            name: BUNDLEURL
-            default: '{bundleurl}'
-            description: 'URL to karaf distribution zip'
+      - string:
+          name: BUNDLEURL
+          default: '{bundleurl}'
+          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-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-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: '{git-url}/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'
 
 # Macro: integration-gerrit-scm
 # Operation: this macro downloads a project gerrit
@@ -93,15 +96,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,14 +113,14 @@
 - 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
 # This is a single macro to use for all csit jobs who vote on every (relevant) patch set.
@@ -132,28 +135,28 @@
 - trigger:
     name: integration-trigger-patch-submitted
     triggers:
-        - gerrit:
-            server-name: '{server}'
-            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'
-            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}'
+      - gerrit:
+          server-name: '{server}'
+          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-openstack-controller-mininet
 # Operation: this macro will spin the controller and mininet vms
@@ -198,24 +201,54 @@
 - 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}'
+      - 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-get-slave-addresses
 # Operation: this macro gets the IP addresses of the dynamic vms
@@ -224,9 +257,7 @@
 - builder:
     name: integration-get-slave-addresses
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-get-slave-addresses.sh
+      - shell: !include-raw: include-raw-integration-get-slave-addresses.sh
 
 # Macro: integration-get-bundle-vars
 # Operation: this macro gets all bundle related variables
@@ -235,9 +266,7 @@
 - builder:
     name: integration-get-bundle-vars
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-get-bundle-vars.sh
+      - shell: !include-raw: include-raw-integration-get-bundle-vars.sh
 
 # Macro: integration-distribution-check
 # Operation: this macro deploys the controller with all fetures
@@ -246,20 +275,16 @@
 - builder:
     name: integration-distribution-check
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-distribution-check.sh
+      - 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
+# Used by: distribution-deploy-{stream} job template
 
 - builder:
     name: integration-deploy-controller-verify
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-deploy-controller-verify.sh
+      - 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
@@ -268,9 +293,7 @@
 - builder:
     name: integration-deploy-controller-offline
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-deploy-controller-offline.sh
+      - shell: !include-raw: include-raw-integration-deploy-controller-offline.sh
 
 # Macro: integration-deply-controller-run-test
 # Operation: this macro deploys single contoller and runs test
@@ -279,9 +302,7 @@
 - builder:
     name: integration-deploy-controller-run-test
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-deploy-controller-run-test.sh
+      - shell: !include-raw: include-raw-integration-deploy-controller-run-test.sh
 
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
@@ -290,9 +311,7 @@
 - builder:
     name: integration-configure-clustering
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-configure-clustering.sh
+      - shell: !include-raw: include-raw-integration-configure-clustering.sh
 
 # Macro: integration-start-cluster-run-test
 # Operation: this macro starts the 3-node cluster and runs test
@@ -301,9 +320,7 @@
 - builder:
     name: integration-start-cluster-run-test
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-start-cluster-run-test.sh
+      - 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
@@ -312,20 +329,16 @@
 - builder:
     name: integration-get-bundle-url
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-get-bundle-url.sh
+      - 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
+# Used by: 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: include-raw-integration-get-bundle-url-root.sh
 
 # Macro: integration-install-robotframework
 # Operation: Installs robotframework using pip to a virtualenv
@@ -334,9 +347,7 @@
 - builder:
     name: integration-install-robotframework
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-install-robotframework.sh
+      - shell: !include-raw: include-raw-integration-install-robotframework.sh
 
 # Macro: integration-cleanup-tmp
 # Operation: Cleans up temporary files created by build
@@ -345,9 +356,7 @@
 - builder:
     name: integration-cleanup-tmp
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-cleanup-tmp.sh
+      - shell: !include-raw: include-raw-integration-cleanup-tmp.sh
 
 # Macro: integration-multipatch-builder
 # Operation: checks out multiple patches and builds custom distribution
@@ -356,9 +365,7 @@
 - builder:
     name: integration-multipatch-builder
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-multipatch-distribution-test.sh
+      - shell: !include-raw: include-raw-integration-multipatch-distribution-test.sh
 
 # Macro: integration-cleanup-workspace
 # Operation: Cleans up files possibly left there by the previous build
@@ -367,27 +374,21 @@
 - builder:
     name: integration-cleanup-workspace
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-cleanup-workspace.sh
+      - shell: !include-raw: 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: 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: include-raw-integration-deploy-openstack-run-test.sh
 
 # Macro: integration-list-jobs
 # Operation: queries Jenkins jobs from jenkins.opendaylight.org and
@@ -399,13 +400,12 @@
 #   {blacklist}         List of sub-projects to filter out (e.g. longevity)
 #   {stream}            Development release name (e.g. boron)
 #   {jobs-filename}     Filename to write list into (e.g. carbon-jobs.lst)
+# NOTE: Requires xmlstarlet installed on node.
 
 - builder:
     name: integration-list-jobs
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-list-jobs.sh
+      - shell: !include-raw: include-raw-integration-list-jobs.sh
 
 # Macro: integration-replace-block-text
 # Operation: using starting and ending regex to
@@ -422,9 +422,23 @@
 - builder:
     name: integration-replace-block-text
     builders:
-        - shell:
-            !include-raw:
-                - include-raw-integration-replace-block-text.sh
+      - shell: !include-raw: include-raw-integration-replace-block-text.sh
+
+# Macro: 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 distribtion.
+# Used by: builder-merge job template
+#
+# This script requires the bundle vars that are created by the
+# get-bundle-vars macro script
+
+
+- builder:
+    name: integration-compare-distributions
+    builders:
+      - shell: !include-raw: include-raw-integration-compare-distributions.sh
 
 ##############
 # Publishers #
@@ -437,35 +451,35 @@
 - 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 -p $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
+                mkdir -p $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'