diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2025-10-27 09:09:50 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2025-10-28 16:13:12 +0000 |
| commit | af2544be54ba816ec1a12e5e083fd09f29df64fb (patch) | |
| tree | 88ae8abea97ae81e704f38d380b43486718563bb /tests | |
| parent | ad26a57484ac16f275d3baafcbacdad536b7ff75 (diff) | |
| download | kolla-ansible-af2544be54ba816ec1a12e5e083fd09f29df64fb.tar.gz kolla-ansible-af2544be54ba816ec1a12e5e083fd09f29df64fb.zip | |
Drop venus
It has been marked as inactive and venus dashboard plugin is breaking
Horizon Kolla builds.
Change-Id: I78cf7a33bf1025f5c8e4b76ecfeef7d8a3126d61
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/check-logs.sh | 3 | ||||
| -rw-r--r-- | tests/run.yml | 9 | ||||
| -rw-r--r-- | tests/templates/globals-default.j2 | 6 | ||||
| -rw-r--r-- | tests/templates/inventory.j2 | 9 | ||||
| -rwxr-xr-x | tests/test-venus.sh | 94 |
5 files changed, 1 insertions, 120 deletions
diff --git a/tests/check-logs.sh b/tests/check-logs.sh index a9f7d464e..dac11ccb9 100755 --- a/tests/check-logs.sh +++ b/tests/check-logs.sh @@ -97,9 +97,6 @@ function check_fluentd_missing_logs { /var/log/kolla/tenks/*) continue ;; - /var/log/kolla/venus/*) - continue - ;; /var/log/kolla/zun/*) continue ;; diff --git a/tests/run.yml b/tests/run.yml index 7e9d71a77..d421c3e7a 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -10,7 +10,7 @@ - name: Set facts for commonly used variables vars: # NOTE(yoctozepto): needed here to use in other facts too - openstack_core_enabled: "{{ scenario not in ['bifrost', 'mariadb', 'prometheus-opensearch', 'venus'] }}" + openstack_core_enabled: "{{ scenario not in ['bifrost', 'mariadb', 'prometheus-opensearch'] }}" set_fact: kolla_inventory_path: "/etc/kolla/inventory" logs_dir: "/tmp/logs" @@ -526,13 +526,6 @@ when: - scenario == "prometheus-opensearch" - - name: Run test-venus.sh script - script: - cmd: test-venus.sh - executable: /bin/bash - chdir: "{{ kolla_ansible_src_dir }}" - when: scenario == "venus" - - name: Run test-skyline.sh script script: cmd: test-skyline.sh diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 32a28773f..1ec2a7442 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -236,12 +236,6 @@ octavia_network_type: "tenant" enable_redis: "yes" {% endif %} -{% if scenario == "venus" %} -enable_opensearch: "yes" -enable_keystone: "yes" -enable_venus: "yes" -{% endif %} - {% if groups['all'] | length == 1 %} keepalived_track_script_enabled: "no" {% endif %} diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2 index ca98719a8..d0711e93e 100644 --- a/tests/templates/inventory.j2 +++ b/tests/templates/inventory.j2 @@ -231,9 +231,6 @@ control [blazar:children] control -[venus:children] -monitoring - [letsencrypt:children] loadbalancer @@ -662,12 +659,6 @@ ovn-database [ovn-sb-db-relay:children] ovn-database -[venus-api:children] -venus - -[venus-manager:children] -venus - [letsencrypt-webserver:children] letsencrypt diff --git a/tests/test-venus.sh b/tests/test-venus.sh deleted file mode 100755 index 0039d6774..000000000 --- a/tests/test-venus.sh +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -set -o xtrace -set -o errexit -set -o pipefail - -# Enable unbuffered output -export PYTHONUNBUFFERED=1 - -# TODO(yoctozepto): Avoid duplicating this from prometheus-opensearch -function check_opensearch { - # Verify that we see a healthy index created due to Fluentd forwarding logs - local opensearch_url=${OS_AUTH_URL%:*}:9200/_cluster/health - output_path=$1 - args=( - --include - --location - --fail - ) - if ! curl "${args[@]}" $opensearch_url > $output_path; then - return 1 - fi - # NOTE(mgoddard): Status may be yellow because no indices have been - # created. - if ! grep -E '"status":"(green|yellow)"' $output_path >/dev/null; then - return 1 - fi -} - -function check_venus { - local venus_url=${OS_AUTH_URL%:*}:10010/custom_config - output_path=$1 - if ! curl --include --fail $venus_url > $output_path; then - return 1 - fi - if ! grep -E '"status": "SUPPORTED"' $output_path >/dev/null; then - return 1 - fi -} - -function test_opensearch { - echo "TESTING: OpenSearch" - output_path=$(mktemp) - attempt=1 - while ! check_opensearch $output_path; do - echo "OpenSearch not accessible yet" - attempt=$((attempt+1)) - if [[ $attempt -eq 12 ]]; then - echo "FAILED: OpenSearch did not become accessible. Response:" - cat $output_path - return 1 - fi - sleep 10 - done - echo "SUCCESS: OpenSearch" -} - -function test_venus { - echo "TESTING: Venus" - output_path=$(mktemp) - attempt=1 - while ! check_venus $output_path; do - echo "Venus not accessible yet" - attempt=$((attempt+1)) - if [[ $attempt -eq 12 ]]; then - echo "FAILED: Venus did not become accessible. Response:" - cat $output_path - return 1 - fi - sleep 10 - done - echo "SUCCESS: Venus" -} - -function test_venus_scenario_logged { - . /etc/kolla/admin-openrc.sh - - test_opensearch - test_venus -} - -function test_venus_scenario { - echo "Testing Venus and OpenSearch" - test_venus_scenario_logged > /tmp/logs/ansible/test-venus-scenario 2>&1 - result=$? - if [[ $result != 0 ]]; then - echo "Testing Venus scenario failed. See ansible/test-venus-scenario for details" - else - echo "Successfully tested Venus scenario. See ansible/test-venus-scenario for details" - fi - return $result -} - -test_venus_scenario |
