Merge "Remove tempest variables from testenv files"

This commit is contained in:
Zuul 2021-03-08 11:46:32 +00:00 committed by Gerrit Code Review
commit 67a58a4378
8 changed files with 0 additions and 73 deletions

View File

@ -52,23 +52,12 @@ docker_registry_host: >-
trunk.registry.rdoproject.org
{%- endif -%}
# We don't need to cleanup TripleO CI
tempest_track_resources: false
# Use cirros cached image
tempest_test_image_path: /opt/cache/files/cirros-0.4.0-x86_64-disk.img
tempest_tempest_conf_overrides:
image.image_path: http://images.rdoproject.org/cirros/cirros-0.4.0-x86_64-disk.img
# Container update settings
update_containers: >-
{% if containerized_overcloud|bool or containerized_undercloud|bool -%}
true
{%- endif -%}
# Tempestmail settings
tempestmail_log_server: http://logs.rdoproject.org
# build-test packages
artg_repos_dir: "{{ tripleo_root }}"

View File

@ -36,9 +36,6 @@ image_cache_dir_cleanup: true
build_image_isolated: false
build_undercloud: false
# We don't need to cleanup TripleO CI
tempest_track_resources: false
# Rely on RDO registry instead of docker.io due to rate limit
# job.build_container_images is defined in zuul as a
# direct var. adding build_container_images as tqe
@ -56,11 +53,6 @@ docker_registry_host: >-
trunk.registry.rdoproject.org
{%- endif -%}
# Use cirros cached image
tempest_test_image_path: /opt/cache/files/cirros-0.4.0-x86_64-disk.img
tempest_tempest_conf_overrides:
image.image_path: http://images.rdoproject.org/cirros/cirros-0.4.0-x86_64-disk.img
# Container settings are set in release files
# Container update settings
update_containers: >-
@ -68,8 +60,6 @@ update_containers: >-
true
{%- endif -%}
# Tempestmail settings
tempestmail_log_server: http://logs.rdoproject.org
# Deployment metrics
ara_graphite_prefix: "test.tripleo.{{ lookup('env', 'STABLE_RELEASE')|default('master', true) }}.{{ lookup('env', 'TOCI_JOBTYPE') }}."
ara_graphite_server: 66.187.229.172

View File

@ -52,23 +52,12 @@ docker_registry_host: >-
trunk.registry.rdoproject.org
{%- endif -%}
# We don't need to cleanup TripleO CI
tempest_track_resources: false
# Use cirros cached image
tempest_test_image_path: /opt/cache/files/cirros-0.4.0-x86_64-disk.img
tempest_tempest_conf_overrides:
image.image_path: http://images.rdoproject.org/cirros/cirros-0.4.0-x86_64-disk.img
# Container update settings
update_containers: >-
{% if containerized_overcloud|bool or containerized_undercloud|bool -%}
true
{%- endif -%}
# Tempestmail settings
tempestmail_log_server: http://logs.rdoproject.org
# build-test packages
artg_repos_dir: "{{ tripleo_root }}"

View File

@ -35,12 +35,6 @@ generate_pingtest_subunit: true
undercloud_undercloud_nameservers:
- 127.0.0.1
- 1.1.1.1
tempest_test_image_path: /opt/cache/files/cirros-0.4.0-x86_64-disk.img
tempest_tempest_conf_overrides:
image.image_path: http://images.rdoproject.org/cirros/cirros-0.4.0-x86_64-disk.img
# We don't need to cleanup TripleO CI
tempest_track_resources: false
undercloud_undercloud_cleanup: false
# Container update settings

View File

@ -14,10 +14,6 @@ workers_args: >-
-e {{ overcloud_templates_path }}/environments/low-memory-usage.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml
-e {{ overcloud_templates_path }}/environments/debug.yaml
# Use cirros cached image
tempest_test_image_path: /opt/cache/files/cirros-0.4.0-x86_64-disk.img
tempest_tempest_conf_overrides:
image.image_path: http://images.rdoproject.org/cirros/cirros-0.4.0-x86_64-disk.img
# Container update settings
update_containers: >-
@ -42,12 +38,6 @@ docker_registry_host: >-
trunk.registry.rdoproject.org
{%- endif -%}
# We don't need to cleanup TripleO CI
tempest_track_resources: false
# Tempestmail settings
tempestmail_log_server: http://logs.rdoproject.org
# build-test packages
artg_repos_dir: "{{ tripleo_root }}"

View File

@ -15,10 +15,6 @@ workers_args: >-
-e {{ overcloud_templates_path }}/environments/low-memory-usage.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml
-e {{ overcloud_templates_path }}/environments/debug.yaml
# Use cirros cached image
tempest_test_image_path: /opt/cache/files/cirros-0.4.0-x86_64-disk.img
tempest_tempest_conf_overrides:
image.image_path: http://images.rdoproject.org/cirros/cirros-0.4.0-x86_64-disk.img
# Container update settings
update_containers: >-
@ -43,12 +39,6 @@ docker_registry_host: >-
trunk.registry.rdoproject.org
{%- endif -%}
# We don't need to cleanup TripleO CI
tempest_track_resources: false
# Tempestmail settings
tempestmail_log_server: http://logs.rdoproject.org
# build-test packages
artg_repos_dir: "{{ tripleo_root }}"

View File

@ -15,10 +15,6 @@ workers_args: >-
-e {{ overcloud_templates_path }}/environments/low-memory-usage.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml
-e {{ overcloud_templates_path }}/environments/debug.yaml
# Use cirros cached image
tempest_test_image_path: /opt/cache/files/cirros-0.4.0-x86_64-disk.img
tempest_tempest_conf_overrides:
image.image_path: http://images.rdoproject.org/cirros/cirros-0.4.0-x86_64-disk.img
# Container update settings
update_containers: >-
@ -43,12 +39,6 @@ docker_registry_host: >-
trunk.registry.rdoproject.org
{%- endif -%}
# We don't need to cleanup TripleO CI
tempest_track_resources: false
# Tempestmail settings
tempestmail_log_server: http://logs.rdoproject.org
# build-test packages
artg_repos_dir: "{{ tripleo_root }}"

View File

@ -56,11 +56,6 @@ floating_ip_cidr: >-
{%- if network_isolation|default(true)|bool %}10.0.0.0/24
{%- else %}192.168.24.0/24
{%- endif %}
tempest_test_image_path: /opt/cache/files/cirros-0.4.0-x86_64-disk.img
tempest_tempest_conf_overrides:
image.image_path: http://images.rdoproject.org/cirros/cirros-0.4.0-x86_64-disk.img
# We don't need to cleanup TripleO CI
tempest_track_resources: false
undercloud_undercloud_cleanup: false
# Deployment metrics