diff options
| -rw-r--r-- | roles/kolla-ansible-test-dashboard/tasks/main.yml | 2 | ||||
| -rw-r--r-- | tests/post.yml | 24 | ||||
| -rw-r--r-- | tests/testinfra/test_horizon.py | 6 | ||||
| -rw-r--r-- | zuul.d/base.yaml | 1 |
4 files changed, 19 insertions, 14 deletions
diff --git a/roles/kolla-ansible-test-dashboard/tasks/main.yml b/roles/kolla-ansible-test-dashboard/tasks/main.yml index e09d62a33..8455b3154 100644 --- a/roles/kolla-ansible-test-dashboard/tasks/main.yml +++ b/roles/kolla-ansible-test-dashboard/tasks/main.yml @@ -70,6 +70,8 @@ port: 4444 - name: Run testinfra tests + environment: + HORIZON_PROTO: "{{ 'https' if tls_enabled | bool else 'http' }}" ansible.builtin.shell: cmd: > . {{ kolla_ansible_venv_path }}/bin/activate && diff --git a/tests/post.yml b/tests/post.yml index 83b34638f..46e437096 100644 --- a/tests/post.yml +++ b/tests/post.yml @@ -7,18 +7,6 @@ zuul_work_dir: '/home/zuul/tempest' tasks: - - name: Return artifact to Zuul - zuul_return: - data: - zuul: - artifacts: - - name: "TestInfra Unit Test Report" - url: "testinfra/test-results-testinfra.html" - metadata: - type: unit_test_report - - name: "TestInfra Screenshots" - url: "testinfra/screenshots" - # TODO(mhiner): Currently only Docker to Podman migration is tested. # If we want to test the other direction we have to rework this. - name: Change container engine after the migration @@ -96,6 +84,18 @@ # TODO(mnasiadka): Remove in G/2026.1 cycle ignore_errors: true + - name: Return artifact to Zuul + zuul_return: + data: + zuul: + artifacts: + - name: "TestInfra Unit Test Report" + url: "testinfra/test-results-testinfra.html" + metadata: + type: unit_test_report + - name: "TestInfra Screenshots" + url: "testinfra/screenshots" + - name: Check for existence of ara sqlite stat: path: "{{ ansible_env.HOME }}/.ara/server/ansible.sqlite" diff --git a/tests/testinfra/test_horizon.py b/tests/testinfra/test_horizon.py index 84b101e22..abdb787c6 100644 --- a/tests/testinfra/test_horizon.py +++ b/tests/testinfra/test_horizon.py @@ -38,7 +38,8 @@ def test_horizon_screenshot(host): command_executor='http://localhost:4444/wd/hub', options=firefox_options) - horizon_url = "https://192.0.2.10" + horizon_proto = host.environment().get('HORIZON_PROTO') + horizon_url = horizon_proto + "://192.0.2.10" try: driver.get(horizon_url) @@ -77,7 +78,8 @@ def test_horizon_login(host): command_executor='http://localhost:4444/wd/hub', options=firefox_options) - horizon_url = "https://192.0.2.10" + horizon_proto = host.environment().get('HORIZON_PROTO') + horizon_url = horizon_proto + "://192.0.2.10" logout_url = '/'.join(( horizon_url, 'auth', diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 8564afa1f..7a9b481cb 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -14,6 +14,7 @@ files: - ^ansible/group_vars/all/common.yml - ^requirements-core.yml + - ^roles/kolla-ansible-test-dashboard/ - ^tests/check-(config|failure|logs).sh - ^tests/get_logs.sh - ^tests/init-core-openstack.sh |