Skip to content

Commit 6cbebc5

Browse files
committed
Remove unnecessary vars from cloudkitty-tempest-tests.yaml
The telemetry_tag and telemetry_registry are set in FVT and not used in the hooks defined in cloudkitty-tempest
1 parent 3e50b38 commit 6cbebc5

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

ci/vars-cloudkitty-tempest.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ cifmw_openshift_obs_definition:
1616

1717
# TODO: To use the images created by the content provider, we need to add in the images here until there's support in openstack operator to pull them in the expected way.
1818

19-
# from fvt/ci/vars/common.yml should be used from there eventually.
20-
telemetry_registry: >-
21-
{%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' -%}
22-
{{ content_provider_os_registry_url }}
23-
{%- else -%}
24-
quay.rdoproject.org/podified-master-centos10
25-
{%- endif -%}
26-
27-
telemetry_tag: >-
28-
{%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' -%}
29-
telemetry_latest
30-
{%- else -%}
31-
current-tested
32-
{%- endif -%}
33-
34-
_ck_api_image: "{{ telemetry_registry }}/openstack-cloudkitty-api:{{ telemetry_tag }}"
35-
_ck_proc_image: "{{ telemetry_registry }}/openstack-cloudkitty-processor:{{ telemetry_tag }}"
19+
## from fvt/ci/vars/common.yml should be used from there eventually.
20+
#telemetry_registry: >-
21+
# {%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' -%}
22+
# {{ content_provider_os_registry_url }}
23+
# {%- else -%}
24+
# quay.rdoproject.org/podified-master-centos10
25+
# {%- endif -%}
26+
#
27+
#telemetry_tag: >-
28+
# {%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' -%}
29+
# telemetry_latest
30+
# {%- else -%}
31+
# current-tested
32+
# {%- endif -%}
33+
#
34+
#_ck_api_image: "{{ telemetry_registry }}/openstack-cloudkitty-api:{{ telemetry_tag }}"
35+
#_ck_proc_image: "{{ telemetry_registry }}/openstack-cloudkitty-processor:{{ telemetry_tag }}"
3636

3737
# This is removed for now.
3838
#pre_deploy_kustomize_cloudkitty:
@@ -52,9 +52,9 @@ pre_deploy_disable_telemetry:
5252
pre_deploy_loki_setup:
5353
source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/cloudkitty-post_deploy.yml"
5454
type: playbook
55-
extra_vars:
56-
cloudkitty_api_image: "{{ _ck_api_image }}"
57-
cloudkitty_proc_image: "{{ _ck_proc_image }}"
55+
#extra_vars:
56+
# cloudkitty_api_image: "{{ _ck_api_image }}"
57+
# cloudkitty_proc_image: "{{ _ck_proc_image }}"
5858

5959
pre_tests_ansible_tests:
6060
source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/ansible-tests-cloudkitty.yaml"

0 commit comments

Comments
 (0)