- general build flags support

- test-build support (copy files to test_ftp_url, not ftp_url)

Changed files:
    PLD_Builder/config.py -> 1.13
    PLD_Builder/ftp.py -> 1.5
    PLD_Builder/request.py -> 1.13
    PLD_Builder/rpm_builder.py -> 1.7
    PLD_Builder/srpm_builder.py -> 1.14

diff --git a/PLD_Builder/config.py b/PLD_Builder/config.py
index e9d8551884b6b9356293d12f7839bd239a8c4352..eb7c002fe72d58830dfd6f8ffa9b3bb070691001 100644 (file)
--- a/PLD_Builder/config.py
+++ b/PLD_Builder/config.py
@@ -47,6 +47,7 @@ class Builder_Conf:
     self.email = get("email")
     self.buildlogs_url = get("buildlogs_url")
     self.ftp_url = get("ftp_url")
+    self.test_ftp_url = get("test_ftp_url")
     self.job_slots = int(get("job_slots"))
     self.max_load = float(get("max_load"))
     self.control_url = get("control_url")

diff --git a/PLD_Builder/ftp.py b/PLD_Builder/ftp.py
index 3812790d6423373ecc72707212a5b775ac1673e2..732d832fca0e9375aeb25ef05ff58fbecccfe732 100644 (file)
--- a/PLD_Builder/ftp.py
+++ b/PLD_Builder/ftp.py
@@ -9,12 +9,19 @@ from acl import acl
 
 class FTP_Queue:
   def __init__(self):
-    self.queue = []
+    self.queue = None
     self.some_failed = 0
 
+  def init(self, g):
+    self.queue = []
+    if "test-build" in g.flags:
+      self.url = config.test_ftp_url
+    else:
+      self.url = config.ftp_url
+    
   def add(self, file):
     # if /dev/null, say bye bye
-    if config.ftp_url == "/dev/null":
+    if self.url == "/dev/null":
       return
     name = os.path.basename(file)
     id = util.uuid()
@@ -24,7 +31,7 @@ class FTP_Queue:
   def flush(self):
     def desc(l):
       return "Target: %s/%s\nBuilder: %s\nTime: %d\nRequester: %s\nEND\n" % \
-                (config.ftp_url, l['name'], config.builder, time.time(), 
+                (self.url, l['name'], config.builder, time.time(), 
                  acl.current_user_login())
     
     for l in self.queue:
@@ -46,3 +53,6 @@ def flush():
   
 def kill():
   queue.kill()
+
+def init(r):
+  queue.init(r)

diff --git a/PLD_Builder/request.py b/PLD_Builder/request.py
index d0a4551a0a44363da399d0a0286075cabf380c98..5ec002d326595ff2ba9903980c7b1ed1eb57f64a 100644 (file)
--- a/PLD_Builder/request.py
+++ b/PLD_Builder/request.py
@@ -49,6 +49,7 @@ class Group:
     self.priority = 2
     self.time = time.time()
     self.requester = ""
+    self.flags = string.split(attr(e, "flags", ""))
     for c in e.childNodes:
       if is_blank(c): continue
       if c.nodeType != Element.ELEMENT_NODE:
@@ -80,6 +81,7 @@ class Group:
   def dump(self, f):
     f.write("group: %d (id=%s pri=%d)\n" % (self.no, self.id, self.priority))
     f.write("  from: %s\n" % self.requester)
+    f.write("  flags: %s\n" % string.join(self.flags))
     f.write("  time: %s\n" % time.asctime(time.localtime(self.time)))
     for b in self.batches:
       b.dump(f)
@@ -87,10 +89,10 @@ class Group:
 
   def write_to(self, f):
     f.write("""
-       <group id="%s" no="%d">
+       <group id="%s" no="%d" flags="%s">
          <requester>%s</requester>
          <time>%d</time>
-         <priority>%d</priority>\n""" % (self.id, self.no, 
+         <priority>%d</priority>\n""" % (self.id, self.no, string.join(self.flags),
                 escape(self.requester), self.time, self.priority))
     for b in self.batches:
       b.write_to(f)

diff --git a/PLD_Builder/rpm_builder.py b/PLD_Builder/rpm_builder.py
index 61104f8f20c47b1f1f54a8b38728811f8bc3bc6b..07ac91ac0c20ffa743b00348708a0b158bb299f9 100644 (file)
--- a/PLD_Builder/rpm_builder.py
+++ b/PLD_Builder/rpm_builder.py
@@ -90,6 +90,7 @@ def handle_request(r):
 
   r.build_all(build_rpm)
 
+  ftp.init(r)
   for b in r.batches:
     if not b.build_failed: 
       for f in b.files:

diff --git a/PLD_Builder/srpm_builder.py b/PLD_Builder/srpm_builder.py
index 54e846c785d4f89bac7655aaab134294dd1ddd00..74fdf8a18d876499695f41257c248f3b1d6cb5b2 100644 (file)
--- a/PLD_Builder/srpm_builder.py
+++ b/PLD_Builder/srpm_builder.py
@@ -41,6 +41,7 @@ def pick_request(q):
 def send_files(r):
   os.mkdir(path.srpms_dir + r.id)
   os.chmod(path.srpms_dir + r.id, 0755)
+  ftp.init(r)
   for batch in r.batches:
     if batch.build_failed: continue
     # export files from chroot