From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 18 Sep 2013 10:21:33 +0000 (+0200)
Subject: changes taken from sagunt:/root/
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=1f405a464112475e043e268225a770d7e53e8f91;p=profitbricks%2Fjenkins-build-scripts.git

changes taken from sagunt:/root/
---

diff --git a/.pbuilder/hooks.d/B02-get-reports b/.pbuilder/hooks.d/B02-get-reports
new file mode 100755
index 0000000..b3be8e5
--- /dev/null
+++ b/.pbuilder/hooks.d/B02-get-reports
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# these are collected using ${ADDITIONAL_BUILDRESULTS[@]} in .pbuilderrc 
+
+if echo "${BUILD_TRIGGERS}" | grep -q 'no-test'; then
+	echo "###"
+	echo "### Found build trigger 'no-test' so no reports.tgz will be created."
+	echo "###"
+else
+	echo "###"
+	echo "### Find report files and copy reports.tgz out of chroot."
+	echo "###"
+	
+	cd /tmp/buildd/
+	find . -name surefire-reports -o -name failsafe-reports -o -name unittest.log -o -name tests-0.log -o -name build.log | xargs tar czvf ./reports.tgz || true
+	mkdir -p jenkins || true
+	# for testing, tvdk
+	#cp reports.tgz jenkins/ || true
+	mv reports.tgz jenkins/ || true
+	# use uid here instead of username as we might operate inside chroots
+	chown -R 106 jenkins
+	#ls -l reports.tgz jenkins/reports.tgz || echo "no reports.tgz found"
+	#ls -l jenkins/reports.tgz || echo "no reports.tgz found"
+fi
diff --git a/.pbuilder/hooks.d/B02-test b/.pbuilder/hooks.d/B02-test
deleted file mode 100755
index 80069e9..0000000
--- a/.pbuilder/hooks.d/B02-test
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-
-# these are collected using ${ADDITIONAL_BUILDRESULTS[@]} in .pbuilderrc 
-
-cd /tmp/buildd/
-find . -name surefire-reports -o -name failsafe-reports -o -name unittest.log -o -name tests-0.log -o -name build.log | xargs tar czvf ./reports.tgz || true
-mkdir -p jenkins ; mv reports.tgz jenkins/ || true
-# use uid here instead of username as we might operate inside chroots
-chown -R 106 jenkins
diff --git a/.pbuilder/hooks.d/C20-get-reports b/.pbuilder/hooks.d/C20-get-reports
new file mode 100755
index 0000000..b3be8e5
--- /dev/null
+++ b/.pbuilder/hooks.d/C20-get-reports
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# these are collected using ${ADDITIONAL_BUILDRESULTS[@]} in .pbuilderrc 
+
+if echo "${BUILD_TRIGGERS}" | grep -q 'no-test'; then
+	echo "###"
+	echo "### Found build trigger 'no-test' so no reports.tgz will be created."
+	echo "###"
+else
+	echo "###"
+	echo "### Find report files and copy reports.tgz out of chroot."
+	echo "###"
+	
+	cd /tmp/buildd/
+	find . -name surefire-reports -o -name failsafe-reports -o -name unittest.log -o -name tests-0.log -o -name build.log | xargs tar czvf ./reports.tgz || true
+	mkdir -p jenkins || true
+	# for testing, tvdk
+	#cp reports.tgz jenkins/ || true
+	mv reports.tgz jenkins/ || true
+	# use uid here instead of username as we might operate inside chroots
+	chown -R 106 jenkins
+	#ls -l reports.tgz jenkins/reports.tgz || echo "no reports.tgz found"
+	#ls -l jenkins/reports.tgz || echo "no reports.tgz found"
+fi
diff --git a/.pbuilderrc b/.pbuilderrc
index 8e22546..fb8c7dd 100644
--- a/.pbuilderrc
+++ b/.pbuilderrc
@@ -62,7 +62,8 @@ ADDITIONAL_BUILDRESULTS=(reports.tgz)
 BINDMOUNTS="/dev"
 
 if [ "$DIST" == "wheezy" ] ; then
-        EXTRAPACKAGES="lintian vim python python-git kernel-package cpio devscripts fakeroot module-assistant debhelper html2text dctrl-tools python-support python-sqlalchemy-ext less dpatch maven2 pbzip2 rsync cdbs quilt git-core wget toilet figlet openjdk-6-jdk openjdk-6-jre-headless openjdk-6-jre-lib openssh-client build-essential subversion qemu-kvm cppcheck sloccount debootstrap ldap-utils python-apt python-debian python-argparse"
+        #EXTRAPACKAGES="lintian vim python python-git kernel-package cpio devscripts fakeroot module-assistant debhelper html2text dctrl-tools python-support python-sqlalchemy-ext less dpatch maven2 pbzip2 rsync cdbs quilt git-core wget toilet figlet openjdk-6-jdk openjdk-6-jre-headless openjdk-6-jre-lib openssh-client build-essential subversion qemu-kvm cppcheck sloccount debootstrap ldap-utils python-apt python-debian python-argparse"
+        EXTRAPACKAGES="lintian vim python python-git kernel-package cpio devscripts fakeroot module-assistant debhelper html2text dctrl-tools python-support python-sqlalchemy-ext less dpatch maven2 pbzip2 rsync cdbs quilt git-core wget toilet figlet openjdk-6-jdk openjdk-6-jre-headless openjdk-6-jre-lib openssh-client build-essential subversion cppcheck sloccount debootstrap ldap-utils python-apt python-debian python-argparse"
         BASETGZ="/var/cache/pbuilder/$NAME-$PB_SUITE-base.tgz"
         BASEPATH="/var/cache/pbuilder/$NAME-$PB_SUITE-base.cow"