From: Fabian Holler <fabian.holler@profitbricks.com>
Date: Wed, 30 Jan 2013 11:48:29 +0000 (+0100)
Subject: use cidb_dev database for liveboot_development jobs
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=39c97c718a75ea37279b11db4627f8b1e78f6d5f;p=profitbricks%2Fjenkins-build-scripts.git

use cidb_dev database for liveboot_development jobs

if the env variable GIT_BRANCH == "master" the database "cidb" is used
else "cidb_dev" is used as db
---

diff --git a/cidb.py b/cidb.py
index 5ddde11..28aaf7a 100644
--- a/cidb.py
+++ b/cidb.py
@@ -1,34 +1,30 @@
 #!/usr/bin/python
 
-import subprocess
+import logging
+import os
 import psycopg2
 import psycopg2.extras
-import logging
+import subprocess
 
-# get current git branch
-#p = subprocess.Popen(["git", "rev-parse", "--symbolic-full-name",
-#    "--abbrev-ref", "HEAD"], stdout=subprocess.PIPE)
-#p.wait()
-#branch = p.stdout.read().rstrip()
+logger = logging.getLogger()
 
-#if branch == "master":
-DB_USER = "cidb"
-DB_PASSWD = "cidb"
-DB_NAME = "cidb"
-DB_HOST = "jenkins"
-DB_PORT = 5432
-#else:
-#    DB_USER = "cidb_dev"
-#    DB_PASSWD = "cidb_dev"
-#    DB_NAME = "cidb_dev"
-#    DB_HOST = "jenkins"
-#    DB_PORT = 5432
+if os.environ['GIT_BRANCH'] == "master":
+    DB_USER = "cidb"
+    DB_PASSWD = "cidb"
+    DB_NAME = "cidb"
+    DB_HOST = "jenkins"
+    DB_PORT = 5432
+else:
+    DB_USER = "cidb_dev"
+    DB_PASSWD = "cidb_dev"
+    DB_NAME = "cidb_dev"
+    DB_HOST = "jenkins"
+    DB_PORT = 5432
 
-logger = logging.getLogger()
+print(DB_NAME)
 
-def db_connect():
-    """ Connects to the db and returns the Connection object. """
 
-    #logger.info("Connecting to database %s" % DB_NAME)
+def db_connect():
+    logger.info("Connecting to database %s" % DB_NAME)
     return psycopg2.connect(database=DB_NAME, user=DB_USER, password=DB_PASSWD,
             host=DB_HOST, port=DB_PORT)