Merge "Update invalid link"
diff --git a/.zuul.yaml b/.zuul.yaml
index 571c930..0711f5c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -40,7 +40,17 @@
- job:
name: telemetry-dsvm-integration
parent: telemetry-tempest-base
- branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
+ branches: ^(?!stable/(ocata|pike|queens|rocky|stein|train)).*$
+
+- job:
+ name: telemetry-dsvm-integration
+ parent: telemetry-tempest-base
+ branches:
+ - stable/stein
+ - stable/train
+ vars:
+ devstack_localrc:
+ USE_PYTHON3: False
- job:
name: telemetry-dsvm-integration
@@ -51,6 +61,7 @@
- stable/rocky
vars:
devstack_localrc:
+ USE_PYTHON3: False
GNOCCHI_ARCHIVE_POLICY_TEMPEST: "ceilometer-high"
GNOCCHI_ARCHIVE_POLICY: "high"
CEILOMETER_ALARM_AGGREGATION_METHOD: "mean"
@@ -59,7 +70,7 @@
- job:
name: telemetry-dsvm-integration-ipv6-only
parent: devstack-tempest-ipv6
- branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
+ branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
description: |
Telemetry devstack tempest tests job for IPv6-only deployment
required-projects: *base_required_projects
diff --git a/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/aodh-gnocchi-threshold-alarm.yaml b/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/aodh-gnocchi-threshold-alarm.yaml
index 9349295..1c55f0b 100644
--- a/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/aodh-gnocchi-threshold-alarm.yaml
+++ b/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/aodh-gnocchi-threshold-alarm.yaml
@@ -20,7 +20,8 @@
- name: SETUP. create archive policy gabbiliveceph
desc: create archve policy 'gabbiliveceph' for tests
POST: $ENVIRON['GNOCCHI_SERVICE_URL']/v1/archive_policy
- status: 201
+ # 409 when policy with such name already exists
+ status: 201 || 409
request_headers:
content-type: application/json
data:
@@ -37,8 +38,13 @@
- mean
- min
- max
+
+ - name: check properties of created or existing archive policy
+ GET: $ENVIRON['GNOCCHI_SERVICE_URL']/v1/archive_policy/gabbiliveceph
+ status: 200
+ request_headers:
+ content-type: application/json
response_json_paths:
- $.name: gabbiliveceph
$.back_window: 0
$.aggregation_methods.`len`: 3