diff options
-rwxr-xr-x | bin/reproducible_build.sh (renamed from bin/reproducible_pbuild_run.sh) | 2 | ||||
-rwxr-xr-x | bin/reproducible_setup.sh (renamed from bin/reproducible_pbuilder_setup.sh) | 5 | ||||
-rw-r--r-- | job-cfg/reproducible.yaml | 19 |
3 files changed, 16 insertions, 10 deletions
diff --git a/bin/reproducible_pbuild_run.sh b/bin/reproducible_build.sh index 659728da..641a46d7 100755 --- a/bin/reproducible_pbuild_run.sh +++ b/bin/reproducible_build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2014 Holger Levsen <holger@layer-acht.org> # released under the GPLv=2 diff --git a/bin/reproducible_pbuilder_setup.sh b/bin/reproducible_setup.sh index 282d61eb..41af2bff 100755 --- a/bin/reproducible_pbuilder_setup.sh +++ b/bin/reproducible_setup.sh @@ -6,11 +6,12 @@ . /srv/jenkins/bin/common-functions.sh common_init "$@" -TMPFILE=$(mktemp=) +TMPFILE=$(mktemp) cat > $TMPFILE <<- EOF echo 'deb http://reproducible.alioth.debian.org/debian/ ./' > /etc/apt/sources.list.d/reproducible.list apt-get update -apt-get install -y dpkg dpkg-dev debhelper dh-python proot +echo "Warning: Usage of --force-yes to override the apt authentication warning. Don't do this." +apt-get install --force-yes -y dpkg dpkg-dev debhelper dh-python proot EOF sudo cp /var/cache/pbuilder/base.tgz /var/cache/pbuilder/base-reproducible.tgz diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index fa2158f4..38e0240c 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -25,26 +25,31 @@ - job-template: defaults: reproducible - name: '{name}_pbuilder_setup' + name: '{name}_setup' publishers: - email: recipients: 'jenkins+sid-reproducible holger@layer-acht.org lunar@debian.org' - job-template: defaults: reproducible - name: '{name}_pbuild_one' + name: '{name}_build_core' publishers: - email: recipients: 'jenkins+sid-reproducible holger@layer-acht.org' # FIXME add lunar here again + scm: + - git: + url: 'git://git.debian.org/git/reproducible/misc.git' + branches: + - master + - project: name: reproducible jobs: - - '{name}_pbuilder_setup': + - '{name}_setup': my_description: 'Setup pbuilder for reproducible builds as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example' - my_shell: '/srv/jenkins/bin/reproducible_pbuilder_setup.sh' - jobs: - - '{name}_pbuild_one': + my_shell: '/srv/jenkins/bin/reproducible_setup.sh' + - '{name}_build_core': my_description: 'Build one package with pbuilder so far....' - my_shell: '/srv/jenkins/bin/reproducible_pbuild_run.sh acl' + my_shell: '/srv/jenkins/bin/reproducible_build.sh acl' |