]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
fixup! use cidb_dev database for liveboot_development jobs
authorFabian Holler <fabian.holler@profitbricks.com>
Wed, 30 Jan 2013 11:58:12 +0000 (12:58 +0100)
committerHolger Levsen <holger@layer-acht.org>
Wed, 30 Jan 2013 12:05:29 +0000 (13:05 +0100)
cidb.py

diff --git a/cidb.py b/cidb.py
index 28aaf7a2361280590be5354935302918a8e2e0b1..e8dc9ddac5ed4d461e258442f225639f9f298b64 100644 (file)
--- a/cidb.py
+++ b/cidb.py
@@ -8,20 +8,18 @@ import subprocess
 
 logger = logging.getLogger()
 
-if os.environ['GIT_BRANCH'] == "master":
-    DB_USER = "cidb"
-    DB_PASSWD = "cidb"
-    DB_NAME = "cidb"
-    DB_HOST = "jenkins"
-    DB_PORT = 5432
-else:
+if os.environ['JOB_NAME'] == "liveboot_development":
     DB_USER = "cidb_dev"
     DB_PASSWD = "cidb_dev"
     DB_NAME = "cidb_dev"
     DB_HOST = "jenkins"
     DB_PORT = 5432
-
-print(DB_NAME)
+else:
+    DB_USER = "cidb"
+    DB_PASSWD = "cidb"
+    DB_NAME = "cidb"
+    DB_HOST = "jenkins"
+    DB_PORT = 5432
 
 
 def db_connect():