Teradata

https://progress.opensuse.org/issues/131498
dzedro · Aug 31, 2023 · 94b7b13 · 94b7b13
1 parent 0f6be82
commit 94b7b13
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/data/autoyast_qam/15_installation.xml.ep b/data/autoyast_qam/15_installation.xml.ep
@@ -2,7 +2,12 @@
 <!DOCTYPE profile>
 <profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
   <suse_register>
+    % unless ($check_var->('FLAVOR', 'Server-DVD-Updates-TERADATA') or $check_var->('FLAVOR', 'Server-DVD-Incidents-TERADATA')) {
     <do_registration config:type="boolean">true</do_registration>
+    % }
+    % if ($check_var->('FLAVOR', 'Server-DVD-Updates-TERADATA') or $check_var->('FLAVOR', 'Server-DVD-Incidents-TERADATA')) {
+    <do_registration config:type="boolean">false</do_registration>
+    % }
     <email><%= $get_var->('SCC_EMAIL') %></email>
     <reg_code><%= $get_var->('SCC_REGCODE') %></reg_code>
     <install_updates config:type="boolean">true</install_updates>

diff --git a/lib/registration.pm b/lib/registration.pm
@@ -795,6 +795,8 @@ sub skip_registration {
     }
     elsif (match_has_tag('scc-skip-reg-warning-yes')) {
         send_key "alt-y";    # confirmed skip SCC registration
+        wait_still_screen;
+        send_key $cmd{next};
     }
 }
 

diff --git a/lib/version_utils.pm b/lib/version_utils.pm
@@ -578,7 +578,7 @@ sub is_using_system_role {
       && (install_this_version() || install_to_other_at_least('12-SP2'))
       || (is_sles4sap() && main_common::is_updates_test_repo())
       || is_sle('=15')
-      || (is_sle('>15') && (check_var('SCC_REGISTER', 'installation') || get_var('ADDONS') || get_var('ADDONURL')))
+      || (is_sle('>15') && (check_var('SCC_REGISTER', 'installation') || get_var('ADDONS') || get_var('ADDONURL') || get_var('FLAVOR') =~ /-TERADATA/))
       || (is_sle('15-SP2+') && check_var('FLAVOR', 'Full'))
       || (is_opensuse && !is_leap('<15.1'))    # Also on leap 15.1, TW, MicroOS
 }

diff --git a/products/sle/main.pm b/products/sle/main.pm
@@ -323,7 +323,7 @@ if (is_sle('15+') && !check_var('SCC_REGISTER', 'installation')) {
 # Always register at scc and use the test updates if the Flavor is -Updates.
 # This way we can reuse existant test suites without having to patch their
 # settings
-if (is_updates_test_repo && !get_var('MAINT_TEST_REPO')) {
+if (is_updates_test_repo && !get_var('MAINT_TEST_REPO') && get_var('FLAVOR') !~ /-TERADATA/) {
     my %incidents;
     $incidents{OS} = get_var('OS_TEST_REPOS', '');