Changeset 1900 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Sep 30, 2014, 10:08:03 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Add support for docker phase 1: newve working
• Add separate pb_ve_snap function
• Add separate pb_ve_docker functions to interact with the registry and the repository
• Add a dockerregistry conf parameter

File:

• devel/pb/bin/pb (modified) (13 diffs)

devel/pb/bin/pb

@@ -62 +62 @@
 my $pbport;                 # Port to use to connect to the VM/RM
 my $newver;                 # New version to create
-my $iso = undef;            # ISO image for the VM to create
+my $pbimage = undef;            # ISO image for the VM to create or docker image for the VE
+my $vetype = undef;         # Type of Virtual environment to deal with
 
 my @date = pb_get_date();
@@ -85 +86 @@
 =head1 SYNOPSIS
 
-pb [-vhSq][-r pbroot][-p project][[-s script -a account -P port][-t [os-ver-arch]][-m os-ver-arch[,...]]][-g][-i iso] <action> [<pkg1> ...]
-
-pb [--verbose][--help][--man][--quiet][--snapshot][--revision pbroot][--project project][[--script script --account account --port port][--target [os-ver-arch]][--machine os-ver-arch[,...]]][--nographic][--iso iso][--rebuild] <action> [<pkg1> ...]
+pb [-vhSq][-r pbroot][-p project][[-s script -a account -P port][-T VEtype][-t [os-ver-arch]][-m os-ver-arch[,...]]][-g][-i image] <action> [<pkg1> ...]
+
+pb [--verbose][--help][--man][--quiet][--snapshot][--revision pbroot][--project project][[--script script --account account --port port][-T VEtype][--target [os-ver-arch]][--machine os-ver-arch[,...]]][--nographic][--image image][--rebuild] <action> [<pkg1> ...]
 
 =head1 OPTIONS
@@ -124 +125 @@
 All if none precised (or use the env variable PBV).
 
+=item B<-T|--vetype VEtype]>
+
+Type of Virtual Environments (VE)
+Can be chroot or docker.
+
 =item B<-s|--script script>
 
@@ -132 +138 @@
 Do not launch VMs in graphical mode.
 
-=item B<-i|--iso iso_image>
-
-Name of the ISO image of the distribution you want to install on the related VMs.
+=item B<-i|--image image>
+
+It could be either:
+- The name of the ISO image of the distribution you want to install on the related VMs
+- The name of the docker image of the distribution you want to install on the related VEs
+
 
 =item B<-a|--account account>
@@ -670 +679 @@
 
 GetOptions("help|?|h+" => \$opts{'h'}, 
+        "account|a=s" => \$opts{'a'},
+        "force|f" => \$opts{'f'},
+        "nographic|g" => \$opts{'g'},
+        "image|i=s" => \$opts{'i'},
+        "log-files|l=s" => \$opts{'l'},
+        "machines|mock|m=s" => \$opts{'m'},
         "man" => \$opts{'man'},
-        "verbose|v+" => \$opts{'v'},
-        "snapshot|S" => \$opts{'S'},
-        "quiet|q" => \$opts{'q'},
-        "log-files|l=s" => \$opts{'l'},
-        "force|f" => \$opts{'f'},
-        "account|a=s" => \$opts{'a'},
-        "revision|r=s" => \$opts{'r'},
-        "script|s=s" => \$opts{'s'},
-        "machines|mock|m=s" => \$opts{'m'},
-        "target|t:s" => \$opts{'t'},
-        "nographic|g" => \$opts{'g'},
         "port|P=i" => \$opts{'P'},
         "project|p=s" => \$opts{'p'},
+        "quiet|q" => \$opts{'q'},
+        "revision|r=s" => \$opts{'r'},
         "rebuild" => \$opts{'rebuild'},
-        "iso|i=s" => \$opts{'i'},
+        "snapshot|S" => \$opts{'S'},
+        "script|s=s" => \$opts{'s'},
+        "type|T:s" => \$opts{'T'},
+        "target|t:s" => \$opts{'t'},
         "version|V=s" => \$opts{'V'},
+        "verbose|v+" => \$opts{'v'},
         "keep|k" => \$opts{'k'},
         "stop-on-error!" => \$Global::pb_stop_on_error,
@@ -743 +753 @@
 }
 if (defined $opts{'i'}) {
-    $iso = $opts{'i'};
+    $pbimage = $opts{'i'};
 }
 if (defined $opts{'t'}) {
     $pbtarget = $opts{'t'};
+}
+if (defined $opts{'T'}) {
+    $vetype = $opts{'T'};
 }
 
@@ -2353 +2366 @@
     my ($shcmd,$shcmdroot,$cpcmd,$cptarget,$cp2target);
     my $tpdir;
+    my $tp;
     if ($cmt =~ /^VE/) {
-        my $tp = pb_path_expand($vepath->{$ENV{'PBPROJ'}});
+        $tp = pb_path_expand($vepath->{$ENV{'PBPROJ'}});
         $tpdir = pb_path_expand("$tp/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}");
-        my ($ptr) = pb_conf_get("vetype");
-        my $vetype = $ptr->{$ENV{'PBPROJ'}};
+        if (not defined $vetype) {
+            my ($ptr) = pb_conf_get("vetype");
+            $vetype = $ptr->{$ENV{'PBPROJ'}};
+        }
         my $arch = pb_get_arch();
         if ($vetype eq "chroot") {
@@ -2364 +2380 @@
         } elsif ($vetype eq "schroot") {
             $shcmd = "schroot $tp -u $mac -- ";
+        } elsif ($vetype eq "docker") {
+            # docker manages the storage so rely on it
+            $shcmdroot = "sudo /usr/bin/docker $tpdir ";
+            $shcmd = "$shcmdroot /bin/su - $mac -c ";
         }
         $shcmd = "setarch i386 $shcmd" if (($pbos->{'arch'} =~ /i[3456]86/) && ($arch eq 'x86_64'));
@@ -2533 +2553 @@
     }
     if (($cmt =~ /^VE/) && ($snapme != 0)) {
-        my $tpdir = "$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}";
-        pb_system("sudo tar cz -C $tpdir -f $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz .","Creating a snapshot of $tpdir");
+        pb_ve_snap($pbos,$tp);
     }
 }
@@ -2617 +2636 @@
     # Launch the VMs/VEs
     if ($vtype eq "vm") {
-        die "-i iso parameter needed" if (((not defined $iso) || ($iso eq "")) && ($create != 0));
+        die "-i image parameter needed" if (((not defined $pbimage) || ($pbimage eq "")) && ($create != 0));
 
         my ($ptr,$ptr2,$vmpath,$vmport,$vms) = pb_conf_get("vmtype","vmcmd","vmpath","vmport","vmsize");
@@ -2683 +2702 @@
         if (($vmtype eq "qemu") || ($vmtype eq "kvm")) {
             $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$v.qemu";
-            if (($create != 0) || (defined $iso)) {
-                $ENV{'PBVMOPT'} .= " -cdrom $iso -boot d";
+            if (($create != 0) || (defined $pbimage)) {
+                $ENV{'PBVMOPT'} .= " -cdrom $pbimage -boot d";
             }
             # Always redirect the network and always try to use a 'pb' snapshot
@@ -2746 +2765 @@
     } elsif ($vtype eq "ve") {
         # Force the creation of the VE and no snapshot usable
-        pb_ve_launch($v,$create,$usesnap);
+        pb_ve_launch($v,$create,$usesnap,$vetype,$pbimage);
     } else {
         # RM here
@@ -3504 +3523 @@
             # And shouldn't we be getting the one that matches the current pb version?
             # For the moment, just take the latest stable one
-            $cmdget = "wget --passive-ftp ftp://ftp.project-builder.org/src/ProjectBuilder-latest.tar.gz; wget --passive-ftp ftp://ftp.project-builder.org/src/project-builder-latest.tar.gz";
+            my $wget = pb_check_req("wget",0);
+            $cmdget = "$wget --passive-ftp ftp://ftp.project-builder.org/src/ProjectBuilder-latest.tar.gz; $wget --passive-ftp ftp://ftp.project-builder.org/src/project-builder-latest.tar.gz";
         }
         print SCRIPT << 'EOF';