Add aggregate repos to ibsm modules

Related ticket: https://jira.suse.com/browse/TEAM-9981

Author: BillAnastasiadis

lib/qam.pm

@@ -20,7 +20,7 @@ use version_utils qw(is_sle is_transactional);
 our @EXPORT
   = qw(capture_state check_automounter is_patch_needed add_test_repositories disable_test_repositories enable_test_repositories
   add_extra_customer_repositories ssh_add_test_repositories remove_test_repositories advance_installer_window get_patches check_patch_variables add_repo_if_not_present
-  has_published_assets);
+  has_published_assets get_test_repos);
 use constant ZYPPER_PACKAGE_COL => 1;
 use constant OLD_ZYPPER_STATUS_COL => 4;
 use constant ZYPPER_STATUS_COL => 5;
@@ -249,4 +249,23 @@ sub has_published_assets {
     return scalar grep { m/^PUBLISH_/ } keys %bmwqemu::vars;
 }
 
+# Return list of all available repos
+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'
+    # These vars are set by qem-bot, e.g. 
+    # https://github.com/openSUSE/qem-bot/blob/ecb7acc8badccce85969e05f368455390b1ab6eb/openqabot/types/aggregate.py#L104
+    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;
+}
+
 1;

t/17_sles4sap.t

@@ -296,5 +296,4 @@ subtest '[download_hana_assets_from_server]' => sub {
     ok((any { /wget.*MY_DOWNLOAD_URL/ } @calls), 'wget call');
 };
 
-
 done_testing;

t/33_qam.t

@@ -0,0 +1,31 @@
+use strict;
+use warnings;
+use Test::More;
+use Test::Warnings;
+use Test::MockModule;
+use List::Util qw(any none);
+use testapi;
+use qam;
+
+sub undef_vars {
+    set_var($_, undef) for qw(
+        BALAMB_TEST_REPOS
+        WINHILL_TEST_REPOS
+    );
+}
+
+subtest '[get_test_repos]' => sub {
+    set_var('BALAMB_TEST_REPOS',  'Squall,Seifer');
+    set_var('WINHILL_TEST_REPOS', 'Quistis,Rinoa');
+
+    my $qam_mock = Test::MockModule->new('qam', no_auto => 1);
+    $qam_mock->redefine('set_var', sub { return; });
+
+    my @repos = $qam_mock->get_test_repos();
+
+    undef_vars();
+
+    ok( (any { /.*Squall.*/  } @repos), 'Got "Squall" from BALAMB_TEST_REPOS' );
+};
+
+done_testing;

tests/publiccloud/validate_repos.pm

@@ -13,6 +13,7 @@ use warnings;
 use testapi;
 use strict;
 use utils;
+use qam;
 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 = 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 qam;
 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 = get_test_repos();
     my $count = 0;
     my @zypper_cmd;