X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=b9e448a037128fde0800b03266154778bb5bc2a8;hb=HEAD;hp=2075a8cd7cbd438ea11744cc600563c5185cf400;hpb=0673d0736a8df6f50fc1bdc58e8eda95fa99d388;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 2075a8cd7..f874e911e 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -100,7 +100,7 @@ - string: name: KARAF_VERSION default: "{karaf-version}" - description: "karaf3, karaf4, odl, affects ODL deploy scripts" + description: "karaf3, karaf4, odl, bgpcep, controller, netconf affects ODL deploy scripts" - parameter: name: integration-bundle-url @@ -282,37 +282,6 @@ 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 - -- wrapper: - name: integration-openstack-controller-mininet - wrappers: - - openstack: - instances: - - cloud-name: "ODLRPC" - template-name: "{controller-image}" - count: "{controller-vms}" - - cloud-name: "ODLRPC" - template-name: "{mininet-image}" - count: "{mininet-vms}" - -# Macro: integration-openstack-controller-devstack -# Operation: this macro will spin the controller and devstack vms -# Used by: {project}-csit-openstack job templates -- wrapper: - name: integration-openstack-controller-devstack - wrappers: - - openstack: - instances: - - cloud-name: "ODLRPC" - template-name: "{controller-image}" - count: "{controller-vms}" - - cloud-name: "ODLRPC" - template-name: "{openstack-image}" - count: "{openstack-vms}" - ################# # Shell Scripts # ################# @@ -324,7 +293,7 @@ - builder: name: integration-get-slave-addresses builders: - - shell: !include-raw: integration-get-slave-addresses.sh + - shell: !include-raw-escape: integration-get-slave-addresses.sh - builder: name: integration-set-variables @@ -332,7 +301,7 @@ # Required bash variables: # KARAF_VERSION: 'karaf4' or 'karaf3'. Use distribution-karaf-version macro to set. builders: - - shell: !include-raw: integration-set-variables.sh + - shell: !include-raw-escape: integration-set-variables.sh - inject: properties-file: set_variables.env @@ -344,7 +313,7 @@ # KARAF_VERSION: 'karaf4' or 'karaf3'. Use distribution-karaf-version macro to set. builders: - integration-set-variables - - shell: !include-raw: integration-detect-variables.sh + - shell: !include-raw-escape: integration-detect-variables.sh - inject: properties-file: detect_variables.env @@ -355,7 +324,7 @@ - builder: name: integration-deploy-controller-run-test builders: - - shell: !include-raw: integration-deploy-controller-run-test.sh + - shell: !include-raw-escape: integration-deploy-controller-run-test.sh # Macro: integration-deply-non-karaf-controller-run-test # Operation: this macro deploys non-karaf controller application and run test @@ -364,7 +333,7 @@ - builder: name: integration-run-test builders: - - shell: !include-raw: integration-run-test.sh + - shell: !include-raw-escape: integration-run-test.sh # Macro: integration-configure-clustering # Operation: this macro configures the clustering @@ -373,7 +342,7 @@ - builder: name: integration-configure-clustering builders: - - shell: !include-raw: integration-configure-clustering.sh + - shell: !include-raw-escape: integration-configure-clustering.sh # Macro: integration-start-cluster-run-test # Operation: this macro starts the 3-node cluster and runs test @@ -382,7 +351,7 @@ - builder: name: integration-start-cluster-run-test builders: - - shell: !include-raw: integration-start-cluster-run-test.sh + - shell: !include-raw-escape: integration-start-cluster-run-test.sh # Macro: integration-install-robotframework # Operation: Installs robotframework using pip to a virtualenv @@ -391,7 +360,7 @@ - builder: name: integration-install-robotframework builders: - - shell: !include-raw: integration-install-robotframework.sh + - shell: !include-raw-escape: integration-install-robotframework.sh # Macro: integration-cleanup-tmp # Operation: Cleans up temporary files created by build @@ -400,7 +369,7 @@ - builder: name: integration-cleanup-tmp builders: - - shell: !include-raw: integration-cleanup-tmp.sh + - shell: !include-raw-escape: integration-cleanup-tmp.sh # Macro: integration-multipatch-builder # Operation: checks out multiple patches and builds custom distribution @@ -409,16 +378,7 @@ - builder: name: integration-multipatch-builder builders: - - shell: !include-raw: multipatch-distribution.sh - -# Macro: integration-cleanup-workspace -# Operation: Cleans up files possibly left there by the previous build -# Used by: {project}-csit-* job templates - -- builder: - name: integration-cleanup-workspace - builders: - - shell: !include-raw: integration-cleanup-workspace.sh + - shell: !include-raw-escape: multipatch-distribution.sh # Macro: integration-rebase-patch # Operation: For cloned project, rebase checked-out Gerrit patch onto $DISTROBRANCH. @@ -427,7 +387,7 @@ - builder: name: integration-rebase-gerrit-patch builders: - - shell: !include-raw: integration-rebase-gerrit-patch.sh + - shell: !include-raw-escape: integration-rebase-gerrit-patch.sh # Macro: integration-install-common-functions # Operation: Copy the common-functions.sh script to csit nodes @@ -435,16 +395,10 @@ - builder: name: integration-install-common-functions builders: - - shell: !include-raw: + - shell: !include-raw-escape: - copy-common-functions.sh - common-functions.sh -- builder: - name: integration-deploy-openstack-run-test - builders: - - shell: !include-raw: - - integration-deploy-openstack-run-test.sh - - builder: name: integration-compare-distributions # Operation: will compare an already created distribtion (probably last @@ -454,7 +408,12 @@ # Required bash variables: # KARAF_ARTIFACT: 'karaf' or 'distribution-karaf'. Use integration-set-variables. builders: - - shell: !include-raw: integration-compare-distributions.sh + - shell: !include-raw-escape: integration-compare-distributions.sh + +- builder: + name: integration-csit-archive-artifacts + builders: + - shell: !include-raw-escape: integration-csit-archive-artifacts.sh - builder: name: integration-upload-distribution @@ -469,7 +428,7 @@ files: - file-id: global-settings variable: GLOBAL_SETTINGS_FILE - - file-id: integration-settings + - file-id: "{settings-project}-settings" variable: SETTINGS_FILE - integration-set-variables - inject: @@ -507,27 +466,7 @@ - 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 - mv gclogs-${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. + - shell: !include-raw-escape: integration-csit-archive-artifacts.sh mark-unstable-if-failed: true - publisher: @@ -543,44 +482,5 @@ - 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 + - shell: !include-raw-escape: integration-csit-run-postscript.sh mark-unstable-if-failed: true