diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-06-21 20:59:28 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-06-21 20:59:28 +0200 |
| commit | 77e040f73c14af5c74e509ab32032a844c6548f9 (patch) | |
| tree | f18403c8d58ef74dbf5560b42f1ae864bb6962ec | |
| parent | 815bad99dde819e3eafcf9dc2d86385dd28326ea (diff) | |
| parent | fd94a8edc5c5a4d884f41f13e528dc2136950f47 (diff) | |
| download | jenkins.debian.net-77e040f73c14af5c74e509ab32032a844c6548f9.tar.xz | |
Merge commit 'fd94a8edc5c5a4d884f41f13e528dc2136950f47'
| -rwxr-xr-x | bin/chroot-run.sh | 13 | ||||
| -rwxr-xr-x | job-cfg/rebootstrap.yaml.py | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/bin/chroot-run.sh b/bin/chroot-run.sh index 05df628b..577fc62c 100755 --- a/bin/chroot-run.sh +++ b/bin/chroot-run.sh @@ -11,7 +11,7 @@ common_init "$@" # $2 $3 ... = command to run inside a clean chroot running the distro in $1 if [ $# -lt 2 ]; then - echo "usage: $0 DISTRO [backports] CMD [ARG1 ARG2 ...]" + echo "usage: $0 DISTRO [backports|minimal] CMD [ARG1 ARG2 ...]" exit 1 fi @@ -24,6 +24,11 @@ if [ "$1" == "backports" ] ; then shift fi +if [ "$1" == "minimal" ] ; then + MINIMAL=yes + shift +fi + if [ ! -d "$CHROOT_BASE" ]; then echo "Directory $CHROOT_BASE does not exist, aborting." exit 1 @@ -79,6 +84,9 @@ run() { cat > $CHROOT_TARGET/tmp/chroot-testrun <<-EOF $SCRIPT_HEADER cd /tmp/testrun +EOF + if [ "$MINIMAL" != "yes" ]; then + cat >> $CHROOT_TARGET/tmp/chroot-testrun <<-EOF echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/23jenkins apt-get install build-essential devscripts git if [ -f debian/control ] ; then @@ -86,8 +94,9 @@ if [ -f debian/control ] ; then # install build-depends mk-build-deps -ir fi -$@ EOF + fi + echo "$*" >> $CHROOT_TARGET/tmp/chroot-testrun chmod +x $CHROOT_TARGET/tmp/chroot-testrun sudo chroot $CHROOT_TARGET /tmp/chroot-testrun diff --git a/job-cfg/rebootstrap.yaml.py b/job-cfg/rebootstrap.yaml.py index 201e3743..de70f5d9 100755 --- a/job-cfg/rebootstrap.yaml.py +++ b/job-cfg/rebootstrap.yaml.py @@ -61,7 +61,7 @@ print(""" branches: - '{my_branchname}' builders: - - shell: '/srv/jenkins/bin/chroot-run.sh sid ./bootstrap.sh HOST_ARCH={my_arch} {my_params}' + - shell: '/srv/jenkins/bin/chroot-run.sh sid minimal ./bootstrap.sh HOST_ARCH={my_arch} {my_params}' publishers: - email: recipients: 'jenkins+debian-bootstrap helmutg@debian.org' |