X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=d2b3a2764808bb3be13fd2e3fc0adad7982aa87e;hb=8651b7df8d4f0973c495691389ec872e49d2955c;hp=ba544ca79049ef30b7bf3e4e56dde64abeb7c198;hpb=550bc5f59f784bb7e83d091cfba155c5b75fdbc3;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index ba544ca79..d2b3a2764 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -14,6 +14,14 @@ 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' + - parameter: name: integration-controller-scope parameters: @@ -30,13 +38,29 @@ 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' + +- parameter: + name: integration-stream-test-plan + parameters: + - 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: 'Test plan we will run' + description: 'General test plan we will run unless stream-specific one is found' - parameter: name: integration-test-options @@ -77,6 +101,7 @@ branches: - 'origin/{branch}' skip-tag: true + shallow-clone: true choosing-strategy: 'gerrit' # Macro: integration-distribution-scm @@ -94,6 +119,7 @@ branches: - 'origin/{branch}' skip-tag: true + shallow-clone: true # Macro: integration-trigger-patch-submitted # Operation: this macro sets a trigger for patch submitted on a path pattern @@ -150,6 +176,26 @@ - compare-type: 'ANT' pattern: '{pattern}' +# 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 + 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 @@ -168,6 +214,23 @@ count: '{mininet-vms}' stop-on-terminate: False +# 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: + - rk-c7-java: + cloud-name: 'Rackspace DFW - Integration Dynamic Lab' + count: '{controller-vms}' + stop-on-terminate: False + - rk-c7-devstack: + cloud-name: 'Rackspace DFW - Devstack' + count: '{openstack-vms}' + stop-on-terminate: False + ################# # Shell Scripts # ################# @@ -180,7 +243,8 @@ name: integration-get-slave-addresses builders: - shell: - !include-raw include-raw-integration-get-slave-addresses.sh + !include-raw: + - include-raw-integration-get-slave-addresses.sh # Macro: integration-get-bundle-vars # Operation: this macro gets all bundle related variables @@ -190,17 +254,30 @@ name: integration-get-bundle-vars builders: - shell: - !include-raw include-raw-integration-get-bundle-vars.sh + !include-raw: + - include-raw-integration-get-bundle-vars.sh + +# Macro: integration-distribution-check +# Operation: this macro deploys the controller with all fetures +# Used by: {project}-distribution-check-{stream} job template + +- builder: + name: integration-distribution-check + 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-distrbution-deploy-{stream} job template +# Used by: integration-distribution-deploy-{stream} job template - builder: name: integration-deploy-controller-verify builders: - shell: - !include-raw include-raw-integration-deploy-controller-verify.sh + !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 @@ -210,7 +287,8 @@ name: integration-deploy-controller-offline builders: - shell: - !include-raw include-raw-integration-deploy-controller-offline.sh + !include-raw: + - include-raw-integration-deploy-controller-offline.sh # Macro: integration-deply-controller-run-test # Operation: this macro deploys single contoller and runs test @@ -220,17 +298,19 @@ name: integration-deploy-controller-run-test builders: - shell: - !include-raw include-raw-integration-deploy-controller-run-test.sh + !include-raw: + - include-raw-integration-deploy-controller-run-test.sh -# Macro: integration-deploy-controller -# Operation: this macro prepares 3-node cluster controller -# Used by: {project}-csit-3node-* job templates +# Macro: include-raw-integration-deploy-robot-testing +# Operation: this macro only resolves suite path from testplan +# Used by: {project}-openstack-{functionality}-daily-{openstack}-{odl} job templates - builder: - name: integration-deploy-controller + name: include-raw-integration-deploy-devstack-testing builders: - shell: - !include-raw include-raw-integration-deploy-controller.sh + !include-raw: + - include-raw-integration-deploy-devstack-testing.sh # Macro: integration-configure-clustering # Operation: this macro configures the clustering @@ -240,7 +320,8 @@ name: integration-configure-clustering builders: - shell: - !include-raw include-raw-integration-configure-clustering.sh + !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 @@ -250,7 +331,8 @@ name: integration-start-cluster-run-test builders: - shell: - !include-raw include-raw-integration-start-cluster-run-test.sh + !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 @@ -260,7 +342,8 @@ name: integration-get-bundle-url builders: - shell: - !include-raw include-raw-integration-get-bundle-url.sh + !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 @@ -270,7 +353,8 @@ name: integration-get-bundle-url-root builders: - shell: - !include-raw include-raw-integration-get-bundle-url-root.sh + !include-raw: + - include-raw-integration-get-bundle-url-root.sh # Macro: integration-install-robotframework # Operation: Installs robotframework using pip to a virtualenv @@ -280,7 +364,8 @@ name: integration-install-robotframework builders: - shell: - !include-raw include-raw-integration-install-robotframework.sh + !include-raw: + - include-raw-integration-install-robotframework.sh # Macro: integration-cleanup-tmp # Operation: Cleans up temporary files created by build @@ -290,7 +375,8 @@ name: integration-cleanup-tmp builders: - shell: - !include-raw include-raw-integration-cleanup-tmp.sh + !include-raw: + - include-raw-integration-cleanup-tmp.sh # Macro: integration-multipatch-builder # Operation: checks out multiple patches and builds custom distribution @@ -300,7 +386,8 @@ name: integration-multipatch-builder builders: - shell: - !include-raw include-raw-integration-multipatch-distribution-test.sh + !include-raw: + - include-raw-integration-multipatch-distribution-test.sh # Macro: integration-cleanup-worspace # Operation: Cleans up files possibly left there by the previous build @@ -310,8 +397,26 @@ name: integration-cleanup-workspace builders: - shell: - !include-raw include-raw-integration-cleanup-workspace.sh + !include-raw: + - include-raw-integration-cleanup-workspace.sh +# Macro: integration-rebase-patch +# Operation: For cloned project, rebase checked-out Gerrit patch onto $BRANCH. +# Used by: integration-patch-distribution-* job template + +- builder: + name: integration-rebase-gerrit-patch + builders: + - 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 ############## # Publishers # ##############