Merge pull request #583 from arachnys/fix-jenkins-required

Fix issue where Jenkins variables were required on first launch
arachnys · Nov 22, 2017 · da0c1c2 · da0c1c2
2 parents ead3f98 + b1bc576
commit da0c1c2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,8 @@
+master
+------
+
+* Fix issue where Jenkins environment variables were required on first launch
+
 Version 0.11.8
 --------------
 

diff --git a/cabot/cabotapp/models/jenkins_check_plugin.py b/cabot/cabotapp/models/jenkins_check_plugin.py
@@ -77,9 +77,10 @@ def __str__(self):
 
 def create_default_jenkins_config():
     if not JenkinsConfig.objects.exists():
-        JenkinsConfig.objects.create(
-            name="Default Jenkins",
-            jenkins_api=os.environ.get("JENKINS_API"),
-            jenkins_user=os.environ.get("JENKINS_USER"),
-            jenkins_pass=os.environ.get("JENKINS_PASS"),
-        )
+        if os.environ.get("JENKINS_API"):
+            JenkinsConfig.objects.create(
+                name="Default Jenkins",
+                jenkins_api=os.environ.get("JENKINS_API", "http://jenkins.example.com"),
+                jenkins_user=os.environ.get("JENKINS_USER", ""),
+                jenkins_pass=os.environ.get("JENKINS_PASS", ""),
+            )