Merge "Remove unused environment variables"
diff --git a/.zuul.yaml b/.zuul.yaml
index d939716..ca066fc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -19,14 +19,14 @@
- openstack/diskimage-builder
- openstack/tempest
- gnocchixyz/gnocchi
- - infrawatch/sg-core
+ - openstack-k8s-operators/sg-core
vars: &base_vars
configure_swap_size: 8192
devstack_plugins:
heat: https://opendev.org/openstack/heat
ceilometer: https://opendev.org/openstack/ceilometer
aodh: https://opendev.org/openstack/aodh
- sg-core: https://github.com/infrawatch/sg-core
+ sg-core: https://github.com/openstack-k8s-operators/sg-core
# NOTE(jokke): The following will disable the gabbi based integration tests for now.
# We will need to figure out how we refactor them to be stable in the CI.
tempest_exclude_regex: (^telemetry_tempest_plugin\.scenario\.test_telemetry_integration\.)
@@ -56,6 +56,14 @@
name: telemetry-dsvm-integration
parent: telemetry-tempest-base
+# TODO(gmann): As per the 2025.1 testing runtime, we need to run at least
+# one job on jammy. This job can be removed in the next cycle(2025.2)
+- job:
+ name: telemetry-dsvm-integration-ubuntu-jammy
+ description: This is integrated compute job testing on Ubuntu jammy(22.04)
+ parent: telemetry-dsvm-integration
+ nodeset: openstack-single-node-jammy
+
- job:
name: telemetry-dsvm-integration-2024-2
parent: telemetry-tempest-base
@@ -67,13 +75,7 @@
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
- service_available:
- sg_core: True
- telemetry_services:
- metric_backends: gnocchi,prometheus
telemetry:
- disable_ssl_certificate_validation: True
- ceilometer_polling_interval: 15
autoscaling_instance_grouping: prefix
- job:
@@ -94,11 +96,6 @@
override-checkout: stable/4.6
vars: &no_prometheus_vars
devstack_localrc:
- TEMPEST_PLUGINS: '"/opt/stack/telemetry-tempest-plugin /opt/stack/heat-tempest-plugin"'
- GNOCCHI_ARCHIVE_POLICY_TEMPEST: "ceilometer-high-rate"
- CEILOMETER_BACKENDS: "gnocchi"
- CEILOMETER_PIPELINE_INTERVAL: 15
- CEILOMETER_ALARM_THRESHOLD: 6000000000
GLOBAL_VENV: False
devstack_local_conf:
test-config:
@@ -108,8 +105,6 @@
telemetry_services:
metric_backends: gnocchi
telemetry:
- disable_ssl_certificate_validation: True
- ceilometer_polling_interval: 15
autoscaling_instance_grouping: prefix
- job:
@@ -262,6 +257,7 @@
check:
jobs:
- telemetry-dsvm-integration
+ - telemetry-dsvm-integration-ubuntu-jammy
- telemetry-dsvm-integration-2023-2
- telemetry-dsvm-integration-2024-1
- telemetry-dsvm-integration-2024-2
@@ -271,4 +267,5 @@
gate:
jobs:
- telemetry-dsvm-integration
+ - telemetry-dsvm-integration-ubuntu-jammy
- telemetry-dsvm-integration-ipv6-only
diff --git a/telemetry_tempest_plugin/config.py b/telemetry_tempest_plugin/config.py
index e2e1766..bf546ee 100644
--- a/telemetry_tempest_plugin/config.py
+++ b/telemetry_tempest_plugin/config.py
@@ -81,7 +81,7 @@
help="Disable SSL certificate validation when running "
"scenario tests"),
cfg.StrOpt('sg_core_service_url',
- default="127.0.0.1:3000",
+ 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",