From f7f4889a35ba7b0fc02f5af64f00420bb8b59226 Mon Sep 17 00:00:00 2001 From: lpalovsky Date: Fri, 15 Nov 2024 08:38:02 +0100 Subject: [PATCH] SDAF remove gh#617 soft failure --- .../sap_deployment_automation_framework/deployment.pm | 7 ------- .../deploy_hanasr.pm | 10 ---------- 2 files changed, 17 deletions(-) diff --git a/lib/sles4sap/sap_deployment_automation_framework/deployment.pm b/lib/sles4sap/sap_deployment_automation_framework/deployment.pm index e730ee0a6210..d52161380ae5 100644 --- a/lib/sles4sap/sap_deployment_automation_framework/deployment.pm +++ b/lib/sles4sap/sap_deployment_automation_framework/deployment.pm @@ -574,13 +574,6 @@ sub prepare_sdaf_project { single_branch => 'yes', output_log_file => log_dir() . '/git_clone_templates.log'); - # Workaround for SDAF bug https://github.com/Azure/sap-automation/issues/617 - record_soft_failure 'gh#Azure/sap-automation#617'; - file_content_replace( - "$deployment_dir/sap-automation/deploy/terraform/terraform-units/modules/sap_landscape/providers.tf", - '>= 3.23' => '3.116.0' - ); - assert_script_run("cp -Rp sap-automation-samples/Terraform/WORKSPACES $deployment_dir/WORKSPACES"); # Ensure correct directories are in place my %vnet_codes = ( diff --git a/tests/sles4sap/sap_deployment_automation_framework/deploy_hanasr.pm b/tests/sles4sap/sap_deployment_automation_framework/deploy_hanasr.pm index 0cf340eb71bd..1f01ffdff354 100644 --- a/tests/sles4sap/sap_deployment_automation_framework/deploy_hanasr.pm +++ b/tests/sles4sap/sap_deployment_automation_framework/deploy_hanasr.pm @@ -74,16 +74,6 @@ sub run { az_login(); for my $playbook_options (@execute_playbooks) { - # Package 'fence-agents-azure-arm' is not yet installed by SDAF, therefore a workaround has to be applied - if ($playbook_options->{playbook_filename} eq 'playbook_04_00_00_db_install.yaml') { - record_soft_failure("bsc#1226671 - New package 'fence-agents-azure=arm' has to be installed to prevent HA setup failure"); - my @cmd = ('ansible', 'QES_DB', - "--private-key=$sdaf_config_root_dir/sshkey", - '--inventory=' . get_required_var('SAP_SID') . '_hosts.yaml', - '--module-name=shell', - '--args="sudo zypper in -y fence-agents-azure-arm"'); - assert_script_run(join(' ', @cmd)); - } $sles4sap::sap_deployment_automation_framework::basetest::serial_regexp_playbook = 1; sdaf_execute_playbook(%{$playbook_options}, sdaf_config_root_dir => $sdaf_config_root_dir); $sles4sap::sap_deployment_automation_framework::basetest::serial_regexp_playbook = 0;