commit 064072dad09aaf57966f94e125f6da167d91259e
author Takashi Kajinami <kajinamit@oss.nttdata.com> Mon Dec 02 16:02:39 2024 +0900
committer Takashi Kajinami <kajinamit@oss.nttdata.com> Fri Dec 13 06:01:37 2024 +0000
tree d4d58c51291047d41e3b331e788b7a9836094cee
parent 7380d25932a43c3b302c97ee8c02a818d28df4c0

Drop unnecessary variable overrides

zuul automatically merges variables from base job unless the same
key is explicitly defined. So we don't have to define the same value
in children.

Change-Id: Ie9fbe70faee0d5cc2ec349c735b5d033e2abbb10

.zuul.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 8422025..13c83b0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -75,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:
@@ -102,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:
@@ -116,8 +105,6 @@
             telemetry_services:
               metric_backends: gnocchi
             telemetry:
-              disable_ssl_certificate_validation: True
-              ceilometer_polling_interval: 15
               autoscaling_instance_grouping: prefix
 
 - job: