[Extras-cauldron-commits] r165 - in branches/buildme/1.5.1: debian tools tools/buildme.d

[ed_ at garage.maemo.org]

Author: ed_
Date: 2010-01-24 10:23:43 +0200 (Sun, 24 Jan 2010)
New Revision: 165

Modified:
   branches/buildme/1.5.1/debian/changelog
   branches/buildme/1.5.1/tools/buildme.conf
   branches/buildme/1.5.1/tools/buildme.conf.debug
   branches/buildme/1.5.1/tools/buildme.d/check_build
   branches/buildme/1.5.1/tools/buildme.d/setup_build
Log:
taken configs and buildme.d/ scripts from production 

Modified: branches/buildme/1.5.1/debian/changelog
===================================================================
--- branches/buildme/1.5.1/debian/changelog	2010-01-24 08:18:58 UTC (rev 164)
+++ branches/buildme/1.5.1/debian/changelog	2010-01-24 08:23:43 UTC (rev 165)
@@ -1,3 +1,9 @@
+buildme (1.5.1) unstable; urgency=low
+
+  * taken configs and buildme.d/ scripts from production 
+
+ -- Ed Bartosh <bartosh at gmail.com>  Sun, 24 Jan 2010 10:23:24 +0200
+
 buildme (1.5.0) unstable; urgency=low
 
   * implemented running script after function 

Modified: branches/buildme/1.5.1/tools/buildme.conf
===================================================================
--- branches/buildme/1.5.1/tools/buildme.conf	2010-01-24 08:18:58 UTC (rev 164)
+++ branches/buildme/1.5.1/tools/buildme.conf	2010-01-24 08:23:43 UTC (rev 165)
@@ -1,26 +1,30 @@
 [DEFAULT]
 subject_template = [%(product)s]: %(package)s %(version)s %(build_status)s
 builder_email = Maemo Extras Builder <extras-cauldron-builds at garage.maemo.org>
+#builder_email = Maemo Extras Builder <devnull at maemo.org>
 mail_list = Extras-cauldron builds <extras-cauldron-builds at garage.maemo.org>
-incoming_dir = /var/www/extras-devel/incoming-builder/%(product)s
-result_dir = /var/www/extras-devel/builder/%(product)s
+#mail_list = Extras-cauldron builds <devnull at maemo.org>
+incoming_dir = /mnt/incoming-builder/%(product)s
+result_dir = /mnt/builder/%(product)s
 targets = ("armel:maemo-%(product)s-armel-extras-devel", "i386:maemo-%(product)s-i386-extras-devel")
-repo_queue = /var/www/extras-devel/incoming/%(product)s/
+repo_queue = /mnt/incoming/extras-devel/%(product)s/
 gpg_key = 0xb11fff2f
 build_command = sbdmock -r %(target)s -u %(extraopts)s
 build_results = ("/scratchbox/users/%(user)s/home/%(user)s/%(target)s/result",)
 upload_timeout = 14400
 result_url = https://garage.maemo.org/builder/%(product)s/%(build_dir)s/
-src_repo = deb-src file:///var/www/extras-devel/ %(product)s free non-free
-allowed_categories = desktop development education games graphics multimedia navigation network office science social system utilities accessories communication other programming support themes tools
-destinations = ('builder1 at corsola.dmz:/home/builder1/', 'builder2 at corsola.dmz:/home/builder2/', 'builder3 at corsola.dmz:/home/builder3')
+src_repo = deb-src file:///mnt/extras-devel/ %(product)s free non-free
+allowed_categories = desktop development education games graphics multimedia navigation network office other science system utilities
+destinations = ('builder1 at builder1:/home/builder1/', 'builder2 at builder1:/home/builder2/', 'builder3 at builder1:/home/builder3/', 'builder4 at builder1:/home/builder4/', 'builder5 at builder1:/home/builder5/', 'builder6 at builder1:/home/builder6/', 'builder7 at builder1:/home/builder7/', 'builder8 at builder1:/home/builder8/')
 
+[fremantle]
+product = fremantle
+
 [chinook]
 product = chinook
+allowed_categories = accessories communication games multimedia office other programming support themes tools
 
 [diablo]
 product = diablo
 
-[fremantle]
-product = fremantle
 

Modified: branches/buildme/1.5.1/tools/buildme.conf.debug
===================================================================
--- branches/buildme/1.5.1/tools/buildme.conf.debug	2010-01-24 08:18:58 UTC (rev 164)
+++ branches/buildme/1.5.1/tools/buildme.conf.debug	2010-01-24 08:23:43 UTC (rev 165)
@@ -2,23 +2,26 @@
 subject_template = [%(product)s]: %(package)s %(version)s %(build_status)s
 builder_email = Maemo Extras Builder <extras-cauldron-builds at garage.maemo.org>
 mail_list = Extras-cauldron builds <bartosh at gmail.com>
-incoming_dir = /var/www/extras-devel/incoming-builder/.%(product)s
-result_dir = /var/www/extras-devel/builder/.%(product)s
+incoming_dir = /mnt/incoming-builder/.%(product)s
+result_dir = /mnt/builder/.%(product)s
 targets = ("armel:maemo-%(product)s-armel-extras-devel", "i386:maemo-%(product)s-i386-extras-devel")
-repo_queue = /var/www/extras-devel/incoming/.%(product)s/
+repo_queue = /mnt/incoming/extras-devel/.%(product)s/
 gpg_key = 0xb11fff2f
 build_command = sbdmock -r %(target)s -u %(extraopts)s
 build_results = ("/scratchbox/users/%(user)s/home/%(user)s/%(target)s/result",)
 upload_timeout = 14400
 result_url = https://garage.maemo.org/builder/%(product)s/%(build_dir)s/
-src_repo = deb-src file:///var/www/extras-devel/ %(product)s free non-free
-allowed_categories = desktop development education games graphics multimedia navigation network office science social system utilities accessories communication other programming support themes tools
+src_repo = deb-src file:///mnt/extras-devel/ %(product)s free non-free
+allowed_categories = desktop development education games graphics multimedia navigation network office other science system utilities
+destinations = ('builder1 at builder1:/home/builder1/', 'builder2 at builder1:/home/builder2/', 'builder3 at builder1:/home/builder3/', 'builder4 at builder1:/home/builder4/', 'builder5 at builder1:/home/builder5/', 'builder6 at builder1:/home/builder6/', 'builder7 at builder1:/home/builder7/', 'builder8 at builder1:/home/builder8/')
 
+[fremantle]
+product = fremantle
+
 [chinook]
 product = chinook
-destinations = ('builder1 at corsola.dmz:/home/builder1/', 'builder2 at corsola.dmz:/home/builder2/', 'builder3 at corsola.dmz:/home/builder3')
+allowed_categories = accessories communication games multimedia office other programming support themes tools
 
 [diablo]
 product = diablo
-destinations = ('builder1 at corsola.dmz:/home/builder1/', 'builder2 at corsola.dmz:/home/builder2/', 'builder3 at corsola.dmz:/home/builder3')
 

Modified: branches/buildme/1.5.1/tools/buildme.d/check_build
===================================================================
--- branches/buildme/1.5.1/tools/buildme.d/check_build	2010-01-24 08:18:58 UTC (rev 164)
+++ branches/buildme/1.5.1/tools/buildme.d/check_build	2010-01-24 08:23:43 UTC (rev 165)
@@ -1,11 +1,3 @@
-#!/usr/bin/python
-# vim: sw=4 ts=4 expandtab ai
+#!/bin/bash
 
-import sys
-import json
-
-env = json.read(sys.argv[1])
-print 'Check build:', env
-
-sys.exit(0)
-
+sudo -u gforge /usr/local/bin/packages/package-buildlog-parse.sh $1

Modified: branches/buildme/1.5.1/tools/buildme.d/setup_build
===================================================================
--- branches/buildme/1.5.1/tools/buildme.d/setup_build	2010-01-24 08:18:58 UTC (rev 164)
+++ branches/buildme/1.5.1/tools/buildme.d/setup_build	2010-01-24 08:23:43 UTC (rev 165)
@@ -1,11 +1,3 @@
-#!/usr/bin/python
-# vim: sw=4 ts=4 expandtab ai
+#!/bin/bash
 
-import sys
-import json
-
-env = json.read(sys.argv[1])
-print 'Setup build:', env
-
-sys.exit(0)
-
+sudo -u gforge /usr/local/bin/packages/package-buildlog-parse.sh $1