X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=8a1897310b796055366539be1934c291cebfada3;hb=b839a835f780cf9a899ca4275ae92f1e4aee5578;hp=f798130e40c1aa10629eb9b832ba8629d07809b7;hpb=7c9dc632b93f52ee8fe0368a5fa5c87423b19c13;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index f798130e4..8a1897310 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -1,13 +1,84 @@ --- # 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-max-mem: "{controller-max-mem}" + controller-scope: "{controller-scope}" + controller-use-features-boot: "{use-features-boot}" + feature-elasticsearch-attribute: "{elasticsearch-attribute}" + +- 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. + (note: Do not include decanter* features used for harvesting JVM metrics. + They are inserted in install scripts.) + + - 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: CONTROLLERMAXMEM + default: "{controller-max-mem}" + description: | + Max Heap size to use when starting the controller. + + - string: + name: ELASTICSEARCHATTRIBUTE + default: "{feature-elasticsearch-attribute}" + description: | + Configure the period the script should harvest JVM metrics. + Possible values: long (=120000) + short (=5000) + any number between 5000 and 120000 + disabled (use for disabling harvesting) + + - string: + name: USEFEATURESBOOT + default: "{controller-use-features-boot}" + description: "Boolean to toggle whether featuresBoot is appended or ignored" + - parameter: name: integration-distribution-branch parameters: - string: name: DISTROBRANCH - default: '{branch}' - description: 'Distribution GIT branch' + default: "{branch}" + description: "Distribution GIT branch" - parameter: name: distribution-karaf-version @@ -16,144 +87,108 @@ parameters: - string: name: KARAF_VERSION - default: '{karaf-version}' - description: 'karaf3, karaf4, odl, affects ODL deploy scripts' + default: "{karaf-version}" + description: "karaf3, karaf4, odl, affects ODL deploy scripts" - parameter: name: integration-bundle-url parameters: - string: name: BUNDLE_URL - default: '{bundle-url}' - description: 'URL to karaf distribution zip' + 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' + default: "{repo-url}" + description: "URL to feature repo artifact" - parameter: name: integration-jdk-version parameters: - string: name: JDKVERSION - default: '{jdkversion}' - description: 'Parameter to indicate JAVA Version' - -- parameter: - name: integration-controller-scope - parameters: - - string: - name: CONTROLLERSCOPE - default: '{controller-scope}' - description: 'Feature Only or Feature All test' - -- parameter: - name: integration-controller-features - parameters: - - string: - name: CONTROLLERFEATURES - 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) + default: "{jdkversion}" + description: "Parameter to indicate JAVA Version" - parameter: name: integration-distribution-stream parameters: - string: name: DISTROSTREAM - default: '{stream}' - description: 'Distribution stream string, for suites to know which behavior to expect' + 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' + 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' + default: "{config-plan}" + description: "Config plan we will run after un-archiving and starting an ODL distribution" - parameter: name: integration-stream-test-plan parameters: - string: name: STREAMTESTPLAN - default: '{stream-test-plan}' - description: 'Stream-specific test plan we will run' + default: "{stream-test-plan}" + description: "Stream-specific test plan we will run" - parameter: name: integration-test-plan parameters: - string: name: TESTPLAN - default: '{test-plan}' - description: 'General test plan we will run unless stream-specific one is found' + 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}' + 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/clustering/ha_l2.robot - openstack/tempest/tempest.robot netvirt/elan/elan.robot). + 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/clustering/ha_l2.robot + openstack/tempest/tempest.robot netvirt/elan/elan.robot). - parameter: name: integration-test-options parameters: - string: name: TESTOPTIONS - default: '{test-options}' - description: 'Robot command options' + default: "{test-options}" + description: "Robot command options" - parameter: name: integration-distribution-git-url parameters: - string: name: DISTROGITURL - default: '{git-url}/integration/distribution' - description: 'Distribution GIT URL (do not modify)' + default: "{git-url}/integration/distribution" + description: "Distribution GIT URL (do not modify)" - parameter: name: integration-patch-refspec parameters: - string: name: PATCHREFSPEC - 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' + default: "{branch}" + description: "Integration Patch Refspec" # Macro: integration-gerrit-scm # Operation: this macro downloads a project gerrit @@ -163,14 +198,14 @@ name: integration-gerrit-scm scm: - git: - credentials-id: 'opendaylight-jenkins-ssh' - url: '$GIT_BASE' - basedir: '{basedir}' - refspec: '{refspec}' + credentials-id: "opendaylight-jenkins-ssh" + url: "$GIT_BASE" + basedir: "{basedir}" + refspec: "{refspec}" branches: - - 'origin/{branch}' + - "origin/{branch}" skip-tag: true - choosing-strategy: 'gerrit' + choosing-strategy: "gerrit" # Macro: integration-distribution-scm # Operation: this macro downloads the integration/distribution repo using distribution as basedir @@ -180,12 +215,12 @@ name: integration-distribution-scm scm: - git: - credentials-id: 'opendaylight-jenkins-ssh' - basedir: 'distribution' - url: '$DISTROGITURL' - refspec: '' + credentials-id: "opendaylight-jenkins-ssh" + basedir: "distribution" + url: "$DISTROGITURL" + refspec: "" branches: - - 'origin/{branch}' + - "origin/{branch}" skip-tag: true # Macro: integration-trigger-patch-submitted @@ -202,7 +237,7 @@ name: integration-trigger-patch-submitted triggers: - gerrit: - server-name: '{gerrit-server-name}' + server-name: "{gerrit-server-name}" trigger-on: - patchset-created-event: exclude-drafts: true @@ -216,13 +251,13 @@ gerrit-build-unstable-codereview-value: 0 projects: - project-compare-type: ANT - project-pattern: '{project}' + project-pattern: "{project}" branches: - branch-compare-type: ANT - branch-pattern: '**/{branch}' + branch-pattern: "**/{branch}" file-paths: - compare-type: ANT - pattern: '{files}' + pattern: "{files}" # Macro: integration-csit-only # Operation: this macro sets a trigger on reverse job list @@ -232,8 +267,8 @@ name: integration-csit-trigger triggers: - reverse: - jobs: '{jobs}' - result: 'success' + jobs: "{jobs}" + result: "success" # Macro: integration-openstack-controller-mininet # Operation: this macro will spin the controller and mininet vms @@ -244,12 +279,12 @@ wrappers: - openstack: instances: - - cloud-name: 'ODLRPC' - template-name: '{controller-image}' - count: '{controller-vms}' - - cloud-name: 'ODLRPC' - template-name: '{mininet-image}' - count: '{mininet-vms}' + - 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 @@ -259,155 +294,17 @@ wrappers: - openstack: instances: - - cloud-name: 'ODLRPC' - template-name: '{controller-image}' - count: '{controller-vms}' - - cloud-name: 'ODLRPC' - template-name: '{openstack-image}' - count: '{openstack-vms}' + - cloud-name: "ODLRPC" + template-name: "{controller-image}" + count: "{controller-vms}" + - cloud-name: "ODLRPC" + template-name: "{openstack-image}" + count: "{openstack-vms}" ################# # 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 - -- builder: - name: integration-infra-stack - 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 - -- 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-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. -# 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-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 @@ -527,12 +424,6 @@ - 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 @@ -570,30 +461,17 @@ # Publishers # ############## -# Macro: integration-robot -# Operation: this macro publishes robot results -# Used by: {project}-csit-* job templates - -- publisher: - name: integration-robot - publishers: - - robot: - output-path: '' - other-files: '' - unstable-threshold: '{unstable-if}' - pass-threshold: '{pass-if}' - only-critical: false - - publisher: - name: integration-robot-tempest + name: integration-csit-publish publishers: - robot: - output-path: '' - other-files: - - tempest_results.html - unstable-threshold: '{unstable-if}' - pass-threshold: '{pass-if}' + output-path: "" + 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 - publisher: name: integration-csit-archive-build @@ -620,6 +498,7 @@ 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 @@ -630,7 +509,6 @@ # TODO: Tweak the compression level if better ratio (or speed) is needed. mark-unstable-if-failed: true - - publisher: name: integration-csit-run-postscript publishers: @@ -646,8 +524,8 @@ build-steps: - config-file-provider: files: - - file-id: 'odl-elastic-cloud' - target: '${HOME}/.netrc' + - file-id: "odl-elastic-cloud" + target: "${HOME}/.netrc" - shell: | #!/bin/bash #The following script runs any configurable postplan stored in test/csit/postplans. @@ -679,7 +557,7 @@ - UNSTABLE build-steps: - inject: - properties-file: 'slave_addresses.txt' + properties-file: "slave_addresses.txt" - shell: | #!/bin/bash source /tmp/common-functions.sh ${BUNDLEFOLDER}