extras-buildsys/www builders.psp,1.7,1.8 job.psp,1.10,1.11

Daniel Williams (dcbw) fedora-extras-commits at redhat.com
Thu Aug 25 18:15:16 UTC 2005


Author: dcbw

Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3976/www

Modified Files:
	builders.psp job.psp 
Log Message:
2005-08-25  Dan Williams <dcbw at redhat.com>

    * Initial commit of reworked stuff:
        - Each target gets separate config files on builder
            and server
        - Builders now run multiple jobs per builder instance
        - Config files now ConfigParser based
        - Target specifications are richer and require distro,
            target, and repo names
        - Builder's supported arches are autodetermined
        - Various database fields renamed and/or removed

    IT DOESN'T WORK YET




Index: builders.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- builders.psp	11 Aug 2005 19:32:38 -0000	1.7
+++ builders.psp	25 Aug 2005 18:15:14 -0000	1.8
@@ -50,7 +50,7 @@
         <tr>
             <td class="builderaddr-side"></td>
             <td class="builderaddr" align="left">
-                <font class="builderaddr" <%=unavail_color%>><%=builder['address']%>:<%=builder['port']%>  (<%=builder['status']%>)<br>
+                <font class="builderaddr" <%=unavail_color%>><%=builder['address']%>  (<%=builder['status']%>)<br>
                 <font class="builderarches"><%=arch_list%></font>
             </td>
             <td class="builderaddr-side"></td>
@@ -64,7 +64,7 @@
                 # Only show actually building archjobs
                 if aj['status'] == 'downloading' or aj['status'] == 'downloaded':
                     continue
-                if aj['builder_addr'] == builder['address'] and aj['builder_port'] == builder['port']:
+                if aj['builder_addr'] == builder['address']:
                     joblink = job_link(job['uid'])
                     if aj['status'] != 'done':
 %>


Index: job.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- job.psp	11 Aug 2005 19:32:38 -0000	1.10
+++ job.psp	25 Aug 2005 18:15:14 -0000	1.11
@@ -92,7 +92,7 @@
                     <tr>
                         <td width="2%" class="archjobs"></td>
                         <td width="5%" class="archjobs" align="right"><font class="archjobtag"><%=aj['arch']%>:</font></td>
-                        <td width="33%" class="archjobs" align="left"><font class="archjob"><%=aj['builder_addr']%>:<%=aj['builder_port']%></font></td>
+                        <td width="33%" class="archjobs" align="left"><font class="archjob"><%=aj['builder_addr']%></font></td>
                         <td width="30%" class="archjobs">
                             <font class="archjobtag">Status:</font>
                             <font class="archjob"> <%=aj['status']%>/<%=aj['builder_status']%></font>




More information about the fedora-extras-commits mailing list