Changeset 2426 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

Sep 1, 2019, 3:18:34 AM (5 years ago)

Author:

Bruno Cornec

Message:

Start adding install and test target for pb - local install works already

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -69 +69 @@
 =over 4
 
-=item B<pb_distro_conffile>
-
-This function returns the mandatory configuration file used for distribution/OS detection
+=item B<pb_distro_api>
+
+This function returns the mandatory configuration file used for api
 
 =cut
@@ -605 +605 @@
 
 pb_log(3, "INFO: Adding osrepo from config file\n");
-return(pb_distro_setuprepo_gen_conf($pbos,pb_distro_conffile(),"osrepo"));
+my %h;
+my $h = \%h;
+# Adds conf file for availability of conf elements either from the local build env or from a VE/VM/RM in which the conf file has been passed
+$h = pb_conf_cache(pb_distro_conffile(),$h);
+my ($osrepo) = pb_conf_get_in_hash_if($h,"osrepo");
+return(pb_distro_setuprepo_gen($pbos,$osrepo->{$ENV{'PBPROJ'}}));
 }
 
 =item B<pb_distro_setuprepo>
 
-This function sets up potential additional repository to the build environment
+This function sets up potential additional repository to the build/install/test environment
 
 =cut
@@ -617 +622 @@
 
 my $pbos = shift;
-
-pb_log(3, "INFO: Adding addrepo from config file\n");
-return(pb_distro_setuprepo_gen_conf($pbos,"$ENV{'PBDESTDIR'}/pbrc.yml","addrepo"));
-}
-=item B<pb_distro_setuprepo_gen_conf>
-
-This function sets up in a generic way potential additional repository using conf files
-
-=cut
-
-sub pb_distro_setuprepo_gen_conf {
-
-my $pbos = shift;
-my $pbconf = shift;
-my $pbkey = shift;
-
-return undef if (not defined $pbconf);
-return undef if (not defined $pbkey);
-my ($addrepo) = pb_conf_read($pbconf,$pbkey);
-return undef if (not defined $addrepo);
-
-my $param = pb_distro_get_param($pbos,$addrepo);
-return undef if ($param eq "");
-
-pb_log(1, "INFO: Adding repos $param\n");
-return(pb_distro_setuprepo_gen($pbos,$param));
-}
-
+my $repotype = shift;
+
+my %h;
+my $h = \%h;
+# Adds conf file for availability of conf elements either from the local build env or from a VE/VM/RM in which the conf file has been passed
+$h = pb_conf_cache("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml",$h) if ((defined $ENV{'PBROOTDIR'}) && (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml"));
+$h = pb_conf_cache("$ENV{'PBDESTDIR'}/pbrc.yml",$h) if ((defined $ENV{'PBDESTDIR'}) && (-f "$ENV{'PBDESTDIR'}/pbrc.yml"));
+
+pb_log(3, "INFO: Adding addrepo from config file for $repotype\n");
+if ($repotype =~ /install/) {
+    # Give a probable default if nothing is provided to avoid overloading conf files
+    #
+    my ($addrepo) = pb_conf_get_in_hash_if($h,"addinstallrepo");
+    if ((not defined $addrepo) || (not defined $addrepo->{$ENV{'PBPROJ'}})) {
+        my ($pbrepo) = pb_conf_get_in_hash_if($h,"pbrepo");
+        return undef if (not defined $pbrepo);
+        my $url = "$pbrepo->{$ENV{'PBPROJ'}}";
+        my ($testver,$delivery) = pb_conf_get_in_hash_if($h,"testver","delivery");
+        $delivery->{$ENV{'PBPROJ'}} = "" if (not defined $delivery->{$ENV{'PBPROJ'}});
+        $url .= "/$delivery->{$ENV{'PBPROJ'}}/";
+        my $repotag = "";
+        $repotag = "-$delivery->{$ENV{'PBPROJ'}}" if ($delivery->{$ENV{'PBPROJ'}} ne "");
+        $url .= "/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/$ENV{PBPROJ}$repotag.";
+        my $ext = "";
+        if ($pbos->{'type'} eq "rpm") {
+            $ext = "repo";
+            if ($pbos->{'family'} eq "md") {
+                $ext = "addmedia";
+            }
+        } elsif ($pbos->{'type'} eq "deb") {
+            $ext = ".sources.list";
+        }
+        $url .= $ext;
+        return(pb_distro_setuprepo_gen($pbos,$url));
+    } else {
+        my ($addrepo) = pb_conf_get_in_hash_if($h,"addinstallrepo");
+        return(pb_distro_setuprepo_gen($pbos,$addrepo->{$ENV{'PBPROJ'}}));
+    }
+} else {
+    my ($addrepo) = pb_conf_get_in_hash_if($h,"add".$repotype."repo");
+    return(pb_distro_setuprepo_gen($pbos,$addrepo->{$ENV{'PBPROJ'}}));
+}
+}
 
 =item B<pb_distro_setuprepo_gen>