X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=3933b0cd989e42049a612d199baf83f0da891530;hb=9712aebd07d323d91d7e9f7f1392ae7768338644;hp=d805016d588b53b11dd531a927b780f0166fd460;hpb=5dc8c48a0fa0b6cd840613d03b08f4cbb8285e35;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index d805016d5..3933b0cd9 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -27,6 +27,14 @@ default: '{bundle-url}' description: 'URL to karaf distribution zip' +- parameter: + name: integration-repo-url + parameters: + - string: + name: REPO_URL + default: '{repo-url}' + description: 'URL to feature repo artifact' + - parameter: name: integration-jdk-version parameters: @@ -51,6 +59,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: @@ -75,6 +95,18 @@ 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: @@ -99,6 +131,14 @@ 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 # Used by: all csit jobs @@ -138,7 +178,7 @@ # 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: -# server: name of gerrit server to listen to +# 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 @@ -146,7 +186,7 @@ name: integration-trigger-patch-submitted triggers: - gerrit: - server-name: '{server}' + server-name: '{gerrit-server-name}' trigger-on: - patchset-created-event: exclude-drafts: true @@ -154,7 +194,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck + comment-contains-value: 'recheck$' override-votes: true gerrit-build-unstable-verified-value: +1 gerrit-build-unstable-codereview-value: 0 @@ -335,36 +375,6 @@ - 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: - - integration-set-variables - - shell: !include-raw: integration-distribution-check.sh - -- builder: - 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: - - integration-detect-variables - - shell: !include-raw: distribution-deploy-verify.sh - -- builder: - 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: - - 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 # Used by: {project}-csit-1node-* job templates @@ -437,45 +447,21 @@ builders: - shell: !include-raw: integration-rebase-gerrit-patch.sh +# Macro: integration-install-common-functions +# Operation: Copy the common-functions.sh script to csit nodes +# Used by: {project}-csit-* job templates - builder: - name: integration-deploy-openstack-run-test - builders: - - shell: !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. - -- builder: - name: integration-list-jobs + name: integration-install-common-functions builders: - - shell: !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: + - copy-common-functions.sh + - common-functions.sh - builder: - name: integration-replace-block-text + name: integration-deploy-openstack-run-test builders: - - shell: !include-raw: integration-replace-block-text.sh - + - shell: !include-raw: + - integration-deploy-openstack-run-test.sh - builder: name: integration-compare-distributions @@ -544,40 +530,58 @@ 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' + - role: BOTH + build-on: + - ABORTED + - FAILURE + - NOT_BUILT + - SUCCESS + - UNSTABLE + build-steps: + - 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.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 --threads=0 > ./archives/hprof.tar.xz + # TODO: Tweak the compression level if better ratio (or speed) is needed. + 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' + - role: BOTH + build-on: + - ABORTED + - FAILURE + - NOT_BUILT + - SUCCESS + - UNSTABLE + build-steps: + - 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 + mark-unstable-if-failed: true