diff options
| author | Philip Hands <phil@hands.com> | 2016-06-10 09:00:04 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-06-10 10:24:58 +0200 |
| commit | 55178f23b86864b033472f590e6f28e9f66b2ed3 (patch) | |
| tree | 52ccb9aae76e3278046af5e04ae6b24b9f45caab | |
| parent | dbb4f0ff4994030828ca7ee901ec80e9a2ddce26 (diff) | |
| download | jenkins.debian.net-55178f23b86864b033472f590e6f28e9f66b2ed3.tar.xz | |
d-i: preserve udebs built in pu/ branches
| -rwxr-xr-x | bin/d-i_build.sh | 13 | ||||
| -rwxr-xr-x | update_jdn.sh | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/bin/d-i_build.sh b/bin/d-i_build.sh index 657173ae..8465d797 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 9307b1cd..122bdf5c 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 |