diff options
| -rw-r--r-- | roles/openstack-clients/defaults/main.yml | 4 | ||||
| -rw-r--r-- | tests/run.yml | 7 | ||||
| -rw-r--r-- | tests/templates/globals-default.j2 | 6 | ||||
| -rwxr-xr-x | tests/test-telemetry.sh | 42 | ||||
| -rw-r--r-- | zuul.d/base.yaml | 14 | ||||
| -rw-r--r-- | zuul.d/jobs.yaml | 14 | ||||
| -rw-r--r-- | zuul.d/project.yaml | 1 |
7 files changed, 88 insertions, 0 deletions
diff --git a/roles/openstack-clients/defaults/main.yml b/roles/openstack-clients/defaults/main.yml index d335a3ef1..8545a8973 100644 --- a/roles/openstack-clients/defaults/main.yml +++ b/roles/openstack-clients/defaults/main.yml @@ -1,9 +1,13 @@ --- openstack_clients_pip_packages: + - package: aodhclient + enabled: "{{ scenario == 'telemetry' }}" - package: python-barbicanclient enabled: "{{ scenario == 'scenario_nfv' }}" - package: python-designateclient enabled: "{{ scenario == 'magnum' }}" + - package: gnocchiclient + enabled: "{{ scenario == 'telemetry' }}" - package: python-heatclient enabled: true - package: python-ironicclient diff --git a/tests/run.yml b/tests/run.yml index 99f110e31..d03187b95 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -571,6 +571,13 @@ chdir: "{{ kolla_ansible_src_dir }}" when: scenario == "skyline-sso" + - name: Run test-telemetry.sh script + script: + cmd: test-telemetry.sh + executable: /bin/bash + chdir: "{{ kolla_ansible_src_dir }}" + when: scenario == "telemetry" + - name: Run test-container-engine-migration.sh script script: cmd: test-container-engine-migration.sh diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index fe7950e65..77b02f4b6 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -278,5 +278,11 @@ enable_skyline: "yes" skyline_enable_sso: "yes" {% endif %} +{% if scenario == "telemetry" %} +enable_aodh: "yes" +enable_ceilometer: "yes" +enable_gnocchi: "yes" +{% endif %} + mariadb_monitor_read_only_interval: "30000" mariadb_monitor_galera_healthcheck_timeout: "30000" diff --git a/tests/test-telemetry.sh b/tests/test-telemetry.sh new file mode 100755 index 000000000..91b5f6c32 --- /dev/null +++ b/tests/test-telemetry.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +set -o xtrace +set -o errexit +set -o pipefail + +# Enable unbuffered output +export PYTHONUNBUFFERED=1 + +function test_aodh { + echo "TESTING: Aodh" + openstack alarm list + echo "SUCCESS: Aodh" +} + +function test_gnocchi { + echo "TESTING: Gnocchi" + openstack metric list + openstack metric resource list + echo "SUCCESS: Gnocchi" +} + +function test_telemetry_scenario_logged { + . /etc/kolla/admin-openrc.sh + . ~/openstackclient-venv/bin/activate + test_aodh + test_gnocchi +} + +function test_telemetry_scenario { + echo "Testing Telemetry" + test_telemetry_scenario_logged > /tmp/logs/ansible/test-telemetry-scenario 2>&1 + result=$? + if [[ $result != 0 ]]; then + echo "Testing Telemetry scenario failed. See ansible/test-telemetry-scenario for details" + else + echo "Successfully tested Telemetry scenario. See ansible/test-telemetry-scenario for details" + fi + return $result +} + +test_telemetry_scenario diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 82daa26e2..8bc43be5b 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -431,6 +431,20 @@ - ^skyline - job: + name: kolla-ansible-telemetry-base + parent: kolla-ansible-scenario-base + voting: false + files: + - ^ansible/roles/(aodh|ceilometer|gnocchi)/ + - ^tests/test-telemetry.sh + vars: + scenario: telemetry + scenario_images_extra: + - ^aodh + - ^ceilometer + - ^gnocchi + +- job: name: kolla-ansible-container-engine-migration-base parent: kolla-ansible-base voting: false diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index e416ce845..af453334d 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -570,6 +570,20 @@ base_distro: rocky - job: + name: kolla-ansible-ubuntu-telemetry + parent: kolla-ansible-telemetry-base + nodeset: kolla-ansible-ubuntu-noble-8GB + vars: + base_distro: ubuntu + +- job: + name: kolla-ansible-rocky9-telemetry + parent: kolla-ansible-telemetry-base + nodeset: kolla-ansible-rocky9 + vars: + base_distro: rocky + +- job: name: kolla-ansible-rocky9-container-engine-migration parent: kolla-ansible-container-engine-migration-base nodeset: kolla-ansible-rocky9 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 7ec21b694..82c4562b1 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -45,6 +45,7 @@ - kolla-ansible-ubuntu-lets-encrypt - kolla-ansible-ubuntu-skyline - kolla-ansible-ubuntu-skyline-sso + - kolla-ansible-ubuntu-telemetry - kolla-ansible-ubuntu-container-engine-migration - kolla-ansible-ubuntu-container-engine-migration-multinode - kolla-ansible-debian-container-engine-migration |