Skip 2nd&3rd runs when selecting all atterns in sle15

os-autoinst · Mar 16, 2018 · 79346e8 · 79346e8
1 parent dd47648
commit 79346e8
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/tests/installation/select_patterns_and_packages.pm b/tests/installation/select_patterns_and_packages.pm
@@ -22,6 +22,7 @@
 use base "y2logsstep";
 use strict;
 use testapi;
+use version_utils 'is_sle';
 
 my $secondrun = 0;    # bsc#1029660
 
@@ -204,12 +205,17 @@ sub run {
         }
     }
     $self->package_action;
-    $secondrun++;
-    $self->gotopatterns;
-    $self->package_action;
-    $secondrun--;
-    $self->gotopatterns;
-    $self->package_action('unblock');
+    if (is_sle('15+') and check_var('PATTERNS', 'all')) {
+        record_soft_failure "bsc#1084064 - Cloud patterns conflicts";    # skip second & third runs
+    }
+    else {
+        $secondrun++;
+        $self->gotopatterns;
+        $self->package_action;
+        $secondrun--;
+        $self->gotopatterns;
+        $self->package_action('unblock');
+    }
 }
 
 1;