Add aggregate repos to ibsm modules

Author: BillAnastasiadis

lib/sles4sap.pm

@@ -13,6 +13,7 @@ use Mojo::Base 'opensusebasetest';
 use strict;
 use warnings;
 use testapi;
+use bmwqemu ();
 use serial_terminal qw(select_serial_terminal);
 use utils;
 use hacluster qw(get_hostname ha_export_logs pre_run_hook save_state wait_until_resources_started script_output_retry_check);
@@ -72,6 +73,7 @@ our @EXPORT = qw(
   load_ase_env
   upload_ase_logs
   modify_selinux_setenforce
+  get_test_repos
 );
 
 =head1 SYNOPSIS
@@ -1452,6 +1454,28 @@ sub modify_selinux_setenforce {
     }
 }
 
+=head2 get_test_repos
+
+    Constructs an array of repos to be added to SUTs.
+
+=cut
+
+sub get_test_repos {
+    # In Incidents there is INCIDENT_REPO instead of MAINT_TEST_REPO
+    # Those two variables contain list of repositories separated by comma
+    set_var('MAINT_TEST_REPO', get_var('INCIDENT_REPO')) if get_var('INCIDENT_REPO');
+    my @repos = split(/,/, get_var('MAINT_TEST_REPO'));
+    # Add aggregate repos to @repos, if they are provided
+    # Test repos are expected to end in '_TEST_REPOS'
+    my @test_repos = grep { /_TEST_REPOS$/ } keys %bmwqemu::vars;
+    for my $repo (@test_repos) {
+        if (my $value = get_var($repo)) {
+            push @repos, split(/,/, $value);
+        }
+    }
+    return @repos;
+}
+
 sub post_run_hook {
     my ($self) = @_;
 

t/17_sles4sap.t

@@ -19,7 +19,9 @@ sub undef_vars {
       _SECRET_SAP_MASTER_PASSWORD
       ASCS_PRODUCT_ID
       INSTANCE_ID
-      ASSET_0);
+      ASSET_0
+      BALAMB_TEST_REPOS
+      WINHILL_TEST_REPOS);
 }
 
 subtest '[prepare_swpm]' => sub {
@@ -296,5 +298,20 @@ subtest '[download_hana_assets_from_server]' => sub {
     ok((any { /wget.*MY_DOWNLOAD_URL/ } @calls), 'wget call');
 };
 
+subtest '[get_test_repos]' => sub {
+    my $mockObject = sles4sap->new();
+    my $sles4sap = Test::MockModule->new('sles4sap', no_auto => 1);
+
+    set_var('BALAMB_TEST_REPOS', 'Squall,Seifer');
+    set_var('WINHILL_TEST_REPOS', 'Quistis,Rinoa');
+    $sles4sap->redefine(set_var => sub { return; });
+
+    my @repos = $mockObject->get_test_repos();
+    undef_vars();
+
+    ok((any { /.*Squall.*/ } @repos), 'Returns the correct variable from the first repo');
+    ok((any { /.*Quistis.*/ } @repos), 'Returns the correct variable from the second repo');
+};
+
 
 done_testing;

tests/publiccloud/validate_repos.pm

@@ -13,6 +13,7 @@ use warnings;
 use testapi;
 use strict;
 use utils;
+use sles4sap;
 use publiccloud::ssh_interactive "select_host_console";
 use publiccloud::utils "validate_repo";
 
@@ -25,10 +26,7 @@ sub run {
         record_info('Skip validation', 'Skipping maintenance update validation (triggered by setting)');
         return;
     } else {
-        # In Incidents there is INCIDENT_REPO instead of MAINT_TEST_REPO
-        # Those two variables contain list of repositories separated by comma
-        set_var('MAINT_TEST_REPO', get_var('INCIDENT_REPO')) unless get_var('MAINT_TEST_REPO');
-        my @repos = split(/,/, get_var('MAINT_TEST_REPO'));
+        my @repos = sles4sap::get_test_repos();
         # Failsafe: Fail if there are no test repositories, otherwise we have the wrong template link
         my $count = scalar @repos;
         my $check_empty_repos = get_var('PUBLIC_CLOUD_IGNORE_EMPTY_REPO', 0) == 0;

tests/sles4sap/publiccloud/cluster_add_repos.pm

@@ -8,6 +8,7 @@ use strict;
 use warnings;
 use base 'sles4sap_publiccloud_basetest';
 use sles4sap_publiccloud;
+use sles4sap;
 use testapi;
 
 sub test_flags {
@@ -17,9 +18,7 @@ sub test_flags {
 sub run {
     my ($self, $run_args) = @_;
     $self->import_context($run_args);
-
-    set_var('MAINT_TEST_REPO', get_var('INCIDENT_REPO')) if get_var('INCIDENT_REPO');
-    my @repos = split(/,/, get_var('MAINT_TEST_REPO'));
+    my @repos = sles4sap::get_test_repos();
     my $count = 0;
     my @zypper_cmd;