Merge pull request os-autoinst#3553 from rwx788/23492_sle15_scc

Adjust proxy_SCC+allmodules test suite for SLE 15
rwx788 · Sep 13, 2017 · e8f150c · e8f150c
2 parents 691d045 + acc5a6f
commit e8f150c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/lib/registration.pm b/lib/registration.pm
@@ -155,17 +155,27 @@ sub fill_in_registration_data {
                 }
             }
             send_key $cmd{next};    # all addons selected
+            my @addons_with_license = qw(ha geo we live rt idu ids lgm wsm hpcm);
+            # Development tools do not have license in SLE 15
+            push(@addons_with_license, 'sdk') unless sle_version_at_least('15');
+
             for my $addon (@scc_addons) {
                 # most modules don't have license, skip them
-                next unless grep { $addon eq $_ } qw(ha geo sdk we live rt idu ids lgm wsm hpcm);
+                next unless grep { $addon eq $_ } @addons_with_license;
                 while (check_screen('scc-downloading-license', 5)) {
                     # wait for SCC to give us the license
                     sleep 5;
                 }
-                assert_screen "scc-addon-license-$addon", 60;
-                addon_decline_license;
-                wait_still_screen 2;
-                send_key $cmd{next};
+                # No license agreements are shown in SLE 15 at the moment
+                if (sle_version_at_least('15') && check_screen([qw(ext-module-registration-codes inst-addon)], 0)) {
+                    record_soft_failure 'bsc#1057223';
+                }
+                else {
+                    assert_screen "scc-addon-license-$addon", 60;
+                    addon_decline_license;
+                    wait_still_screen 2;
+                    send_key $cmd{next};
+                }
             }
             for my $addon (@scc_addons) {
                 # no need to input registration code if register via SMT

diff --git a/products/sle/main.pm b/products/sle/main.pm
@@ -288,7 +288,7 @@ if (get_var('DEV_IMAGE')) {
 
 # This is workaround setting which will be removed once SCC add repos and allows adding modules
 # TODO: remove when not used anymore
-if (sle_version_at_least('15')) {
+if (sle_version_at_least('15') && !check_var('SCC_REGISTER', 'installation')) {
     my @modules;
     if (get_var('ALL_MODULES')) {
         # By default add all modules
@@ -340,8 +340,7 @@ if (sle_version_at_least('15')) {
 
 if (get_var('ENABLE_ALL_SCC_MODULES') && !get_var('SCC_MODULES')) {
     if (sle_version_at_least('15')) {
-        my $addons = 'base,script,desktop,serverapp,phub,legacy,sdk,ha';
-        $addons .= ',we' if get_var('ARCH', '') =~ /x86_64|aarch64/;
+        my $addons = 'base,script,desktop,serverapp,legacy,sdk';
         set_var('SCC_ADDONS', $addons);
         set_var('PATTERNS',   'default,asmm,pcm');
     }

diff --git a/tests/installation/releasenotes.pm b/tests/installation/releasenotes.pm
@@ -14,6 +14,7 @@
 use base "y2logsstep";
 use strict;
 use testapi;
+use utils 'sle_version_at_least';
 
 sub run {
     assert_screen('release-notes-button', 5);
@@ -50,6 +51,11 @@ sub run {
     # no release-notes for WE and all modules
     my @no_relnotes = qw(we lgm asmm certm contm pcm tcm wsm hpcm ids idu phub);
 
+    # No release-notes for basic modules on SLE 15
+    if (sle_version_at_least('15') && check_var('DISTRI', 'sle')) {
+        push @no_relnotes, qw(base script desktop serverapp legacy sdk);
+    }
+
     # no relnotes for ltss in QAM_MINIMAL
     push @no_relnotes, qw(ltss) if get_var('QAM_MINIMAL');
     # no HA-GEO release-notes for s390x on SLE12-SP1 GM media, see bsc#1033504

diff --git a/tests/installation/welcome.pm b/tests/installation/welcome.pm
@@ -22,7 +22,7 @@ sub run {
     my ($self) = @_;
     my $iterations;
 
-    my @welcome_tags = ('inst-welcome-confirm-self-update-server', 'scc-invalid-url');
+    my @welcome_tags = ('inst-welcome-confirm-self-update-server', 'scc-invalid-url', 'no-product-found-on-scc');
     my $expect_beta_warn = get_var('BETA');
     if ($expect_beta_warn) {
         push @welcome_tags, 'inst-betawarning';
@@ -56,6 +56,11 @@ sub run {
             wait_screen_change { send_key $cmd{ok} };
             next;
         }
+        if (match_has_tag 'no-product-found-on-scc') {
+            record_soft_failure 'bsc#1058099';
+            wait_screen_change { send_key $cmd{ok} };
+            next;
+        }
     }
 
     # Process beta warning if expected
@@ -73,7 +78,7 @@ sub run {
         assert_screen('select-product');
         my %hotkey = (
             sles => 's',
-            sled => 'u'
+            sled => 'u',
         );
         my $product = get_required_var('SLE_PRODUCT');
         send_key 'alt-' . $hotkey{$product};