Merge "Install gnocchi from source"
diff --git a/.zuul.yaml b/.zuul.yaml
index d8b6f38..f0c8fb8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,8 +3,10 @@
parent: devstack-tempest
description: |
This job is for testing telemetry components.
- irrelevant-files:
+ irrelevant-files: &base_irrelevant_files
+ - ^\.gitignore$
- ^\.gitreview$
+ - ^\.pre-commit-config\.yaml$
- ^(test-|)requirements.txt$
- ^setup.cfg$
- ^doc/.*$
@@ -67,6 +69,14 @@
parent: telemetry-tempest-base
- job:
+ name: telemetry-dsvm-integration-2025-2
+ parent: telemetry-tempest-base
+ override-checkout: stable/2025.2
+ required-projects:
+ - name: gnocchixyz/gnocchi
+ override-checkout: stable/4.7
+
+- job:
name: telemetry-dsvm-integration-2025-1
parent: telemetry-tempest-base
override-checkout: stable/2025.1
@@ -137,12 +147,7 @@
parent: devstack-tempest-ipv6
description: |
Telemetry devstack tempest tests job for IPv6-only deployment
- irrelevant-files:
- - ^(test-|)requirements.txt$
- - ^setup.cfg$
- - ^doc/.*$
- - ^.*\.rst$
- - ^releasenotes/.*$
+ irrelevant-files: *base_irrelevant_files
required-projects: *base_required_projects
vars: *base_vars
@@ -242,12 +247,7 @@
voting: false
description: |
Telemetry devstack tempest tests job with Aetos for IPv6-only deployment
- irrelevant-files:
- - ^(test-|)requirements.txt$
- - ^setup.cfg$
- - ^doc/.*$
- - ^.*\.rst$
- - ^releasenotes/.*$
+ irrelevant-files: *base_irrelevant_files
required-projects: *aetos_required_projects
vars: *aetos_vars
@@ -262,6 +262,7 @@
- telemetry-dsvm-integration-2024-1
- telemetry-dsvm-integration-2024-2
- telemetry-dsvm-integration-2025-1
+ - telemetry-dsvm-integration-2025-2
- telemetry-dsvm-integration-ipv6-only
- telemetry-dsvm-integration-centos-9s
- telemetry-dsvm-integration-centos-9s-fips
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..2a38d6b
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["pbr>=6.1.1"]
+build-backend = "pbr.build"
diff --git a/telemetry_tempest_plugin/config.py b/telemetry_tempest_plugin/config.py
index bf546ee..0086525 100644
--- a/telemetry_tempest_plugin/config.py
+++ b/telemetry_tempest_plugin/config.py
@@ -80,11 +80,11 @@
default=False,
help="Disable SSL certificate validation when running "
"scenario tests"),
- cfg.StrOpt('sg_core_service_url',
+ cfg.URIOpt('sg_core_service_url',
default="http://127.0.0.1:3000",
help="URL to sg-core prometheus endpoint"),
- cfg.StrOpt('prometheus_service_url',
- default="127.0.0.1:9090",
+ cfg.URIOpt('prometheus_service_url',
+ default="http://127.0.0.1:9090",
help="URL to prometheus endpoint"),
cfg.IntOpt('ceilometer_polling_interval',
default=300,
diff --git a/telemetry_tempest_plugin/scenario/test_telemetry_integration_prometheus.py b/telemetry_tempest_plugin/scenario/test_telemetry_integration_prometheus.py
index 6f9e3f6..1def0f6 100644
--- a/telemetry_tempest_plugin/scenario/test_telemetry_integration_prometheus.py
+++ b/telemetry_tempest_plugin/scenario/test_telemetry_integration_prometheus.py
@@ -166,7 +166,6 @@
"NEUTRON_NETWORK": self.stack_network_id,
"STACK_NAME": self.stack_name,
"RESOURCE_PREFIX": resource_prefix,
- "PROMETHEUS_RATE_DURATION": str(prometheus_rate_duration),
"LOAD_LENGTH": str(prometheus_rate_duration * 2),
"QUERY": query,
})