Merge pull request #20308 from hjluo/remove_bsc1206132

Remove soft-failure bsc#1206132

lib/YaST/workarounds.pm

@@ -14,7 +14,6 @@ use Config::Tiny;
 
 our @EXPORT = qw(
   apply_workaround_poo124652
-  apply_workaround_bsc1206132
 );
 
 =head1 Workarounds for known issues
@@ -53,28 +52,4 @@ sub apply_workaround_poo124652 {
     }
 }
 
-=head2 apply_workaround_bsc1206132 ():
-
-Workaround for the iscsi return code issue.
-
-Records a soft failure with a reference to bsc#1206132
-
-Changes the iscsid service file to require and start after the iscsid socket.
-Then reloads systemd, in order to scan for the changed unit.
-
-=cut
-
-sub apply_workaround_bsc1206132 {
-    record_soft_failure('bsc#1206132 - iscsid Socket start failed after yast iscsi-client configuration, lead yast iscsi-client finish with error code');
-    my $service_unit = '/usr/lib/systemd/system/iscsid.service';
-    my $Config = Config::Tiny->new;
-    $Config = Config::Tiny->read_string(script_output("cat $service_unit"));
-    # change the two values in [Unit] section of the service file, as specified in bsc#1206132
-    $Config->{Unit}->{Requires} = 'iscsid.socket';
-    $Config->{Unit}->{After} = 'iscsid.socket';
-    my $str = $Config->write_string();
-    assert_script_run("echo \"$str\" > $service_unit");
-    systemctl('daemon-reload');
-}
-
 1;

tests/iscsi/iscsi_client.pm

@@ -111,7 +111,6 @@ sub run {
     zypper_call("in open-iscsi yast2-iscsi-client");
     mutex_wait('iscsi_target_ready', undef, 'Target configuration in progress!');
     record_info 'Target Ready!', 'iSCSI target is configured, start initiator configuration';
-    apply_workaround_bsc1206132() if (is_sle('=15-SP3'));
     my $module_name = y2_module_guitest::launch_yast2_module_x11('iscsi-client', target_match => 'iscsi-client');
     initiator_service_tab;
     initiator_discovered_targets_tab;