CI: test-dashboard: Use http/https where configured

Also move zuul_return to run only on primary

Change-Id: I5b27663e8c539715e6aeb18b179a4f0b98103f7f
Signed-off-by: Michal Nasiadka <[email protected]>

Author: mnasiadka

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 &&

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"

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',

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