Move ansible test into phub extratests

It's not good to mess with SCC modules on maintenance tests, the modules are mostly already added or there is specific test like for phub On fucntional is ansible already in phub extratests
dzedro · Oct 3, 2023 · 44f59d2 · 44f59d2
1 parent bd6b88e
commit 44f59d2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/schedule/qam/15-SP3/mau-extratests-phub.yaml b/schedule/qam/15-SP3/mau-extratests-phub.yaml
@@ -10,6 +10,7 @@ schedule:
   - '{{sle15_x86_64}}'
   - console/python_flake8
   - console/vmstat
+  - console/ansible
   - console/coredump_collect
 conditional_schedule:
   sle15_x86_64:

diff --git a/schedule/qam/15-SP4/mau-extratests-phub.yaml b/schedule/qam/15-SP4/mau-extratests-phub.yaml
@@ -10,10 +10,15 @@ schedule:
   - '{{sle15_x86_64}}'
   - console/python_flake8
   - console/vmstat
+  - '{{arch_specific15_sp4}}'
   - console/coredump_collect
 conditional_schedule:
   sle15_x86_64:
     ARCH:
       x86_64:
         - console/wpa_supplicant
+  arch_specific15_sp4:
+    ARCH:
+      x86_64:
+        - console/ansible
 ...
diff --git a/schedule/qam/15-SP5/mau-extratests-phub.yaml b/schedule/qam/15-SP5/mau-extratests-phub.yaml
@@ -10,10 +10,15 @@ schedule:
   - '{{sle15_x86_64}}'
   # - console/python_flake8 Removed due to bsc#1209609
   - console/vmstat
+  - '{{arch_specific15_sp4}}'
   - console/coredump_collect
 conditional_schedule:
   sle15_x86_64:
     ARCH:
       x86_64:
         - console/wpa_supplicant
+  arch_specific15_sp4:
+    ARCH:
+      x86_64:
+        - console/ansible
 ...
diff --git a/schedule/qam/common/mau-extratests2.yaml b/schedule/qam/common/mau-extratests2.yaml
@@ -46,7 +46,6 @@ conditional_schedule:
         - console/openvswitch_ssl
         - console/nginx
         - '{{arch_specific}}'
-        - '{{arch_specific15_sp4}}'
         - console/valgrind
         - '{{arch_specific15_sp5}}'
       15-SP4:
@@ -59,7 +58,6 @@ conditional_schedule:
         - console/openvswitch_ssl
         - console/nginx
         - '{{arch_specific}}'
-        - '{{arch_specific15_sp4}}'
         - console/valgrind
       15-SP3:
         - console/osinfo_db
@@ -70,7 +68,6 @@ conditional_schedule:
         - console/journald_fss
         - console/openvswitch_ssl
         - console/nginx
-        - console/ansible
         - '{{arch_specific}}'
         - console/valgrind
       15-SP2:
@@ -132,10 +129,6 @@ conditional_schedule:
         - console/journald_fss
       aarch64:
         - console/journald_fss
-  arch_specific15_sp4:
-    ARCH:
-      x86_64:
-        - console/ansible
   arch_specific15_sp5:
     ARCH:
       x86_64:

diff --git a/tests/console/ansible.pm b/tests/console/ansible.pm
@@ -36,7 +36,7 @@ sub run {
 
     # 1. System setup
 
-    unless (is_opensuse) {
+    unless (is_opensuse || main_common::is_updates_tests) {
         # The Desktop module is required by the Development Tools module
         add_suseconnect_product(get_addon_fullname('desktop'));
         # Package 'ansible-test' needs python3-virtualenv from Development Tools module