X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=8af8e690d1db17525168d5d8262082579124e9ca;hb=33a187693430a85a0befa9c309cfe752aaf6c31c;hp=2cf8eee2efa654ffaac1a014da005c4e1457ce77;hpb=a4967ff9b844ee0fd36877729a6dc2e377169bf2;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 2cf8eee2e..8af8e690d 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -10,11 +10,21 @@ 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}' + 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: @@ -41,6 +51,18 @@ 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: @@ -65,6 +87,17 @@ 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. + (ex. integration/test/csit/suites/openstack/connectivity/01_l2_tests.robot + integration/test/csit/suites/netvirt/ElanService/). + - parameter: name: integration-test-options parameters: @@ -158,6 +191,17 @@ - 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-trigger + triggers: + - reverse: + jobs: '{jobs}' + result: 'success' + # Macro: integration-openstack-controller-mininet # Operation: this macro will spin the controller and mininet vms # Used by: {project}-csit-* job templates @@ -250,6 +294,39 @@ - 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-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-slave-addresses # Operation: this macro gets the IP addresses of the dynamic vms # Used by: {project}-csit-* job templates @@ -257,43 +334,59 @@ - builder: name: integration-get-slave-addresses 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 + - shell: !include-raw: integration-get-slave-addresses.sh - builder: - name: integration-get-bundle-vars + 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-get-bundle-vars.sh + - shell: !include-raw: integration-set-variables.sh + - inject: + properties-file: set_variables.env -# Macro: integration-distribution-check -# Operation: this macro deploys the controller with all fetures -# Used by: {project}-distribution-check-{stream} job template +- builder: + 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: + - integration-set-variables + - shell: !include-raw: integration-detect-variables.sh + - inject: + properties-file: detect_variables.env - builder: name: integration-distribution-check + # Operation: Locally deploy ODL with all fetures, check it is not broken. + # Required bash variables: + # KARAF_VERSION: 'karaf4' or 'karaf3'. + # Use distribution-karaf-version macro to customize. 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: distribution-deploy-{stream} job template + - integration-set-variables + - shell: !include-raw: integration-distribution-check.sh - builder: - name: integration-deploy-controller-verify + name: distribution-deploy-verify + # Operation: Deploy ODL with all fetures and check it is not broken. + # Required bash variables: + # KARAF_VERSION: 'karaf4' or 'karaf3'. + # Use distribution-karaf-version macro to customize. 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 + - integration-detect-variables + - shell: !include-raw: distribution-deploy-verify.sh - builder: - name: integration-deploy-controller-offline + name: distribution-deploy-offline + # Operation: Deploys ODL on the current system, with no external repo configuration, check it works. + # Required bash variables: + # KARAF_VERSION: 'karaf4' or 'karaf3'. + # Use distribution-karaf-version macro to customize. builders: - - shell: !include-raw: include-raw-integration-deploy-controller-offline.sh + - integration-detect-variables + - shell: !include-raw: distribution-deploy-offline.sh # Macro: integration-deply-controller-run-test # Operation: this macro deploys single contoller and runs test @@ -302,7 +395,7 @@ - builder: name: integration-deploy-controller-run-test builders: - - shell: !include-raw: include-raw-integration-deploy-controller-run-test.sh + - shell: !include-raw: integration-deploy-controller-run-test.sh # Macro: integration-configure-clustering # Operation: this macro configures the clustering @@ -311,7 +404,7 @@ - builder: name: integration-configure-clustering builders: - - shell: !include-raw: include-raw-integration-configure-clustering.sh + - shell: !include-raw: integration-configure-clustering.sh # Macro: integration-start-cluster-run-test # Operation: this macro starts the 3-node cluster and runs test @@ -320,25 +413,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: 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 @@ -347,7 +422,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 @@ -356,7 +431,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 @@ -365,7 +440,7 @@ - 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-workspace # Operation: Cleans up files possibly left there by the previous build @@ -374,7 +449,7 @@ - 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 $DISTROBRANCH. @@ -383,62 +458,45 @@ - 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 - -# Macro: integration-list-jobs -# Operation: queries Jenkins jobs from jenkins.opendaylight.org and -# writes a list of the jobs corresponding to the search terms to a file. -# Used by: builder-merge job template -# -# This script requires the following JJB variables to be passed in: -# {search_string} Job type to act as a primary filter (e.g. csit) -# {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. + - shell: !include-raw: integration-deploy-openstack-run-test.sh - builder: - name: integration-list-jobs + 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: include-raw-integration-list-jobs.sh - -# Macro: integration-replace-block-text -# Operation: using starting and ending regex to -# replace a block of text in a file with the text in -# another file. Regex should be basic and work with sed -# Used by: builder-merge job template -# -# This script requires the following JJB variables to be passed in: -# {starting-regex} -# {ending-regex} -# {file-with-changes-to-insert} -# {file-to-change} + - shell: !include-raw: integration-compare-distributions.sh - builder: - name: integration-replace-block-text + 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: - - 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 + - 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 # @@ -483,3 +541,31 @@ 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'