From d45b58ffbf1251467162cd5eacde5833bd244f82 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 14 Oct 2014 10:49:13 +0200
Subject: reproducible: refactor

---
 bin/reproducible_setup.sh | 36 ++----------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

(limited to 'bin/reproducible_setup.sh')

diff --git a/bin/reproducible_setup.sh b/bin/reproducible_setup.sh
index 03fd4972..2c31efbc 100755
--- a/bin/reproducible_setup.sh
+++ b/bin/reproducible_setup.sh
@@ -6,40 +6,8 @@
 . /srv/jenkins/bin/common-functions.sh
 common_init "$@"
 
-# create sqlite db
-PACKAGES_DB=/var/lib/jenkins/reproducible.db
-if [ ! -f ${PACKAGES_DB} ] ; then
-	sqlite3 ${PACKAGES_DB} '
-		CREATE TABLE source_packages
-		(name TEXT NOT NULL,
-		version TEXT NOT NULL,
-		status TEXT NOT NULL
-		CHECK (status IN ("blacklisted", "FTBFS","reproducible","unreproducible","404", "not for us")),
-		build_date TEXT NOT NULL,
-		PRIMARY KEY (name))'
-	sqlite3 ${PACKAGES_DB} '
-		CREATE TABLE sources_scheduled
-		(name TEXT NOT NULL,
-		date_scheduled TEXT NOT NULL,
-		date_build_started TEXT NOT NULL,
-		PRIMARY KEY (name))'
-	sqlite3 ${PACKAGES_DB} '
-		CREATE TABLE sources
-		(name TEXT NOT NULL,
-		version TEXT NOT NULL)'
-elif [ -f $PACKAGES_DB.lock ] ; then
-	for i in $(seq 0 100) ; do
-		sleep 15
-		[ -f $PACKAGES_DB.lock ] || break
-	done
-	echo "$PACKAGES_DB.lock still exist, exiting."
-	exit 1
-fi
-# 30 seconds timeout when trying to get a lock
-INIT=/var/lib/jenkins/reproducible.init
-cat >/var/lib/jenkins/reproducible.init <<-EOF
-.timeout 60000
-EOF
+# common code defining db access
+. /srv/jenkins/bin/reproducible_common.sh
 
 set +x
 # blacklist some packages
-- 
cgit v1.2.3-70-g09d2