Changeset 1903 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/VE.pm

Timestamp:

Oct 8, 2014, 1:35:10 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Add entries for osrepo for mageia/mandriva distros to allow setupve to work for these distributions without resorting to sbx2setupve
• pbkeep now managed in pb_temp_init to avoid removing the temps dir when debugging
• Add functions pb_ve_docker_get_image and pb_ve_get_type
• lots of interfaces changes to allow support of docker, including script names. May break other non docker features
• both newve and setupve work with docker now.
• manages public keys for urpmi distriutions
• Adds function pb_parallel_launchv. Now pb_launchv is single V

File:

• devel/pb-modules/lib/ProjectBuilder/VE.pm (modified) (8 diffs)

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

@@ -16 +16 @@
 use Carp 'confess';
 use English;
+use File::Basename;
 use ProjectBuilder::Version;
 use ProjectBuilder::Base;
@@ -31 +32 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_ve_launch pb_ve_snap);
+our @EXPORT = qw(pb_ve_launch pb_ve_snap pb_ve_get_type pb_ve_docker_repo pb_ve_docker_get_image);
 
 ($VERSION,$REVISION) = pb_version_init();
@@ -66 +67 @@
 sub pb_ve_launch {
 
-my $v = shift || undef;
-my $pbforce = shift || 0;       # By default do not rebuild VE
-my $locsnap = shift || 0;       # By default do not snap VE
-my $vetype = shift || undef;        # By default no image
-my $pbimage = shift || undef;       # By default no image
+my $v = shift;
+my $pbscript = shift;
+my $pbforce = shift;    
+my $pbstep= shift;          # Which step are we in (0: create, 1: setup, 2: build, 3: use)
+my $locsnap = shift;
+my $vetype = shift;
+my $pbimage = shift;
 
 my $dockerregistry = undef;
 my $docrepo = undef;            # By default no repository for docker available
 
+pb_log(2,"Entering pb_ve_launch at step $pbstep\n");
 # Get distro context
 my $pbos = pb_distro_get_context($v);
 
-# Get VE context
-if (not defined $vetype) {
-    my ($ptr) = pb_conf_get("vetype");
-    $vetype = $ptr->{$ENV{'PBPROJ'}};
-}
-confess "No vetype defined for $ENV{PBPROJ}" unless (defined $vetype);
-pb_log(1, "Using vetype $vetype for $ENV{PBPROJ}\n");
+$vetype = pb_ve_get_type($vetype);
 my ($vepath) = pb_conf_get("vepath");
 
@@ -114 +112 @@
     if ($EFFECTIVE_USER_ID != 0) {
         $sudocmd ="sudo ";
-    foreach my $proxy (qw/http_proxy ftp_proxy/) {
+        foreach my $proxy (qw/http_proxy ftp_proxy/) {
             if (defined $ENV{$proxy}) {
                 open(CMD,"sudo sh -c 'echo \$$proxy' |") or die "can't run sudo sh?: $!";
@@ -132 +130 @@
     if (((((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) && ($vetype ne "docker"))
         # For docker we may have a reference image that we'll use
-        || (((not defined $pbimage) || ($pbimage eq "")) && ($vetype eq "docker"))) {
+        || (($vetype eq "docker") && ($pbstep == 0))) {
 
         my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
@@ -275 +273 @@
         ((defined $vesnap->{$ENV{'PBPROJ'}}) && ($vesnap->{$ENV{'PBPROJ'}} =~ /true/i))) &&
         ($locsnap eq 1) &&
+        ($vetype ne "docker") &&
         (! -d "$root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}")) {
             my $cmd1 = pb_check_req("rm",0);
@@ -281 +280 @@
             pb_system("$sudocmd $cmd1 -rf $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'} ; $sudocmd $cmd2 -p $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'} ; $sudocmd $cmd3 xz  -C $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'} -f $root/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz","Extracting snapshot of $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz under $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}");
     }
-    
-    # Fix modes to allow access to the VE for pb user
-    my $command = pb_check_req("chmod",0);
-    pb_system("$sudocmd $command 755 $root/$pbos->{'name'} $root/$pbos->{'name'}/$pbos->{'version'} $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}","Fixing permissions");
+
+    if ($vetype ne "docker") {
+        # Fix modes to allow access to the VE for pb user
+        my $command = pb_check_req("chmod",0);
+        pb_system("$sudocmd $command 755 $root/$pbos->{'name'} $root/$pbos->{'name'}/$pbos->{'version'} $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}","Fixing permissions");
+    }
 
     # If docker, create the image and remove the now temp dir except if we had one already
-    if ($vetype eq "docker") {
-        if ((not defined $pbimage) || ($pbimage eq "")) {
-            # Snaphot the VE to serve as an input for docker
-            pb_ve_snap($pbos,$root);
-            # Create the docker image from the previous bootstrap
-            my $cmd1 = pb_check_req("docker",0);
-            $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}});
-            # Need sudo to be able to create all files correctly
-            pb_system("$sudocmd $cmd1 import - $docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} < $root/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz");
-            pb_system("$cmd1 push $docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}");
-        #} else {
-        }
+    if (($vetype eq "docker") && ($pbstep == 0)) {
+        $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}});
+        my $cmd1 = pb_check_req("docker",0);
+        # step 0 : nothing at creation -> tag n-v-a (made below)
+
+        # Snaphot the VE to serve as an input for docker
+        pb_ve_snap($pbos,$root);
+        # Create the docker image from the previous bootstrap
+        # Need sudo to be able to create all files correctly
+        # TODO: check before that the image doesn't already exist in the docker registry
+        my $pbimage = "$docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
+        pb_system("$sudocmd $cmd1 import - $pbimage < $root/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz");
+        pb_system("$cmd1 push $pbimage");
     }
 
@@ -376 +378 @@
 }
 
+sub pb_ve_docker_get_image {
+
+my $pbimage = shift || undef;
+my $found = 0;
+
+die "Unable to handle an undef docker image" if (not defined $pbimage);
+
+# Check that this docker image exists
+my $cmd1 = pb_check_req("docker",0);
+open(CMD, "$cmd1 images |") || die "Unable to get docker image list";
+my ($repo, $tag, $id, $dummy);
+while (<CMD>) {
+    ($repo, $tag, $id, $dummy) = split(/\s+/,$_,4);
+    $found = $id if ("$repo:$tag" eq $pbimage);
+}
+close(CMD);
+return($found);
+}
+sub pb_ve_get_type {
+
+my $vetype = shift || undef;
+
+# Get VE context
+if (not defined $vetype) {
+    my ($ptr) = pb_conf_get("vetype");
+    $vetype = $ptr->{$ENV{'PBPROJ'}};
+}
+confess "No vetype defined for $ENV{PBPROJ}" unless (defined $vetype);
+pb_log(1, "Using vetype $vetype for $ENV{PBPROJ}\n");
+return($vetype);
+}
+
+
 =head1 WEB SITES