diff --git a/ci/vars-autoscaling-tempest.yml b/ci/vars-autoscaling-tempest.yml index 52c7bb48..77da6c7b 100644 --- a/ci/vars-autoscaling-tempest.yml +++ b/ci/vars-autoscaling-tempest.yml @@ -12,8 +12,11 @@ cifmw_tempest_tempestconf_config: service_available.ceilometer true service_available.sg_core true service_available.aodh true - telemetry.sg_core_service_url "ceilometer-internal.openstack.svc.cluster.local:3000" + telemetry.sg_core_service_url "https://ceilometer-internal.openstack.svc.cluster.local:3000" cifmw_test_operator_tempest_include_list: | telemetry_tempest_plugin.scenario telemetry_tempest_plugin.aodh cifmw_test_operator_tempest_exclude_list: '' +external_plugin: "opendev.org/openstack/telemetry-tempest-plugin" +change_item: "{{ zuul['items'] | selectattr('project.canonical_name', 'equalto', external_plugin) }}" +cifmw_test_operator_tempest_external_plugin: "{{ [] if change_item | length < 1 else [ { 'repository': 'https://' + external_plugin + '.git', 'changeRepository': 'https://review' + external_plugin, 'changeRefspec': [ 'refs/changes', change_item[0].change[-2:], change_item[0].change, change_item[0].patchset ] | join('/') } ] }}" diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index d1d67f69..a855bd0e 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -17,16 +17,6 @@ - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/scenarios/centos-9/multinode-ci.yml" - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling.yml" - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling-tempest.yml" - external_plugin: "opendev.org/openstack/telemetry-tempest-plugin" - change_item: "{{ zuul['items'] | selectattr('project.canonical_name', 'equalto', external_plugin) }}" - cifmw_test_operator_tempest_external_plugin: - # workaround(telemetry_tempest_plugin_release) - # NOTE: Until the telemetry-tempest-plugin repo is tagged and the new version is used in the tempest image, we need to manually install it as an external plugin to use the autoscaling tests. - - repository: "https://{{ external_plugin }}.git" - changeRepository: "https://review.{{ external_plugin }}" - changeRefspec: "{{ 'master' if change_item | length < 1 else [ 'refs/changes', change_item[0].change[-2:], change_item[0].change, change_item[0].patchset ] | join('/') }}" - # This value will be used when the telemetry-tempest-plugin is released, and we no longer need to install from the master branch - # cifmw_test_operator_tempest_external_plugin: "{{ [] if change_item | length < 1 else [ { 'repository': 'https://' + external_plugin + '.git', 'changeRepository': 'https://review' + {{ external_plugin }}, 'changeRefspec': [ 'refs/changes', change_item[0].change[-2:], change_item[0].change, change_item[0].patchset ] | join('/') } ] }}" - project-template: name: rdo-telemetry-tempest-plugin-jobs