fix d-i build job types. (and i'm aware there is bin/d-i_builds.sh too...)

3 files changed, 66 insertions, 9 deletions

diff --git a/bin/d-i_build.sh b/bin/d-i_build.sh
new file mode 100755
index 00000000..73e39b27
--- /dev/null
+++ b/bin/d-i_build.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# Copyright 2012 Holger Levsen <holger@layer-acht.org>
+# released under the GPLv=2
+
+#
+# default settings
+#
+set -x
+set -e
+export LC_ALL=C
+export MIRROR=http://ftp.de.debian.org/debian
+export http_proxy="http://localhost:3128"
+export
+
+init_workspace() {
+	#
+	# clean
+	#
+	rm -fv *.deb *.udeb *.dsc *_*.build *_*.changes *_*.tar.gz
+
+	#
+	# svn checkout and update is done by jenkins job
+	#
+	svn status
+}
+
+pdebuild_package() {
+	#
+	# prepare build
+	#
+	if [ ! -f /var/cache/pbuilder/base.tgz ] ; then
+		sudo pbuilder --create
+	else
+		sudo pbuilder --update
+	fi
+
+	#
+	# build
+	#
+	pdebuild
+}
+
+init_workspace
+#
+# if $1 is not given, build the package normally,
+# else...
+#
+if [ "$1" = "" ] ; then
+	pdebuild_package
+else
+	echo do something else ; exit 1
+fi
diff --git a/bin/d-i_manual.sh b/bin/d-i_manual.sh
index c1e99e9f..fd1fbaaf 100755
--- a/bin/d-i_manual.sh
+++ b/bin/d-i_manual.sh
@@ -29,7 +29,7 @@ pdebuild_package() {
 	#
 	# prepare build
 	#
-	if [ -f /var/base.tgz ] ; then
+	if [ -f /var/cache/pbuilder/base.tgz ] ; then
 		sudo pbuilder --create
 	else
 		sudo pbuilder --update
diff --git a/job-cfg/d-i.yaml b/job-cfg/d-i.yaml
index 40809e86..31e85887 100644
--- a/job-cfg/d-i.yaml
+++ b/job-cfg/d-i.yaml
@@ -91,15 +91,15 @@
           url: http://www.profitbricks.com
           text: Sponsored by Profitbricks
           icon: /userContent/images/profitbricks-24x24.png
-    description: 'Builds debian packages from and triggered by pushes to <pre>{git_repo}</pre> {do_not_edit}'
+    description: 'Builds debian packages in sid from git master branch, triggered by pushes to <pre>{gitrepo}</pre> {do_not_edit}'
     scm:
       - git:
-         url: {git_repo}
-         branches:
+        url: {gitrepo}
+        branches:
            - master
-         #FIXME viewvc-url: http://anonscm.debian.org/viewvc/d-i/trunk
+        #FIXME viewvc-url: http://anonscm.debian.org/viewvc/d-i/trunk
     builders:
-      - shell: '/srv/jenkins/bin/d-i_manual.sh'
+      - shell: '/srv/jenkins/bin/d-i_build.sh'
     triggers:
       - pollscm: "*/6 * * * *"
     publishers:
@@ -203,6 +203,9 @@
 - job-template:
     defaults: d-i-build
     name: '{name}_build_aboot-installer'
+- job-template:
+    defaults: d-i-build
+    name: '{name}_build_anna'
 
 - project:
     name: d-i
@@ -241,6 +244,7 @@
          lang: 'pt_BR'
          languagename: 'Brazilian Portuguese'
       # FIXME: a housekeeping job, ie to check for new languages
-      - '{name}_build_aboot-installer'
-         git_repo: 'git://git.debian.org/git/d-i/aboot-installer'
-       
+      - '{name}_build_aboot-installer':
+         gitrepo: 'git://git.debian.org/git/d-i/aboot-installer'
+      - '{name}_build_anna':
+         gitrepo: 'git://git.debian.org/git/d-i/anna'