Adds support for SAPHanaSR-angi package in public cloud variables (#2…

…0794) * Add support of SAPHana-SR for Pb Cloud tests * Move of the variables propagation
os-autoinst · Dec 12, 2024 · c331cf0 · c331cf0
1 parent 5ec1ea2
commit c331cf0
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 0 deletions.
diff --git a/data/sles4sap/qe_sap_deployment/qesap_aws.yaml b/data/sles4sap/qe_sap_deployment/qesap_aws.yaml
@@ -34,6 +34,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - %REGISTRATION_PLAYBOOK%.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' -e use_suseconnect=%SUSECONNECT%
     - fully-patch-system.yaml

diff --git a/data/sles4sap/qe_sap_deployment/qesap_aws_fencing.yaml b/data/sles4sap/qe_sap_deployment/qesap_aws_fencing.yaml
@@ -37,6 +37,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - %REGISTRATION_PLAYBOOK%.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com'
     - fully-patch-system.yaml

diff --git a/data/sles4sap/qe_sap_deployment/qesap_aws_sapconf.yaml b/data/sles4sap/qe_sap_deployment/qesap_aws_sapconf.yaml
@@ -34,6 +34,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - %REGISTRATION_PLAYBOOK%.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com'
     - fully-patch-system.yaml

diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure.yaml
@@ -33,6 +33,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - %REGISTRATION_PLAYBOOK%.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com'
     - fully-patch-system.yaml

diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure_fencing_msi.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure_fencing_msi.yaml
@@ -36,6 +36,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - %REGISTRATION_PLAYBOOK%.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com'
     - fully-patch-system.yaml

diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure_fencing_spn.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure_fencing_spn.yaml
@@ -36,6 +36,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - %REGISTRATION_PLAYBOOK%.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com'
     - fully-patch-system.yaml

diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure_ltss.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure_ltss.yaml
@@ -33,6 +33,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - %REGISTRATION_PLAYBOOK%.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' -e sles_modules='[{"key":"%SCC_LTSS_MODULE%","value":"%SCC_LTSS_REGCODE%"}]'
     - fully-patch-system.yaml

diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure_roles.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure_roles.yaml
@@ -33,6 +33,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - registration_role.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com'
     - fully-patch-system.yaml

diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure_sapconf.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure_sapconf.yaml
@@ -31,6 +31,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - %REGISTRATION_PLAYBOOK%.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com'
     - fully-patch-system.yaml

diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure_sapconf_no_reg.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure_sapconf_no_reg.yaml
@@ -30,6 +30,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - fully-patch-system.yaml
     - pre-cluster.yaml

diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure_uri.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure_uri.yaml
@@ -31,6 +31,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - %REGISTRATION_PLAYBOOK%.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' -e use_suseconnect=%SUSECONNECT%
     - fully-patch-system.yaml

diff --git a/data/sles4sap/qe_sap_deployment/qesap_gcp.yaml b/data/sles4sap/qe_sap_deployment/qesap_gcp.yaml
@@ -36,6 +36,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - %REGISTRATION_PLAYBOOK%.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com'
     - fully-patch-system.yaml

diff --git a/data/sles4sap/qe_sap_deployment/qesap_gcp_fencing.yaml b/data/sles4sap/qe_sap_deployment/qesap_gcp_fencing.yaml
@@ -38,6 +38,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - %REGISTRATION_PLAYBOOK%.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com'
     - fully-patch-system.yaml

diff --git a/data/sles4sap/qe_sap_deployment/qesap_gcp_sapconf.yaml b/data/sles4sap/qe_sap_deployment/qesap_gcp_sapconf.yaml
@@ -36,6 +36,7 @@ ansible:
     sap_domain: 'qe-test.example.com'
     primary_site: 'goofy'
     secondary_site: 'miky'
+    use_sap_hana_sr_angi: '%USE_SR_ANGI%'
   create:
     - %REGISTRATION_PLAYBOOK%.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com'
     - fully-patch-system.yaml

diff --git a/lib/sles4sap_publiccloud.pm b/lib/sles4sap_publiccloud.pm
@@ -1068,6 +1068,7 @@ sub create_hana_vars_section {
         $hana_vars{sap_hana_install_sid} = get_required_var('INSTANCE_SID');
         $hana_vars{sap_hana_install_instance_number} = get_required_var('INSTANCE_ID');
         $hana_vars{sap_domain} = get_var('SAP_DOMAIN', 'qesap.example.com');
+        $hana_vars{use_sap_hana_sr_angi} = get_var('USE_SAP_HANA_SR_ANGI', 'false');
         $hana_vars{primary_site} = $hana_sites[0];
         $hana_vars{secondary_site} = $hana_sites[1];
         set_var('SAP_SIDADM', lc(get_var('INSTANCE_SID') . 'adm'));

diff --git a/tests/sles4sap/qesapdeployment/configure.pm b/tests/sles4sap/qesapdeployment/configure.pm
@@ -43,6 +43,7 @@ sub run {
     $variables{OS_OWNER} = get_var('QESAPDEPLOY_CLUSTER_OS_OWNER', 'amazon') if check_var('PUBLIC_CLOUD_PROVIDER', 'EC2');
 
     $variables{USE_SAPCONF} = get_var('QESAPDEPLOY_USE_SAPCONF', 'false');
+    $variables{USE_SR_ANGI} = get_var('USE_SAP_HANA_SR_ANGI', 'false');
     $variables{SLES4SAP_PUBSSHKEY} = get_ssh_private_key_path() . '.pub';
     $variables{REGISTRATION_PLAYBOOK} = get_var('QESAPDEPLOY_REGISTRATION_PLAYBOOK', 'registration');
     $variables{REGISTRATION_PLAYBOOK} =~ s/\.yaml$//;