diff options
| -rwxr-xr-x | bin/reproducible_setup_schroot.sh | 10 | ||||
| -rwxr-xr-x | bin/schroot-create.sh | 11 | ||||
| -rw-r--r-- | job-cfg/reproducible.yaml | 18 |
3 files changed, 26 insertions, 13 deletions
diff --git a/bin/reproducible_setup_schroot.sh b/bin/reproducible_setup_schroot.sh index 6bb181b8..d8772112 100755 --- a/bin/reproducible_setup_schroot.sh +++ b/bin/reproducible_setup_schroot.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012-2014 Holger Levsen <holger@layer-acht.org> +# Copyright 2012-2015 Holger Levsen <holger@layer-acht.org> # Copyright 2013 Antonio Terceiro <terceiro@debian.org> # Copyright 2014 Joachim Breitner <nomeata@debian.org> # released under the GPLv=2 @@ -27,12 +27,6 @@ shift 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 @@ -55,8 +49,6 @@ bootstrap() { sudo chmod +x $CHROOT_TARGET/usr/sbin/policy-rc.d echo "Acquire::http::Proxy \"$http_proxy\";" | sudo tee $CHROOT_TARGET/etc/apt/apt.conf.d/80proxy >/dev/null echo "deb-src $MIRROR $DISTRO main" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list > /dev/null - echo "${BACKPORTS}" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list >/dev/null - echo "${BACKPORTSSRC}" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list >/dev/null sudo chroot $CHROOT_TARGET apt-get update if [ -n "$1" ] ; then diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh index 5e7d8588..9de123ff 100755 --- a/bin/schroot-create.sh +++ b/bin/schroot-create.sh @@ -25,9 +25,12 @@ DISTRO="$1" shift if [ "$1" == "backports" ] ; then - BACKPORTS="deb $MIRROR ${DISTRO}-backports main" - BACKPORTSSRC="deb-src $MIRROR ${DISTRO}-backports main" + EXTRA_PACKAGES="deb $MIRROR ${DISTRO}-backports main" + EXTRA_SOURCES="deb-src $MIRROR ${DISTRO}-backports main" shift +elif [ "$1" == "reproducible" ] ; then + EXTRA_PACKAGES="deb http://reproducible.alioth.debian.org/debian/ ./" + EXTRA_SOURCES="deb-src http://reproducible.alioth.debian.org/debian/ ./" fi if [ ! -d "$CHROOT_BASE" ]; then @@ -52,8 +55,8 @@ bootstrap() { sudo chmod +x $CHROOT_TARGET/usr/sbin/policy-rc.d echo "Acquire::http::Proxy \"$http_proxy\";" | sudo tee $CHROOT_TARGET/etc/apt/apt.conf.d/80proxy >/dev/null echo "deb-src $MIRROR $DISTRO main" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list > /dev/null - echo "${BACKPORTS}" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list >/dev/null - echo "${BACKPORTSSRC}" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list >/dev/null + echo "${EXTRA_PACKAGES}" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list >/dev/null + echo "${EXTRA_SOURCES}" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list >/dev/null sudo chroot $CHROOT_TARGET apt-get update if [ -n "$1" ] ; then diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 57180cfc..a317b03b 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -133,6 +133,14 @@ - job-template: defaults: reproducible + name: '{name}_setup_schroot_sid' + +- job-template: + defaults: reproducible + name: '{name}_setup_schroot_experimental' + +- job-template: + defaults: reproducible name: '{name}_scheduler' - job-template: @@ -204,6 +212,16 @@ my_timed: '23 0 * * *' my_shell: '/srv/jenkins/bin/reproducible_setup_schroot.sh reproducible-sid-debbindiff sid debbindiff' my_recipients: 'holger@layer-acht.org' + - '{name}_setup_schroot_sid': + my_description: 'Setup sid schroot for fetching source packages for the builder jobs.' + my_timed: '23 1 * * *' + my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible-sid sid reproducible' + my_recipients: 'holger@layer-acht.org' + - '{name}_setup_schroot_experimental': + my_description: 'Setup experimental schroot for fetching source packages for the builder jobs.' + my_timed: '23 1 * * *' + my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible-experimental experimental reproducible' + my_recipients: 'holger@layer-acht.org' - '{name}_scheduler': my_description: 'Schedule packages to be tested for reproducibility.' my_timed: '42 * * * *' |