X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=b9e448a037128fde0800b03266154778bb5bc2a8;hb=807fca79b9cbd070495690797e1b0cc019caf5f9;hp=4a5877ff481ea4a23b9262f3d79b95667d0e70f7;hpb=240756b41a78658792ad3e940526acda499ef96a;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 4a5877ff4..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: @@ -43,34 +94,6 @@ 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) - - parameter: name: integration-distribution-stream parameters: @@ -131,14 +154,6 @@ default: '{test-options}' description: 'Robot command options' -- parameter: - name: gate-job - parameters: - - string: - name: GATE_JOB - default: '{gate-job}' - description: 'Flag to indicate if job is for gating or not' - - parameter: name: integration-distribution-git-url parameters: @@ -155,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 @@ -278,126 +285,6 @@ # 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 @@ -578,30 +465,18 @@ # 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}' + 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-csit-archive-build