diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-02-27 11:27:57 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-02-27 11:29:46 +0100 |
| commit | 2578564632bcff380479473087e0c3bd9a61a33a (patch) | |
| tree | dbcc1e0655a3ce7269397ddecd0115dbbb8a371a | |
| parent | c3a6a7e44f1d34e8990219ed5419420f509bbd63 (diff) | |
| download | jenkins.debian.net-2578564632bcff380479473087e0c3bd9a61a33a.tar.xz | |
reproducible: run 'apt-get source' in schroots and stop abusing the hosts sources.lists
| -rwxr-xr-x | bin/reproducible_build.sh | 8 | ||||
| -rwxr-xr-x | bin/reproducible_scheduler.py | 21 | ||||
| -rw-r--r-- | etc/apt/sources.list | 7 |
3 files changed, 2 insertions, 34 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 050c1c3b..551b6e53 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -143,10 +143,7 @@ else echo "Starting to build ${SRCPACKAGE}/${SUITE} on $DATE" | tee ${RBUILDLOG} echo "The jenkins build log is/was available at $BUILD_URL/console" | tee -a ${RBUILDLOG} set +e - # host has only sid in deb-src in sources.list - # FIXME: this shall be fixed using schroots - # also see 10 lines below for the same code... - apt-get --download-only --only-source source ${SRCPACKAGE} >> ${RBUILDLOG} 2>&1 + schroot --directory $PWD -c source:jenkins-reproducible-$SUITE apt-get -- --download-only --only-source source ${SRCPACKAGE} >> ${RBUILDLOG} 2>&1 RESULT=$? if [ $RESULT != 0 ] ; then # sometimes apt-get cannot download a package for whatever reason. @@ -155,8 +152,7 @@ else ls -l ${SRCPACKAGE}* | tee -a ${RBUILDLOG} echo "Sleeping 5m before re-trying..." | tee -a ${RBUILDLOG} sleep 5m - # host has only sid in deb-src in sources.list - apt-get source --download-only --only-source ${SRCPACKAGE} >> ${RBUILDLOG} 2>&1 + schroot --directory $PWD -c source:jenkins-reproducible-$SUITE apt-get -- --download-only --only-source source ${SRCPACKAGE} >> ${RBUILDLOG} 2>&1 RESULT=$? fi if [ $RESULT != 0 ] ; then diff --git a/bin/reproducible_scheduler.py b/bin/reproducible_scheduler.py index 86f2aba3..a75a20e6 100755 --- a/bin/reproducible_scheduler.py +++ b/bin/reproducible_scheduler.py @@ -35,22 +35,6 @@ def call_apt_update(): sys.exit(1) -def check_suite_avail(suite): - log.debug('Checking wheter the suite ' + suite + ' is listed in your ' + - 'sources.list file') - listall = aptsources.sourceslist.SourcesList() - splittedlist = [x.str() for x in listall] - for line in splittedlist: - if line[0][0] == '#': - continue - if 'deb-src' not in line: - continue - if suite in line: - log.debug('\tyes, it is') - return True - return False - - def update_sources_tables(suite): # download the sources file for this suite mirror = 'http://ftp.de.debian.org/debian' @@ -278,10 +262,5 @@ def scheduler(suite): if __name__ == '__main__': call_apt_update() for suite in SUITES: -# for now we need entries for whatever suite we want to test in sources.list - if not check_suite_avail(suite): - print_critical_message('Please add a deb-src entry for ' + suite + - ' in your sources.list file') - raise ValueError update_sources_tables(suite) scheduler(suite) diff --git a/etc/apt/sources.list b/etc/apt/sources.list index 74d7ad25..d1d3d31b 100644 --- a/etc/apt/sources.list +++ b/etc/apt/sources.list @@ -1,13 +1,6 @@ -# - - - deb http://ftp.de.debian.org/debian/ wheezy main #deb-src http://ftp.de.debian.org/debian/ wheezy main -# needed for job/reproducible* -deb-src http://ftp.de.debian.org/debian/ sid main - deb http://security.debian.org/ wheezy/updates main #deb-src http://security.debian.org/ wheezy/updates main |