From f11e67105534a243048073d9b86a83320643c47a Mon Sep 17 00:00:00 2001 From: Arx Cruz Date: Mon, 25 Jun 2018 07:29:42 -0300 Subject: [PATCH] Running containerized tempest only in containerized environment Tempest container is available and built when we deploy containerized undercloud. Since undercloud is containerized from rocky and ongoing, this patch enable containerized tempest when undercloud is running as container. Also, moved all tempest related configuration to the end of file to avoid overwritten options Depends-On: https://review.openstack.org/#/c/580384/ Change-Id: Icdb0f2b033ad0d1ba2548c591fa32dc649fff319 --- config/general_config/featureset001.yml | 30 ++++++---- config/general_config/featureset002.yml | 31 ++++++---- config/general_config/featureset003.yml | 10 ++++ config/general_config/featureset005.yml | 52 +++++++++------- config/general_config/featureset006.yml | 9 +++ config/general_config/featureset007.yml | 9 +++ config/general_config/featureset008.yml | 9 +++ config/general_config/featureset010.yml | 43 ++++++------- config/general_config/featureset016.yml | 43 ++++++------- config/general_config/featureset017.yml | 44 +++++++------- config/general_config/featureset018.yml | 43 ++++++------- config/general_config/featureset019.yml | 80 ++++++++++++++----------- config/general_config/featureset020.yml | 37 ++++++++---- config/general_config/featureset021.yml | 58 +++++++++++------- config/general_config/featureset027.yml | 65 +++++++++++--------- config/general_config/featureset028.yml | 9 +++ config/general_config/featureset030.yml | 38 ++++++------ config/general_config/featureset031.yml | 25 +++++--- config/general_config/featureset032.yml | 20 +++++-- config/general_config/featureset033.yml | 21 +++++-- config/general_config/featureset035.yml | 35 +++++++---- config/general_config/featureset040.yml | 14 ++++- config/general_config/featureset042.yml | 12 +++- config/general_config/featureset048.yml | 27 ++++++--- config/general_config/minimal.yml | 41 ++++++++----- 25 files changed, 507 insertions(+), 298 deletions(-) diff --git a/config/general_config/featureset001.yml b/config/general_config/featureset001.yml index efc04e289..3ca4ed2ca 100644 --- a/config/general_config/featureset001.yml +++ b/config/general_config/featureset001.yml @@ -108,9 +108,22 @@ artcl_create_docs_payload: - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}" - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" +deploy_steps_ansible_workflow: >- + {% if release not in ['newton','ocata','pike'] -%} + true + {%- else -%} + false + {%- endif -%} +config_download_args: >- + {% if release in ['queens'] -%} + -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml + --config-download + --verbose + {%- endif -%} + +# Tempest configuration, keep always at the end of the file # Use the traditional ping test in newton, ocata and pike # Run tempest in queens+ - test_ping: >- {% if release in ['newton', 'ocata', 'pike'] -%} true @@ -128,16 +141,9 @@ run_tempest: >- test_white_regex: '' tempest_whitelist: - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' - -deploy_steps_ansible_workflow: >- - {% if release not in ['newton','ocata','pike'] -%} - true +tempest_format: >- + {% if containerized_undercloud|bool -%} + container {%- else -%} - false - {%- endif -%} -config_download_args: >- - {% if release in ['queens'] -%} - -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml - --config-download - --verbose + packages {%- endif -%} diff --git a/config/general_config/featureset002.yml b/config/general_config/featureset002.yml index 016caad4b..aab820f73 100644 --- a/config/general_config/featureset002.yml +++ b/config/general_config/featureset002.yml @@ -114,6 +114,20 @@ artcl_create_docs_payload: - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}" - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" +deploy_steps_ansible_workflow: >- + {% if release not in ['newton','ocata','pike'] -%} + true + {%- else -%} + false + {%- endif -%} +config_download_args: >- + {% if release in ['queens'] -%} + -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml + --config-download + --verbose + {%- endif -%} + +# Tempest configuration, keep always at the end of the file # Use the traditional ping test in newton, ocata and pike # Run tempest in queens+ @@ -135,15 +149,12 @@ test_white_regex: '' tempest_whitelist: - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' -deploy_steps_ansible_workflow: >- - {% if release not in ['newton','ocata','pike'] -%} - true +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container {%- else -%} - false - {%- endif -%} -config_download_args: >- - {% if release in ['queens'] -%} - -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml - --config-download - --verbose + packages {%- endif -%} + + diff --git a/config/general_config/featureset003.yml b/config/general_config/featureset003.yml index 6a5b67809..1173cd5fc 100644 --- a/config/general_config/featureset003.yml +++ b/config/general_config/featureset003.yml @@ -8,7 +8,17 @@ undercloud_install_cli_options: >- --use-heat=False {%- endif -%} +# Tempest configuration, keep always at the end of the file + test_ping: false +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + run_tempest: true test_regex: '' tempest_undercloud: true diff --git a/config/general_config/featureset005.yml b/config/general_config/featureset005.yml index 44601ac20..c1e381977 100644 --- a/config/general_config/featureset005.yml +++ b/config/general_config/featureset005.yml @@ -1,28 +1,6 @@ undercloud_generate_service_certificate: false enable_opstools_repo: true -# Use the traditional ping test in newton and ocata -# Run tempest in pike+ - -# pacemaker settings are configured in the scenario template -# do not set `enable_pacemaker` in the featureset - -test_ping: >- - {% if release in ['newton', 'ocata'] -%} - true - {%- else -%} - false - {%- endif -%} - -run_tempest: >- - {% if release in ['newton', 'ocata'] -%} - false - {%- else -%} - true - {%- endif -%} - -test_white_regex: '' - # This enables the run of several tripleo-validations tests through Mistral run_tripleo_validations: True # This enables the run of tripleo-validations negative tests through shell @@ -47,6 +25,8 @@ overcloud_roles: - StorageMgmt - Tenant validate_template: scenario001-multinode.yaml + +# Tempest configuration, keep always at the end of the file tempest_whitelist_old: - 'tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern' - 'ceilometer.tests.tempest.scenario.test_telemetry_integration.TestTelemetryIntegration' @@ -54,6 +34,34 @@ tempest_whitelist_new: - 'tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern' - 'telemetry_tempest_plugin.scenario.test_telemetry_integration.TestTelemetryIntegration' +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + +# Use the traditional ping test in newton and ocata +# Run tempest in pike+ + +test_ping: >- + {% if release in ['newton', 'ocata'] -%} + true + {%- else -%} + false + {%- endif -%} + +run_tempest: >- + {% if release in ['newton', 'ocata'] -%} + false + {%- else -%} + true + {%- endif -%} + +test_white_regex: '' + + tempest_whitelist: >- {% if release not in ['newton', 'ocata', 'pike'] -%}{{ tempest_whitelist_new }} {%- else -%}{{ tempest_whitelist_old }} diff --git a/config/general_config/featureset006.yml b/config/general_config/featureset006.yml index 29026ac2b..b23c26d20 100644 --- a/config/general_config/featureset006.yml +++ b/config/general_config/featureset006.yml @@ -28,6 +28,7 @@ overcloud_roles: - StorageMgmt - Tenant +# Tempest configuration, keep always at the end of the file # Use the traditional ping test in newton and ocata # Run tempest in pike+ @@ -45,6 +46,14 @@ run_tempest: >- true {%- endif -%} +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + test_white_regex: '' tempest_whitelist_old: # Testing zaqar doesn't work yet, but it's in progress diff --git a/config/general_config/featureset007.yml b/config/general_config/featureset007.yml index 76d814c2e..9af835338 100644 --- a/config/general_config/featureset007.yml +++ b/config/general_config/featureset007.yml @@ -28,6 +28,7 @@ overcloud_roles: - StorageMgmt - Tenant +# Tempest configuration, keep always at the end of the file # Use the traditional ping test in newton and ocata # Run tempest in pike+ @@ -38,6 +39,14 @@ test_ping: >- false {%- endif -%} +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + run_tempest: >- {% if release in ['newton', 'ocata'] -%} false diff --git a/config/general_config/featureset008.yml b/config/general_config/featureset008.yml index 6f58eece9..25adcb5c0 100644 --- a/config/general_config/featureset008.yml +++ b/config/general_config/featureset008.yml @@ -28,6 +28,7 @@ overcloud_roles: - StorageMgmt - Tenant +# Tempest configuration, keep always at the end of the file # Use the traditional ping test in newton and ocata # Run tempest in pike+ @@ -45,6 +46,14 @@ run_tempest: >- true {%- endif -%} +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + test_white_regex: '' tempest_whitelist: - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' diff --git a/config/general_config/featureset010.yml b/config/general_config/featureset010.yml index 5fe9dfba3..5db549f0a 100644 --- a/config/general_config/featureset010.yml +++ b/config/general_config/featureset010.yml @@ -34,26 +34,6 @@ run_tripleo_validations_negative_tests: True # Exit tripleo-quickstart on validations failure exit_on_validations_failure: False -# If `run_tempest` is `true`, run tempests tests, otherwise do not -# run them. -test_ping: false -run_tempest: true -test_white_regex: 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' - -# Run containerized tempest from master and ongoing -tempest_format: >- - {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} - container - {%- else -%} - packages - {%- endif -%} -undercloud_enable_tempest: >- - {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} - true - {%- else -%} - false - {%- endif -%} - composable_roles: true overcloud_roles: - name: Controller @@ -91,3 +71,26 @@ config_download_args: >- --disable-validations --verbose {%- endif -%} + +# Tempest configuration, keep always at the end of the file +# If `run_tempest` is `true`, run tempests tests, otherwise do not +# run them. +test_ping: false +run_tempest: true +test_white_regex: 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' + +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} +undercloud_enable_tempest: >- + {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + true + {%- else -%} + false + {%- endif -%} + + diff --git a/config/general_config/featureset016.yml b/config/general_config/featureset016.yml index 4343f7e58..28bff0e33 100644 --- a/config/general_config/featureset016.yml +++ b/config/general_config/featureset016.yml @@ -86,6 +86,26 @@ overcloud_roles: - StorageMgmt - Tenant +deployed_server: >- + {% if release in ['newton','ocata','pike','queens'] -%} + true + {%- else -%} + false + {%- endif -%} +deploy_steps_ansible_workflow: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + true + {%- else -%} + false + {%- endif -%} +config_download_args: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + -e {{ working_dir }}/config-download.yaml + --disable-validations + --verbose + {%- endif -%} + +# Tempest configuration, keep always at the end of the file # Use the traditional ping test in newton and ocata # Run tempest in pike+ @@ -105,9 +125,9 @@ run_tempest: >- test_white_regex: '' -# Run containerized tempest from master and ongoing +# Run tempest in containers when at least undercloud is containerized tempest_format: >- - {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + {% if containerized_undercloud|bool -%} container {%- else -%} packages @@ -142,21 +162,4 @@ tempest_extra_config: {'telemetry.alarm_granularity': '60'} # due a concurrency, for more information, check lp #1742936 tempest_workers: 1 -deployed_server: >- - {% if release in ['newton','ocata','pike','queens'] -%} - true - {%- else -%} - false - {%- endif -%} -deploy_steps_ansible_workflow: >- - {% if release not in ['newton','ocata','pike','queens'] -%} - true - {%- else -%} - false - {%- endif -%} -config_download_args: >- - {% if release not in ['newton','ocata','pike','queens'] -%} - -e {{ working_dir }}/config-download.yaml - --disable-validations - --verbose - {%- endif -%} + diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml index 1415c0d13..3f815d25b 100644 --- a/config/general_config/featureset017.yml +++ b/config/general_config/featureset017.yml @@ -82,6 +82,26 @@ overcloud_roles: - StorageMgmt - Tenant +deployed_server: >- + {% if release in ['newton','ocata','pike','queens'] -%} + true + {%- else -%} + false + {%- endif -%} +deploy_steps_ansible_workflow: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + true + {%- else -%} + false + {%- endif -%} +config_download_args: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + -e {{ working_dir }}/config-download.yaml + --disable-validations + --verbose + {%- endif -%} + +# Tempest configuration, keep always at the end of the file # Use the traditional ping test in newton and ocata # Run tempest in pike+ @@ -100,9 +120,10 @@ run_tempest: >- {%- endif -%} test_white_regex: '' -# Run containerized tempest from master and ongoing + +# Run tempest in containers when at least undercloud is containerized tempest_format: >- - {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + {% if containerized_undercloud|bool -%} container {%- else -%} packages @@ -149,21 +170,4 @@ tempest_extra_config: >- # due a concurrency, for more information, check lp 1744151 tempest_workers: 1 -deployed_server: >- - {% if release in ['newton','ocata','pike','queens'] -%} - true - {%- else -%} - false - {%- endif -%} -deploy_steps_ansible_workflow: >- - {% if release not in ['newton','ocata','pike','queens'] -%} - true - {%- else -%} - false - {%- endif -%} -config_download_args: >- - {% if release not in ['newton','ocata','pike','queens'] -%} - -e {{ working_dir }}/config-download.yaml - --disable-validations - --verbose - {%- endif -%} + diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml index 2a444497d..e21e9306f 100644 --- a/config/general_config/featureset018.yml +++ b/config/general_config/featureset018.yml @@ -84,6 +84,26 @@ overcloud_roles: - StorageMgmt - Tenant +deployed_server: >- + {% if release in ['newton','ocata','pike','queens'] -%} + true + {%- else -%} + false + {%- endif -%} +deploy_steps_ansible_workflow: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + true + {%- else -%} + false + {%- endif -%} +config_download_args: >- + {% if release not in ['newton','ocata','pike','queens'] -%} + -e {{ working_dir }}/config-download.yaml + --disable-validations + --verbose + {%- endif -%} + +# Tempest configuration, keep always at the end of the file # Use the traditional ping test in newton and ocata # Run tempest in pike+ @@ -103,9 +123,9 @@ run_tempest: >- test_white_regex: '' -# Run containerized tempest from master and ongoing +# Run tempest in containers when at least undercloud is containerized tempest_format: >- - {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + {% if containerized_undercloud|bool -%} container {%- else -%} packages @@ -126,21 +146,4 @@ tempest_plugins: >- {%- else -%}{{ tempest_plugins_old }} {%- endif -%} -deployed_server: >- - {% if release in ['newton','ocata','pike','queens'] -%} - true - {%- else -%} - false - {%- endif -%} -deploy_steps_ansible_workflow: >- - {% if release not in ['newton','ocata','pike','queens'] -%} - true - {%- else -%} - false - {%- endif -%} -config_download_args: >- - {% if release not in ['newton','ocata','pike','queens'] -%} - -e {{ working_dir }}/config-download.yaml - --disable-validations - --verbose - {%- endif -%} + diff --git a/config/general_config/featureset019.yml b/config/general_config/featureset019.yml index 20ae99aeb..c24a21835 100644 --- a/config/general_config/featureset019.yml +++ b/config/general_config/featureset019.yml @@ -31,12 +31,6 @@ undercloud_cloud_domain: "localdomain" undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" undercloud_resource_registry_args: "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/ci/common/net-config-simple-bridge.yaml" -undercloud_enable_tempest: >- - {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} - true - {%- else -%} - false - {%- endif -%} # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true @@ -84,35 +78,6 @@ overcloud_roles: - StorageMgmt - Tenant -# Use the traditional ping test in newton and ocata -# Run tempest in pike+ - -test_ping: >- - {% if release in ['newton', 'ocata'] -%} - true - {%- else -%} - false - {%- endif -%} - -run_tempest: >- - {% if release in ['newton', 'ocata'] -%} - false - {%- else -%} - true - {%- endif -%} - -test_white_regex: '' - - -tempest_whitelist: - - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' - -tempest_extra_config: >- - {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} - {} - {%- else -%} - {'object-storage-feature-enabled.discoverability': 'False', 'service_available.swift': 'False'} - {%- endif -%} deployed_server: >- {% if release in ['newton','ocata','pike','queens'] -%} true @@ -134,3 +99,48 @@ config_download_args: >- --disable-validations --verbose {%- endif -%} + +# Tempest configuration, keep always at the end of the file +# Use the traditional ping test in newton and ocata +# Run tempest in pike+ +undercloud_enable_tempest: >- + {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + true + {%- else -%} + false + {%- endif -%} + +test_ping: >- + {% if release in ['newton', 'ocata'] -%} + true + {%- else -%} + false + {%- endif -%} + +run_tempest: >- + {% if release in ['newton', 'ocata'] -%} + false + {%- else -%} + true + {%- endif -%} + +test_white_regex: '' + +# Run tempest in containers only when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + +tempest_whitelist: + - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' + +tempest_extra_config: >- + {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + {} + {%- else -%} + {'object-storage-feature-enabled.discoverability': 'False', 'service_available.swift': 'False'} + {%- endif -%} + diff --git a/config/general_config/featureset020.yml b/config/general_config/featureset020.yml index 703e40f3d..2d5a02bdd 100644 --- a/config/general_config/featureset020.yml +++ b/config/general_config/featureset020.yml @@ -29,13 +29,6 @@ network_isolation: false extra_args: '' -# Tempest -run_tempest: true -test_white_regex: '.*' -test_ping: false -# For full tempest run we need to make sure concurrency is not too high -tempest_workers: 3 - # keep the doc gen settings at the bottom of the config file. # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true @@ -87,12 +80,6 @@ undercloud_cloud_domain: "localdomain" undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" undercloud_resource_registry_args: "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/net-config-undercloud.yaml" -undercloud_enable_tempest: >- - {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} - true - {%- else -%} - false - {%- endif -%} ctlplane_masquerade: >- {% if release not in ['newton','ocata','pike','queens'] -%} true @@ -100,3 +87,27 @@ ctlplane_masquerade: >- false {%- endif -%} +# Tempest configuration, keep always at the end of the file +# Tempest + +undercloud_enable_tempest: >- + {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + true + {%- else -%} + false + {%- endif -%} +run_tempest: true +test_white_regex: '.*' +test_ping: false +# For full tempest run we need to make sure concurrency is not too high +tempest_workers: 3 + +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + + diff --git a/config/general_config/featureset021.yml b/config/general_config/featureset021.yml index 957a3cd49..06559bb64 100644 --- a/config/general_config/featureset021.yml +++ b/config/general_config/featureset021.yml @@ -29,20 +29,6 @@ containerized_undercloud: >- false {%- endif -%} -# Run containerized tempest from master and ongoing -tempest_format: >- - {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} - container - {%- else -%} - packages - {%- endif -%} -undercloud_enable_tempest: >- - {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} - true - {%- else -%} - false - {%- endif -%} - undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" undercloud_cloud_domain: "localdomain" undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" @@ -55,15 +41,6 @@ network_isolation: false extra_args: '' -# Tempest -run_tempest: true -test_regex: '.*' -test_ping: false -# Run tempest without skip file -skip_file_src: '' -# For full tempest run we need to make sure concurrency is not too high -tempest_workers: 3 - # keep the doc gen settings at the bottom of the config file. # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true @@ -95,3 +72,38 @@ artcl_create_docs_payload: - overcloud-validate - tempest-setup - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" + + +# Tempest configuration, keep always at the end of the file +# Tempest +# Run containerized tempest from master and ongoing +tempest_format: >- + {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + container + {%- else -%} + packages + {%- endif -%} +undercloud_enable_tempest: >- + {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + true + {%- else -%} + false + {%- endif -%} + +run_tempest: true +test_regex: '.*' +test_ping: false +# Run tempest without skip file +skip_file_src: '' +# For full tempest run we need to make sure concurrency is not too high +tempest_workers: 3 + +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + + diff --git a/config/general_config/featureset027.yml b/config/general_config/featureset027.yml index 2b73f41ab..462de7911 100644 --- a/config/general_config/featureset027.yml +++ b/config/general_config/featureset027.yml @@ -19,8 +19,6 @@ undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" undercloud_resource_registry_args: "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/net-config-undercloud.yaml" -# Enable tempest container -undercloud_enable_tempest: true # turn off image prep step_overcloud_image: false step_glance_upload: false @@ -37,31 +35,6 @@ undercloud_enable_swift_encryption: true # This enables the deployment of the overcloud with SSL. ssl_overcloud: false -# If `run_tempest` is `true`, run tempests tests, otherwise do not -# run them. -test_ping: false -run_tempest: true -test_regex: '' -tempest_format: container -tempest_undercloud: true -tempest_overcloud: false -tempest_whitelist: - - 'tempest.api.identity' - - 'tempest.api.image.v2.test_images.BasicOperationsImagesTest' - - 'tempest.api.image.v2.test_images_tags_negative.ImagesTagsNegativeTest' - - 'tempest.api.image.v2.test_images_member_negative.ImagesMemberNegativeTest' - - 'tempest.api.compute.admin.test_flavors' - - 'tempest.api.compute.flavors' - - 'tempest.api.compute.keypairs' - - 'tempest.api.compute.admin.test_quotas' - - 'tempest.api.compute.admin.test_aggregates_negative' - - 'tempest.api.compute.security_groups' - - 'tempest.api.network.test_networks' - - 'tempest.api.network.test_networks_negative' - - 'tempest.api.network.test_security_groups_negative' - - 'tempest.api.network.test_ports' - - 'tempest.api.network.test_routers_negative' - # tripleo-ui is not working yet enable_port_forward_for_tripleo_ui: false @@ -90,3 +63,41 @@ artcl_create_docs_payload: - overcloud-prep-network - tempest-setup - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" + +# Tempest configuration, keep always at the end of the file +# If `run_tempest` is `true`, run tempests tests, otherwise do not +# run them. +test_ping: false +run_tempest: true +test_regex: '' +# Enable tempest container +undercloud_enable_tempest: true + +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + +tempest_undercloud: true +tempest_overcloud: false +tempest_whitelist: + - 'tempest.api.identity' + - 'tempest.api.image.v2.test_images.BasicOperationsImagesTest' + - 'tempest.api.image.v2.test_images_tags_negative.ImagesTagsNegativeTest' + - 'tempest.api.image.v2.test_images_member_negative.ImagesMemberNegativeTest' + - 'tempest.api.compute.admin.test_flavors' + - 'tempest.api.compute.flavors' + - 'tempest.api.compute.keypairs' + - 'tempest.api.compute.admin.test_quotas' + - 'tempest.api.compute.admin.test_aggregates_negative' + - 'tempest.api.compute.security_groups' + - 'tempest.api.network.test_networks' + - 'tempest.api.network.test_networks_negative' + - 'tempest.api.network.test_security_groups_negative' + - 'tempest.api.network.test_ports' + - 'tempest.api.network.test_routers_negative' + + diff --git a/config/general_config/featureset028.yml b/config/general_config/featureset028.yml index 146870b79..2b29bccd8 100644 --- a/config/general_config/featureset028.yml +++ b/config/general_config/featureset028.yml @@ -43,6 +43,15 @@ overcloud_roles: - StorageMgmt - Tenant +# Tempest configuration, keep always at the end of the file +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + test_ping: false run_tempest: true test_white_regex: '' diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml index c7c462677..4eb2965da 100644 --- a/config/general_config/featureset030.yml +++ b/config/general_config/featureset030.yml @@ -50,23 +50,6 @@ extra_args: >- -e {{ overcloud_templates_path }}/environments/services/neutron-ovn-ha.yaml {%- endif -%} -# If `run_tempest` is `true`, run tempests tests, otherwise do not -# run them. -tempest_config: true -test_ping: false -run_tempest: true -test_white_regex: '' -tempest_whitelist: - - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' - -# Run containerized tempest from master and ongoing -tempest_format: >- - {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} - container - {%- else -%} - packages - {%- endif -%} - deployed_server: >- {% if release in ['newton','ocata','pike','queens'] -%} true @@ -85,3 +68,24 @@ config_download_args: >- --disable-validations --verbose {%- endif -%} + + +# Tempest configuration, keep always at the end of the file +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + +# If `run_tempest` is `true`, run tempests tests, otherwise do not +# run them. +tempest_config: true +test_ping: false +run_tempest: true +test_white_regex: '' +tempest_whitelist: + - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' + + diff --git a/config/general_config/featureset031.yml b/config/general_config/featureset031.yml index 7e357e920..be4d954df 100644 --- a/config/general_config/featureset031.yml +++ b/config/general_config/featureset031.yml @@ -27,14 +27,6 @@ telemetry_args: >- extra_args: >- -e {{ overcloud_templates_path }}/environments/services/neutron-opendaylight.yaml -# If `run_tempest` is `true`, run tempests tests, otherwise do not -# run them. -test_ping: false -run_tempest: true -test_white_regex: '' -tempest_whitelist: - - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' - # Add ODL Repo add_repos: - type: generic @@ -60,3 +52,20 @@ config_download_args: >- --disable-validations --verbose {%- endif -%} + +# Tempest configuration, keep always at the end of the file +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + +# If `run_tempest` is `true`, run tempests tests, otherwise do not +# run them. +test_ping: false +run_tempest: true +test_white_regex: '' +tempest_whitelist: + - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' diff --git a/config/general_config/featureset032.yml b/config/general_config/featureset032.yml index ab1dd6488..bd68de558 100644 --- a/config/general_config/featureset032.yml +++ b/config/general_config/featureset032.yml @@ -14,11 +14,6 @@ undercloud_generate_service_certificate: false # This enables the deployment of the overcloud with SSL. ssl_overcloud: false -# If `run_tempest` is `true`, run tempests tests, otherwise do not -# run them. -test_ping: false -run_tempest: true -test_white_regex: 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' composable_roles: false # Note(trown): The tripleo-ci repo is used here because we do not yet support @@ -62,6 +57,21 @@ undercloud_cloud_domain: "localdomain" undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" undercloud_resource_registry_args: "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/net-config-undercloud.yaml" + +# Tempest configuration, keep always at the end of the file +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + +# If `run_tempest` is `true`, run tempests tests, otherwise do not +# run them. +test_ping: false +run_tempest: true +test_white_regex: 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' undercloud_enable_tempest: >- {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} true diff --git a/config/general_config/featureset033.yml b/config/general_config/featureset033.yml index 635e5477c..3817bc8d5 100644 --- a/config/general_config/featureset033.yml +++ b/config/general_config/featureset033.yml @@ -35,11 +35,6 @@ config_download_args: >- --disable-validations --verbose -# If `run_tempest` is `true`, run tempests tests, otherwise do not -# run them. -tempest_config: false -test_ping: false -run_tempest: false composable_roles: true # NOTE(flaper87): There's likely a better way to do this @@ -69,3 +64,19 @@ overcloud_roles: - Storage - StorageMgmt - Tenant + +# Tempest configuration, keep always at the end of the file +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + +# If `run_tempest` is `true`, run tempests tests, otherwise do not +# run them. +tempest_config: false +test_ping: false +run_tempest: false + diff --git a/config/general_config/featureset035.yml b/config/general_config/featureset035.yml index 0f9f8b407..96b675d2c 100644 --- a/config/general_config/featureset035.yml +++ b/config/general_config/featureset035.yml @@ -23,12 +23,6 @@ undercloud_cloud_domain: "localdomain" undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" undercloud_resource_registry_args: "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ overcloud_templates_path }}/net-config-undercloud.yaml" -undercloud_enable_tempest: >- - {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} - true - {%- else -%} - false - {%- endif -%} ctlplane_masquerade: >- {% if release not in ['newton','ocata','pike','queens'] -%} true @@ -88,15 +82,32 @@ artcl_create_docs_payload: - tempest-setup - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" -test_ping: false -run_tempest: true -test_white_regex: '' -tempest_whitelist: - - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' - deploy_steps_ansible_workflow: >- {% if release not in ['newton','ocata','pike','queens'] -%} true {%- else -%} false {%- endif -%} + +# Tempest configuration, keep always at the end of the file +test_ping: false + +undercloud_enable_tempest: >- + {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} + true + {%- else -%} + false + {%- endif -%} + +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + +run_tempest: true +test_white_regex: '' +tempest_whitelist: + - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' diff --git a/config/general_config/featureset040.yml b/config/general_config/featureset040.yml index 842b9280c..767b17a6e 100644 --- a/config/general_config/featureset040.yml +++ b/config/general_config/featureset040.yml @@ -23,9 +23,6 @@ composable_scenario: scenario003-multinode-containers.yaml upgrade_composable_scenario: scenario003-multinode-containers.yaml deployed_server: true -test_ping: false -run_tempest: true - # save time by doing a mixed upgrade mixed_upgrade: true @@ -104,3 +101,14 @@ undercloud_cloud_domain: "localdomain" undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" undercloud_resource_registry_args: "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ undercloud_templates_path }}/ci/common/net-config-simple-bridge.yaml" + +# Tempest configuration, keep always at the end of the file +test_ping: false +run_tempest: true +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} diff --git a/config/general_config/featureset042.yml b/config/general_config/featureset042.yml index e70d4e0f0..bff4fe277 100644 --- a/config/general_config/featureset042.yml +++ b/config/general_config/featureset042.yml @@ -63,11 +63,19 @@ artcl_create_docs_payload: - tempest-setup - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" +deploy_steps_ansible_workflow: true + +# Tempest configuration, keep always at the end of the file test_ping: false run_tempest: true +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} test_white_regex: '' tempest_whitelist: - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops' - -deploy_steps_ansible_workflow: true diff --git a/config/general_config/featureset048.yml b/config/general_config/featureset048.yml index 23c746505..2372835d0 100644 --- a/config/general_config/featureset048.yml +++ b/config/general_config/featureset048.yml @@ -28,15 +28,6 @@ network_isolation: false extra_args: '' -# Tempest -run_tempest: true -test_regex: '.*' -test_ping: false -# Run tempest without skip file -skip_file_src: '' -# For full tempest run we need to make sure concurrency is not too high -tempest_workers: 3 - # keep the doc gen settings at the bottom of the config file. # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true @@ -68,3 +59,21 @@ artcl_create_docs_payload: - overcloud-validate - tempest-setup - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" + +# Tempest configuration, keep always at the end of the file +# Tempest +run_tempest: true +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + +test_regex: '.*' +test_ping: false +# Run tempest without skip file +skip_file_src: '' +# For full tempest run we need to make sure concurrency is not too high +tempest_workers: 3 diff --git a/config/general_config/minimal.yml b/config/general_config/minimal.yml index 48a0e9c10..368c31bb5 100644 --- a/config/general_config/minimal.yml +++ b/config/general_config/minimal.yml @@ -106,21 +106,6 @@ artcl_create_docs_payload: - "{% if run_tempest|bool -%}tempest-setup{%- endif -%}" - "{% if run_tempest|bool and tempest_format|default('packages') == 'containers' -%}tempest_container{%- endif -%}" -# Use the traditional ping test in newton, ocata and pike -# Run tempest in queens+ - -test_ping: >- - {% if release in ['newton', 'ocata', 'pike'] -%} - true - {%- else -%} - false - {%- endif -%} - -# looking for a small set of tempest tests to validate -# tempest config and execution are working -run_tempest: true -test_white_regex: 'tempest.api.compute.admin' - deploy_steps_ansible_workflow: >- {% if release not in ['newton','ocata','pike'] -%} true @@ -133,3 +118,29 @@ config_download_args: >- --config-download --verbose {%- endif -%} + +# Tempest configuration, keep always at the end of the file +# Use the traditional ping test in newton, ocata and pike +# Run tempest in queens+ + +test_ping: >- + {% if release in ['newton', 'ocata', 'pike'] -%} + true + {%- else -%} + false + {%- endif -%} + +# Run tempest in containers when at least undercloud is containerized +tempest_format: >- + {% if containerized_undercloud|bool -%} + container + {%- else -%} + packages + {%- endif -%} + +# looking for a small set of tempest tests to validate +# tempest config and execution are working +run_tempest: true +test_white_regex: 'tempest.api.compute.admin' + +