diff options
| -rwxr-xr-x | bin/chroot-run-rebootstrap.sh | 91 | ||||
| -rwxr-xr-x | job-cfg/rebootstrap.yaml.py | 2 |
2 files changed, 1 insertions, 92 deletions
diff --git a/bin/chroot-run-rebootstrap.sh b/bin/chroot-run-rebootstrap.sh deleted file mode 100755 index 597edfca..00000000 --- a/bin/chroot-run-rebootstrap.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -# Copyright 2012-2014 Holger Levsen <holger@layer-acht.org> -# Copyright 2013 Antonio Terceiro <terceiro@debian.org> -# released under the GPLv=2 - -. /srv/jenkins/bin/common-functions.sh -common_init "$@" -export http_proxy=http://localhost:3129 - -# $1 = base distro -# $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 ...]" - exit 1 -fi - -DISTRO="$1" -shift - -if [ "$1" == "backports" ] ; then - BACKPORTS="deb $MIRROR ${DISTRO}-backports main" - BACKPORTSSRC="deb-src $MIRROR ${DISTRO}-backports main" - shift -fi - -if [ ! -d "$CHROOT_BASE" ]; then - echo "Directory $CHROOT_BASE does not exist, aborting." - exit 1 -fi - -export CHROOT_TARGET=$(mktemp -d -p $CHROOT_BASE/ chroot-run-$DISTRO.XXXXXXXXX) -if [ -z "$CHROOT_TARGET" ]; then - echo "Could not create a directory to create the chroot in, aborting." - exit 1 -fi - -export CURDIR=$(pwd) - -bootstrap() { - mkdir -p "$CHROOT_TARGET/etc/dpkg/dpkg.cfg.d" - echo force-unsafe-io > "$CHROOT_TARGET/etc/dpkg/dpkg.cfg.d/02dpkg-unsafe-io" - - echo "Bootstraping $DISTRO into $CHROOT_TARGET now." - sudo debootstrap $DISTRO $CHROOT_TARGET $MIRROR - - cat > $CHROOT_TARGET/tmp/chroot-prepare <<-EOF -$SCRIPT_HEADER -mount /proc -t proc /proc -echo -e '#!/bin/sh\nexit 101' > /usr/sbin/policy-rc.d -chmod +x /usr/sbin/policy-rc.d -echo 'Acquire::http::Proxy "$http_proxy";' > /etc/apt/apt.conf.d/80proxy -echo "deb-src $MIRROR $DISTRO main" >> /etc/apt/sources.list -echo "${BACKPORTS}" >> /etc/apt/sources.list -echo "${BACKPORTSSRC}" >> /etc/apt/sources.list -apt-get update -EOF - - chmod +x $CHROOT_TARGET/tmp/chroot-prepare - sudo chroot $CHROOT_TARGET /tmp/chroot-prepare -} - -cleanup() { - if [ -d $CHROOT_TARGET/proc ]; then - sudo umount -l $CHROOT_TARGET/proc || fuser -mv $CHROOT_TARGET/proc - fi - if [ -d $CHROOT_TARGET/testrun ]; then - sudo umount -l $CHROOT_TARGET/testrun || fuser -mv $CHROOT_TARGET/testrun - fi - if [ -d $CHROOT_TARGET ]; then - sudo rm -rf --one-file-system $CHROOT_TARGET || fuser -mv $CHROOT_TARGET - fi -} -trap cleanup INT TERM EXIT - -run() { - cp -r $CURDIR $CHROOT_TARGET/tmp/ - mv $CHROOT_TARGET/tmp/$(basename $CURDIR) $CHROOT_TARGET/tmp/testrun - cat > $CHROOT_TARGET/tmp/chroot-testrun <<-EOF -$SCRIPT_HEADER -cd /tmp/testrun -$@ -EOF - chmod +x $CHROOT_TARGET/tmp/chroot-testrun - sudo chroot $CHROOT_TARGET /tmp/chroot-testrun -} - -bootstrap -run "$@" -cleanup diff --git a/job-cfg/rebootstrap.yaml.py b/job-cfg/rebootstrap.yaml.py index accb12dd..201e3743 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-rebootstrap.sh sid ./bootstrap.sh HOST_ARCH={my_arch} {my_params}' + - shell: '/srv/jenkins/bin/chroot-run.sh sid ./bootstrap.sh HOST_ARCH={my_arch} {my_params}' publishers: - email: recipients: 'jenkins+debian-bootstrap helmutg@debian.org' |