reproducible: run 'apt-get source' in schroots and stop abusing the hosts sources.lists

2 files changed, 2 insertions, 27 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)