Changeset 2079 in ProjectBuilder

Timestamp:

Apr 28, 2016, 8:05:40 PM (8 years ago)

Author:

Bruno Cornec

Message:

Add support for pbr for python project such as python-redfish
Update demo
More API tests added

Location:

devel

Files:

• pb-doc/pb-demo (modified) (1 diff)
• pb-modules/etc/pb.conf.pod (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/VCS.pm (modified) (1 diff)
• pb-server/api.json (modified) (2 diffs)

devel/pb-doc/pb-demo

@@ -57 +57 @@
 # Mount the external HDD if needed
 sudo mount /dev/sdc1 /mnt
-$ sudo mount -o bind /run/media/bruno/pb+docker/docker /var/cache/docker
+$ sudo mount -o bind /mnt/docker /var/cache/docker
 # Then restart docker to avoid errors with Attempt to write a readonly database
 $ sudo systemctl restart docker

devel/pb-modules/etc/pb.conf.pod

@@ -560 +560 @@
  Example: pbpassphrase pb = TheSecretPassPhrase
 
+=item B<pbpbr>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: whatever. As soon as this is defined, then that project is known as using pbr for source epansion.
+ Conffile: project
+ Example: pbpbr python-redfish = 1
+
 =item B<pbprojdir>
 

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

@@ -206 +206 @@
             }
             $source = pb_vcs_mod_htftp($source,"git");
-            pb_system("cd $source ; stid=`$vcscmd stash create` ; $vcscmd archive --format=tar \$\{stid:=HEAD\} | (mkdir $tmp && cd $tmp && tar xf -)","Exporting current $source from GIT to $tmp ");
+            my ($pbpbr) = pb_conf_get_if("pbpbr");
+            if ((defined $pbpbr) && (defined $pbpbr->{$ENV{'PBPROJ'}})) {
+                # The project use pbr so benefit from it to export data
+                pb_system("cd $source ; mkdir $tmp ; python setup.py sdist --keep-temp --dist-dir $tmp ; cd $tmp ; file=`ls *.tar.gz` ; tar xfz \$file ; dir=`tar tvfz \$file | head -1 | awk '{print \$6}'` ; if [ ! -d \$dir ] || [ \$dir = / ]; then exit -1 ; fi ; mv \$dir/* \$dir/.??* . ; rmdir \$dir ; rm -f \$file ; ls -al ","Exporting current $source from GIT with pbr to $tmp ");
+            } else {
+                # no pbr do it ourselves
+                pb_system("cd $source ; stid=`$vcscmd stash create` ; $vcscmd archive --format=tar \$\{stid:=HEAD\} | (mkdir $tmp && cd $tmp && tar xf -)","Exporting current $source from GIT to $tmp ");
+            }
         } else {
             $uri = pb_vcs_mod_htftp($uri,"git");

devel/pb-server/api.json

@@ -8 +8 @@
   "basePath": "/v1",
   "paths": {
+    "/prj": {
+      "get": {
+        "operationId": "listPrj",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "items": { "$ref": "#/definitions/Entry" }
+            }
+          },
+          "default": {
+            "description": "Error.",
+            "schema": { "$ref": "http://git.io/vcKD4#" }
+          }
+        }
+      }
+    }    
     "/conf": {
       "get": {
@@ -94 +113 @@
       "required": true,
       "type": "integer",
-      "description": "A blog id"
+      "description": "A conf id"
     }
   },