Remove OCPBUGS-67159 workaround and enable openstack_test

collection/stages/roles/install/templates/install-config-ipi.yaml.j2

@@ -59,11 +59,6 @@ platform:
         - subnet:
             name: "{{ installcfg_subnet.name }}"
     {%- else +%}
-    {%- if ocp_deployment_topology.api_vip is defined +%}
-    # Workaround for OCPBUGS-67159 (adoption uses pre-existing VIPs, not FIPs)
-    apiVIPs: ["{{ ocp_deployment_topology.api_vip }}"]
-    ingressVIPs: ["{{ ocp_deployment_topology.ingress_vip }}"]
-    {%- endif +%}
     externalNetwork:  "{{ installcfg_external_network }}"
     apiFloatingIP:     "{{ installcfg_api_floating_ip }}"
     ingressFloatingIP: "{{ installcfg_ingress_floating_ip }}"

collection/stages/roles/openstack_test/tasks/main.yml

@@ -31,6 +31,7 @@
           - "{{ resources.apps_accessible_ip }}"
       delegate_to: "{{ hypervisor }}"
       remote_user: root
+      when: hypervisor is defined
 
     - name: Include Openstack-Test tasks
       ansible.builtin.include_tasks: run_openstack_test.yml
@@ -52,3 +53,4 @@
         tasks_from: restore.yml
       delegate_to: "{{ hypervisor }}"
       remote_user: root
+      when: hypervisor is defined

collection/tools/roles/tools_get_openshift_release/tasks/get_openshift_release_binaries.yml

@@ -26,7 +26,13 @@
         msg: "'openshift_release_pull_spec' must be set by get_openshift_release_build_name.yml"
       when: openshift_release_pull_spec is not defined or openshift_release_pull_spec == ''
 
+    - name: Check if pull secret is pre-populated
+      ansible.builtin.stat:
+        path: "{{ pull_secret_file }}"
+      register: _pull_secret_preexists
+
     - name: Extract pull secret from host cluster via Kubernetes API
+      when: not (_pull_secret_preexists.stat.exists and _pull_secret_preexists.stat.size > 0)
       changed_when: true
       ansible.builtin.shell: |
         python3 << 'PYEOF'
@@ -183,6 +189,7 @@
 
   always:
     - name: Remove pull secret file
+      when: not (_pull_secret_preexists.stat.exists | default(false))
       ansible.builtin.file:
         path: "{{ pull_secret_file }}"
         state: absent

jobs_definitions/adoption.yaml

@@ -8,10 +8,7 @@ stages:
   - install
   - post
   - verification
-  # openstack_test delegates DNS tasks to the hypervisor via
-  # tools_cifmw_dnsmasq, which is unreachable from the adoption
-  # container context. Tracked in OSPRH-27365.
-  # - openstack_test
+  - openstack_test
   # Removed LB tests until Octavia is supported and enabled in adoption jobs
   # - lb_tests
 
@@ -45,6 +42,3 @@ ocp_deployment_topology:
   servergroups:
     master: "soft-anti-affinity"  # Required if number of computes < 3, otherwise can be anti-affinity
     worker: "soft-anti-affinity"  # Required if number of computes < 3, otherwise can be anti-affinity
-  # Workaround for OCPBUGS-67159
-  api_vip: "10.196.0.15"
-  ingress_vip: "10.196.0.17"