X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=f798130e40c1aa10629eb9b832ba8629d07809b7;hb=5fc2156290374aff85016f902c7c0304b97ab204;hp=4e2ccf0de917121a68700a164963f25d0c4ba7d0;hpb=c4941c962a803dde9193c2757d8e8878c792c515;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 4e2ccf0de..f798130e4 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -12,12 +12,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 @@ -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: @@ -71,6 +79,22 @@ default: '{stream}' description: 'Distribution stream string, for suites to know which behavior to expect' +- parameter: + name: integration-script-plan + parameters: + - string: + name: SCRIPTPLAN + default: '{script-plan}' + description: 'Script plan we will run before downloading and un-archiving am ODL distribution' + +- parameter: + name: integration-config-plan + parameters: + - string: + 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 parameters: @@ -96,8 +120,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 @@ -186,7 +210,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 @@ -303,6 +327,36 @@ - opendaylight-infra-stack: stack-template: 'csit-3-instance-type.yaml' +# Macro: integration-apex-stack-3-type +# Operation: Sets environment and then calls opendaylight-apex-stack to spin +# up csit lab using openstack-heat. +# Used by: {project}-csit-* apex related job templates + +- builder: + name: integration-apex-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-apex-stack: + stack-template: 'csit-apex-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. @@ -336,6 +390,24 @@ - opendaylight-infra-stack: stack-template: 'csit-4-instance-type.yaml' +# 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-get-apex-addresses + builders: + - shell: !include-raw: integration-get-apex-addresses.sh + +# Macro: integration-apex-run-tests +# Operation: this macro just runs the robot suites +# Used by: {project}-csit-* apex related job templates + +- builder: + name: integration-apex-run-tests + builders: + - shell: !include-raw: integration-apex-run-tests.sh + # Macro: integration-get-slave-addresses # Operation: this macro gets the IP addresses of the dynamic vms # Used by: {project}-csit-* job templates @@ -374,9 +446,7 @@ - builder: name: integration-deploy-controller-run-test builders: - - shell: !include-raw: - - common-functions.sh - - 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 @@ -385,9 +455,7 @@ - builder: name: integration-configure-clustering builders: - - shell: !include-raw: - - common-functions.sh - - 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 @@ -443,10 +511,27 @@ 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-install-common-functions + builders: + - shell: !include-raw: + - copy-common-functions.sh + - common-functions.sh + - builder: name: integration-deploy-openstack-run-test builders: - - shell: !include-raw: integration-deploy-openstack-run-test.sh + - 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 @@ -515,44 +600,88 @@ 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: + - 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-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 + +- publisher: + name: integration-csit-collect-netvirt-logs + publishers: + - postbuildscript: + builders: + - 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