Narrow down disabling of RHUI repo to the one family that is failing (#…

…1716)
stackrox · Jun 25, 2024 · dee2f3f · dee2f3f
1 parent d690942
commit dee2f3f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -61,7 +61,10 @@ virtual_machines:
     families:
       - rhel-8-4-sap-ha
       - rhel-8-6-sap-ha
-    container_engine: podman
+    # RHEL SAP 8.4 seems to have an older version of podman that
+    # fails with our integration tests, so we stick with docker
+    # for now.
+    container_engine: docker
 
   rhcos:
     project: rhcos-cloud

diff --git a/ansible/roles/provision-vm/tasks/redhat.yml b/ansible/roles/provision-vm/tasks/redhat.yml
@@ -26,7 +26,7 @@
 - name: Disable troublesome repo
   ansible.builtin.shell: |
     dnf config-manager --disable rhui-codeready-builder-for-rhel-8-x86_64-rhui-source-rpms
-  when: vm_config.find('-8') != -1 and vm_arch == 'amd64'
+  when: vm_image_family == 'rhel-8'
 
 - name: Install needed utilities
   ansible.builtin.dnf: