X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=b9e448a037128fde0800b03266154778bb5bc2a8;hb=807fca79b9cbd070495690797e1b0cc019caf5f9;hp=f2df2a0624c9245c9a41142985b9f81528a33e70;hpb=ef1c25f621317728efa028a141bda654715da651;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index f2df2a062..b9e448a03 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -1,6 +1,57 @@ --- # TODO: Make all bash constants more readable. # e.g.: DISTRIBUTION_BRANCH instead of DISTROBRANCH. + +- parameter: + name: integration-csit-parameters + parameters: + - opendaylight-infra-parameters: + os-cloud: '{os-cloud}' + project: 'integration/test' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + # CSIT + - integration-bundle-url: + bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{repo-url}' + - integration-test-options: + test-options: '{robot-options}' + - integration-controller-parameters: + controller-debug-map: '{debug-map}' + controller-features: '{install-features}' + controller-scope: '{controller-scope}' + controller-use-features-boot: '{use-features-boot}' + +- parameter: + name: integration-controller-parameters + parameters: + - string: + name: CONTROLLERSCOPE + default: '{controller-scope}' + description: 'Feature Only or Feature All test' + + - string: + name: CONTROLLERFEATURES + default: '{controller-features}' + description: 'Features to install in the controller separated by comma' + + - 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) + + - string: + name: USEFEATURESBOOT + default: '{controller-use-features-boot}' + description: 'Boolean to toggle whether featuresBoot is appended or ignored' + + - parameter: name: integration-distribution-branch parameters: @@ -12,12 +63,12 @@ - parameter: name: distribution-karaf-version # Arguments: - # karaf-version: Provide, otherwise releng-defaults value is used. + # karaf-version: Provide, otherwise defaults.yaml value is used. parameters: - string: name: KARAF_VERSION default: '{karaf-version}' - description: 'karaf3 or karaf4, affects ODL deploy scripts' + description: 'karaf3, karaf4, odl, affects ODL deploy scripts' - parameter: name: integration-bundle-url @@ -28,48 +79,44 @@ description: 'URL to karaf distribution zip' - parameter: - name: integration-jdk-version + name: integration-repo-url parameters: - string: - name: JDKVERSION - default: '{jdkversion}' - description: 'Parameter to indicate JAVA Version' + name: REPO_URL + default: '{repo-url}' + description: 'URL to feature repo artifact' - parameter: - name: integration-controller-scope + name: integration-jdk-version parameters: - string: - name: CONTROLLERSCOPE - default: '{controller-scope}' - description: 'Feature Only or Feature All test' + name: JDKVERSION + default: '{jdkversion}' + description: 'Parameter to indicate JAVA Version' - parameter: - name: integration-controller-features + name: integration-distribution-stream parameters: - string: - name: CONTROLLERFEATURES - default: '{controller-features}' - description: 'Features to install in the controller separated by comma' + name: DISTROSTREAM + default: '{stream}' + description: 'Distribution stream string, for suites to know which behavior to expect' - parameter: - name: integration-controller-debug-map + name: integration-script-plan 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) + name: SCRIPTPLAN + default: '{script-plan}' + description: 'Script plan we will run before downloading and un-archiving am ODL distribution' - parameter: - name: integration-distribution-stream + name: integration-config-plan parameters: - string: - name: DISTROSTREAM - default: '{stream}' - description: 'Distribution stream string, for suites to know which behavior to expect' + name: CONFIGPLAN + default: '{config-plan}' + description: 'Config plan we will run after un-archiving and starting an ODL distribution' - parameter: name: integration-stream-test-plan @@ -96,8 +143,8 @@ 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/). + (ex. openstack/connectivity/l2.robot openstack/clustering/ha_l2.robot + openstack/tempest/tempest.robot netvirt/elan/elan.robot). - parameter: name: integration-test-options @@ -123,14 +170,6 @@ 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 @@ -186,7 +225,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck + comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' override-votes: true gerrit-build-unstable-verified-value: +1 gerrit-build-unstable-codereview-value: 0 @@ -246,95 +285,23 @@ # Shell Scripts # ################# -# 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 +# Macro: integration-get-apex-addresses +# Operation: this macro gets the IP addresses of the dynamic vms from apex snapshots +# Used by: {project}-csit-* apex related job templates - builder: - name: integration-infra-stack + name: integration-get-apex-addresses 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}' - -# 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 + - shell: !include-raw: integration-get-apex-addresses.sh -- 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-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 +# Macro: integration-apex-run-tests +# Operation: this macro just runs the robot suites +# Used by: {project}-csit-* apex related job templates - builder: - name: integration-infra-stack-4-type + name: integration-apex-run-tests 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' + - shell: !include-raw: integration-apex-run-tests.sh # Macro: integration-get-slave-addresses # Operation: this macro gets the IP addresses of the dynamic vms @@ -441,7 +408,7 @@ # Macro: integration-install-common-functions # Operation: Copy the common-functions.sh script to csit nodes -# Used by: *-csit-* job templates +# Used by: {project}-csit-* job templates - builder: name: integration-install-common-functions builders: @@ -455,6 +422,12 @@ - shell: !include-raw: - integration-deploy-openstack-run-test.sh +- builder: + name: integration-apex-image-manager + builders: + - shell: !include-raw: + - ../opendaylight-infra-apex-image-management.sh + - builder: name: integration-compare-distributions # Operation: will compare an already created distribtion (probably last @@ -492,74 +465,106 @@ # Publishers # ############## -# Macro: integration-robot -# Operation: this macro publishes robot results -# Used by: {project}-csit-* job templates - - publisher: - name: integration-robot + name: integration-csit-publish publishers: - robot: output-path: '' - other-files: '' - unstable-threshold: '{unstable-if}' - pass-threshold: '{pass-if}' + other-files: '{obj:robot_other_files}' + unstable-threshold: '{robot-unstable-threshold}' + pass-threshold: '{robot-pass-threshold}' only-critical: false + - integration-csit-archive-build + - integration-csit-run-postscript + - releng-openstack-stack-delete - publisher: - name: integration-robot-tempest + name: integration-csit-archive-build publishers: - - robot: - output-path: '' - other-files: - - tempest_results.html - unstable-threshold: '{unstable-if}' - pass-threshold: '{pass-if}' - only-critical: false + - postbuildscript: + builders: + - role: BOTH + build-on: + - ABORTED + - FAILURE + - NOT_BUILT + - SUCCESS + - UNSTABLE + build-steps: + - shell: | + #!/bin/bash + echo "Archiving csit artifacts" + cd $WORKSPACE + mkdir -p ./archives + for i in `seq 1 ${NUM_ODL_SYSTEM}`; do + NODE_FOLDER="./archives/odl_${i}" + mkdir -p ${NODE_FOLDER} + mv odl${i}_* ${NODE_FOLDER} || true + mv karaf_${i}_*_threads* ${NODE_FOLDER} || true + mv *_${i}.png ${NODE_FOLDER} || true + mv /tmp/odl${i}_* ${NODE_FOLDER} || true + done + 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-archive-build + name: integration-csit-run-postscript publishers: - 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' + - 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 - publisher: - name: integration-csit-run-postscript + name: integration-csit-collect-netvirt-logs 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: + - inject: + properties-file: 'slave_addresses.txt' + - shell: | + #!/bin/bash + source /tmp/common-functions.sh ${BUNDLEFOLDER} + collect_netvirt_logs + mark-unstable-if-failed: true