Add tempest pattern and change pattern for contrail envs
Related-Prod: PROD-36499
Change-Id: Ia9452f20efd5fd097553edad82254a5d6e9d6805
diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index 90d3db7..ce9f83f 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -218,6 +218,7 @@
parameters: [
string(name: 'PARENT_NODE_NAME', value: "openstack_slave_${env.LAB_CONFIG_NAME}"),
string(name: 'TCP_QA_REFS', value: env.TCP_QA_REFS),
+ string(name: 'TEMPEST_PATTERN', value: env.TEMPEST_PATTERN),
string(name: 'NODE', value: "openstack_slave_${env.LAB_CONFIG_NAME}")
],
wait: false,
diff --git a/jobs/templates/test-scenarios.yml b/jobs/templates/test-scenarios.yml
index f613aca..fb90131 100644
--- a/jobs/templates/test-scenarios.yml
+++ b/jobs/templates/test-scenarios.yml
@@ -143,29 +143,34 @@
tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight
-
+ test-pattern-with-contrail:
+ ^heat_tempest_plugin.tests*|^tempest.api.image*|^tempest_horizon*|^tempest.api.identity*|^tempest.api.network*|^tempest.api.compute*|^tempest.api.volume*|^tempest.scenario*|^tempest.api.object_storage*
test_scenario:
- mcp-update-pike-dvr-sl:
deployment: released-heat-cicd-pike-dvr-sl
disabled: true
run-test-opts: '{test-opt}'
+ tempest_pattern: 'tempest'
display-name: MCP update (pike)
- mcp-update-queens-dvr-sl:
deployment: released-heat-cicd-queens-dvr-sl
disabled: true
+ tempest_pattern: 'tempest'
run-test-opts: '{test-opt}'
display-name: MCP update (queens)
- mcp-update-pike-contrail-sl:
deployment: released-heat-cicd-pike-contrail41-sl
disabled: true
+ tempest_pattern: '{test-pattern-with-contrail}'
run-test-opts: '{test-opt-with-contrail}'
display-name: MCP update (pike + OC)
- mcp-update-queens-contrail-sl:
deployment: released-heat-cicd-queens-contrail41-sl
disabled: true
+ tempest_pattern: '{test-pattern-with-contrail}'
run-test-opts: '{test-opt-with-contrail}'
display-name: MCP update (queens + OC)
@@ -268,6 +273,12 @@
Additional pytest options are allowed.
name: RUN_TEST_OPTS
trim: 'false'
+ - text:
+ default: '{tempest_pattern}'
+ description: |-
+ Examples: 'set=full','set=smoke' or test name.
+ name: TEMPEST_PATTERN
+ trim: 'false'
- bool:
default: true
name: REPORT_TO_TESTRAIL