[Qa-jenkins-scm] [jenkins.debian.net] 01/02: d-i: preserve udebs built in pu/ branches

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 55178f23b86864b033472f590e6f28e9f66b2ed3
Author: Philip Hands <phil at hands.com>
Date:   Fri Jun 10 09:00:04 2016 +0200

    d-i: preserve udebs built in pu/ branches
---
 bin/d-i_build.sh | 13 +++++++++++++
 update_jdn.sh    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/bin/d-i_build.sh b/bin/d-i_build.sh
index 657173a..8465d79 100755
--- a/bin/d-i_build.sh
+++ b/bin/d-i_build.sh
@@ -79,6 +79,18 @@ pdebuild_package() {
 	sudo dcmd rm /var/cache/pbuilder/result/${SOURCE}_*changes
 }
 
+preserve_pu_udebs() {
+    #
+    # Check is we're in a pu/* branch
+    #
+    expr "$GIT_BRANCH" : 'origin/pu/' >/dev/null || return 0
+
+    BRANCH_DIR="/srv/udebs/${GIT_BRANCH#origin/pu/}"
+    mkdir -p $PU_BRANCH_DIR
+
+    cp $WORKSPACE/../*.udeb $PU_BRANCH_DIR
+}
+
 clean_workspace
 #
 # if $1 is not given, build the package normally,
@@ -86,6 +98,7 @@ clean_workspace
 #
 if [ "$1" = "" ] ; then
 	pdebuild_package
+    preserve_pu_udebs
 else
 	echo do something else ; exit 1
 fi
diff --git a/update_jdn.sh b/update_jdn.sh
index 9307b1c..122bdf5 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -131,7 +131,7 @@ case $HOSTNAME in
 esac
 
 # make sure needed directories exists - some directories will not be needed on all hosts...
-for directory in /schroots /srv/reproducible-results /srv/d-i /srv/live-build /var/log/jenkins/ /srv/jenkins /srv/jenkins/pseudo-hosts /srv/workspace/chroots ; do
+for directory in /schroots /srv/reproducible-results /srv/d-i /srv/udebs /srv/live-build /var/log/jenkins/ /srv/jenkins /srv/jenkins/pseudo-hosts /srv/workspace/chroots ; do
 	if [ ! -d $directory ] ; then
 		sudo mkdir $directory
 	fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git