summaryrefslogtreecommitdiffstats
path: root/dashboard/src
diff options
context:
space:
mode:
authorJack Morgan <jack.morgan@intel.com>2017-12-07 19:39:00 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-07 19:39:00 +0000
commitd962c79fa747f07e5b55bc13aa73698b0df7d26f (patch)
treea737a653775e851b2694a13e5c5720b079f78dd4 /dashboard/src
parenta28e3f98ec1870320a699d3b726331e5f2f03acf (diff)
parent5654cfe05930a331978eb9f7448975bd0d1b96c2 (diff)
Merge "Abstract Hard-Coded URLs to Config File"
Diffstat (limited to 'dashboard/src')
-rw-r--r--dashboard/src/jenkins/adapter.py11
-rw-r--r--dashboard/src/pharos_dashboard/settings.py6
2 files changed, 13 insertions, 4 deletions
diff --git a/dashboard/src/jenkins/adapter.py b/dashboard/src/jenkins/adapter.py
index edf502f..b48b868 100644
--- a/dashboard/src/jenkins/adapter.py
+++ b/dashboard/src/jenkins/adapter.py
@@ -10,6 +10,7 @@
import logging
import re
+from django.conf import settings
import requests
from django.core.cache import cache
@@ -33,13 +34,15 @@ def get_json(url):
def get_all_slaves():
- url = "https://build.opnfv.org/ci/computer/api/json?tree=computer[displayName,offline,idle]"
+ url = settings.ALL_SLAVES_URL
json = get_json(url)
if json is not None:
return json['computer'] # return list of dictionaries
return []
+
+
def get_slave(slavename):
slaves = get_all_slaves()
for slave in slaves:
@@ -49,7 +52,7 @@ def get_slave(slavename):
def get_ci_slaves():
- url = "https://build.opnfv.org/ci/label/ci-pod/api/json?tree=nodes[nodeName,offline,idle]"
+ url = settings.CI_SLAVES_URL
json = get_json(url)
if json is not None:
return json['nodes']
@@ -57,7 +60,7 @@ def get_ci_slaves():
def get_all_jobs():
- url = "https://build.opnfv.org/ci/api/json?tree=jobs[displayName,url,lastBuild[fullDisplayName,building,builtOn,timestamp,result]]"
+ url = settings.ALL_JOBS_URL
json = get_json(url)
if json is not None:
return json['jobs'] # return list of dictionaries
@@ -123,7 +126,7 @@ def parse_job_string(full_displayname):
return job
def get_slave_url(slave):
- return 'https://build.opnfv.org/ci/computer/' + slave['displayName']
+ return settings.GET_SLAVE_URL + slave['displayName']
def get_slave_status(slave):
diff --git a/dashboard/src/pharos_dashboard/settings.py b/dashboard/src/pharos_dashboard/settings.py
index 546b174..83ad172 100644
--- a/dashboard/src/pharos_dashboard/settings.py
+++ b/dashboard/src/pharos_dashboard/settings.py
@@ -182,3 +182,9 @@ CELERYBEAT_SCHEDULE = {
'schedule': timedelta(hours=24)
},
}
+# Jenkins Settings
+ALL_SLAVES_URL = os.environ['JENKINS_URL'] + '/computer/api/json?tree=computer[displayName,offline,idle]'
+CI_SLAVES_URL = os.environ['JENKINS_URL'] + '/label/ci-pod/api/json?tree=nodes[nodeName,offline,idle]'
+ALL_JOBS_URL = os.environ['JENKINS_URL'] + '/api/json?tree=jobs[displayName,url,lastBuild[fullDisplayName,building,builtOn,timestamp,result]'
+GET_SLAVE_URL = os.environ['JENKINS_URL'] + '/computer/'
+