[Qa-jenkins-scm] [jenkins.debian.net] 02/03: reproducible Debian: add option to skip database connection

Holger Levsen holger at layer-acht.org
Sun Nov 27 15:31:38 UTC 2016


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit ad921c88419597a922cfd7ba5536a4f6daf763b0
Author: Valerie R Young <spectranaut at riseup.net>
Date:   Thu Nov 3 16:07:50 2016 -0400

    reproducible Debian: add option to skip database connection
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_common.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index eefef43..9cb17bb 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -94,15 +94,12 @@ with open(os.path.join(BIN_PATH, './reproducible_pkgsets.csv'), newline='') as f
     for line in csv.reader(f):
         META_PKGSET.append((line[1], line[0]))
 
-# init the database data and connection
-DB_ENGINE = create_engine("sqlite:///" + REPRODUCIBLE_DB, connect_args={'timeout': 60})
-DB_METADATA = MetaData(DB_ENGINE)  # Get all table definitions
-conn_db = DB_ENGINE.connect()  # the local sqlite3 reproducible db
-
 parser = argparse.ArgumentParser()
 group = parser.add_mutually_exclusive_group()
 group.add_argument("-d", "--debug", action="store_true")
 group.add_argument("-q", "--quiet", action="store_true")
+group.add_argument("--skip-database-connection", action="store_true",
+                   help="skip connecting to database")
 parser.add_argument("--ignore-missing-files", action="store_true",
                     help="useful for local testing, where you don't have all the build logs, etc..")
 args, unknown_args = parser.parse_known_args()
@@ -121,6 +118,12 @@ log.addHandler(sh)
 started_at = datetime.now()
 log.info('Starting at %s', started_at)
 
+# init the database data and connection
+if not args.skip_database_connection:
+    DB_ENGINE = create_engine("sqlite:///" + REPRODUCIBLE_DB, connect_args={'timeout': 60})
+    DB_METADATA = MetaData(DB_ENGINE)  # Get all table definitions
+    conn_db = DB_ENGINE.connect()  # the local sqlite3 reproducible db
+
 log.debug("BIN_PATH:\t" + BIN_PATH)
 log.debug("BASE:\t\t" + BASE)
 log.debug("DBD_URI:\t\t" + DBD_URI)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git



More information about the Qa-jenkins-scm mailing list