df8e8b42a4
There were some changes to the sg-core devstack plugin, to which we need to react. These changes are similar to what was done in the telemetry-tempest-plugin recently: https://review.opendev.org/c/openstack/telemetry-tempest-plugin/+/945108 https://review.opendev.org/c/openstack/telemetry-tempest-plugin/+/937371 Use PROMETHEUS_CUSTOM_SCRAPE_TARGETS to pass sg_core scrape endpoint https://review.opendev.org/c/openstack/devstack-plugin-prometheus/+/950476 adds the support for passing custom prometheus scrape target in d-p-p. Let's use the same to pass sg_core endpoint. Cherry-picked from these 2 commits on master, without conflicts (both at once need to be applied to pass CI):2fc3646ac534781c5e4fChange-Id: I5c1885a3ca9d732d41db140a0feb4c87925b5a48 Co-Authored-By: Chandan Kumar (raukadah) <chkumar@redhat.com> Signed-off-by: Elod Illes <elod.illes@est.tech> Signed-off-by: Jaromir Wysoglad <jwysogla@redhat.com> (cherry picked from commit93a969a99f)
75 lines
2.7 KiB
YAML
75 lines
2.7 KiB
YAML
- job:
|
|
# TODO(jwysogla): Include these tests in the
|
|
# telemetry-dsvm-integration jobs
|
|
name: observabilityclient-dsvm-functional
|
|
parent: devstack-tox-functional
|
|
description: |
|
|
Devstack-based functional tests for observabilityclient.
|
|
required-projects:
|
|
- openstack/python-observabilityclient
|
|
- openstack/ceilometer
|
|
- openstack-k8s-operators/sg-core
|
|
- openstack/devstack-plugin-prometheus
|
|
timeout: 4200
|
|
vars:
|
|
devstack_localrc:
|
|
USE_PYTHON3: True
|
|
PROMETHEUS_SERVICE_SCRAPE_TARGETS: prometheus,sg-core
|
|
CEILOMETER_BACKEND: sg-core
|
|
PROMETHEUS_CUSTOM_SCRAPE_TARGETS: "localhost:3000,localhost:9090"
|
|
devstack_plugins:
|
|
sg-core: https://github.com/openstack-k8s-operators/sg-core
|
|
ceilometer: https://opendev.org/openstack/ceilometer
|
|
devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
|
|
devstack_services:
|
|
node_exporter: false
|
|
zuul_copy_output:
|
|
/etc/prometheus/prometheus.yml: logs
|
|
/etc/openstack/prometheus.yaml: logs
|
|
|
|
- project:
|
|
queue: telemetry
|
|
templates:
|
|
- openstack-python3-jobs
|
|
- check-requirements
|
|
#- release-notes-jobs-python3
|
|
check:
|
|
jobs:
|
|
- telemetry-dsvm-integration:
|
|
irrelevant-files: &pobsc-irrelevant-files
|
|
- ^(test-|)requirements.txt$
|
|
- ^setup.cfg$
|
|
- ^.*\.rst$
|
|
- ^releasenotes/.*$
|
|
- ^observabilityclient/tests/.*$
|
|
- ^tools/.*$
|
|
- ^tox.ini$
|
|
voting: false
|
|
- telemetry-dsvm-integration-ipv6-only:
|
|
irrelevant-files: *pobsc-irrelevant-files
|
|
voting: false
|
|
- telemetry-dsvm-integration-centos-9s:
|
|
irrelevant-files: *pobsc-irrelevant-files
|
|
voting: false
|
|
- telemetry-dsvm-integration-centos-9s-fips:
|
|
irrelevant-files: *pobsc-irrelevant-files
|
|
voting: false
|
|
- observabilityclient-dsvm-functional:
|
|
irrelevant-files: *pobsc-irrelevant-files
|
|
gate:
|
|
jobs:
|
|
- telemetry-dsvm-integration:
|
|
irrelevant-files: *pobsc-irrelevant-files
|
|
voting: false
|
|
- telemetry-dsvm-integration-ipv6-only:
|
|
irrelevant-files: *pobsc-irrelevant-files
|
|
voting: false
|
|
- telemetry-dsvm-integration-centos-9s:
|
|
irrelevant-files: *pobsc-irrelevant-files
|
|
voting: false
|
|
- telemetry-dsvm-integration-centos-9s-fips:
|
|
irrelevant-files: *pobsc-irrelevant-files
|
|
voting: false
|
|
- observabilityclient-dsvm-functional:
|
|
irrelevant-files: *pobsc-irrelevant-files
|