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

os-autoinst · Mar 19, 2018 · b28caa5 · b28caa5
1 parent f6f1609
commit b28caa5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/lib/y2logsstep.pm b/lib/y2logsstep.pm
@@ -84,6 +84,7 @@ sub workaround_dependency_issues {
             sleep 2;
         }
     }
+    return 1;
 }
 
 # to break dependency issues

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
 
@@ -154,7 +155,7 @@ sub package_action {
 
 sub run {
     my ($self) = @_;
-
+    my $dep_issue;
     $self->gotopatterns;
     if (get_var('PATTERNS')) {
         my %wanted_patterns;
@@ -190,8 +191,8 @@ sub run {
                 };
                 assert_screen 'current-pattern-selected', 5;
             }
-            $self->workaround_dependency_issues;
-            # stick to the default patterns
+            $dep_issue = $self->workaround_dependency_issues || $dep_issue;    # check if at least 1 dep. issue was displayed
+                                                                               # stick to the default patterns
             if (get_var('PATTERNS', '') =~ /default/) {
                 $needs_to_be_selected = $selected;
             }
@@ -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') and $dep_issue) {
+        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;