added get_jenkins

cms-sw · Oct 14, 2024 · 5f4da9b · 5f4da9b
1 parent 4a95b72
commit 5f4da9b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/cms_static.py b/cms_static.py
@@ -12,9 +12,9 @@
 CMSBOT_IGNORE_MSG = "<cmsbot>\\s*</cmsbot>"
 CMSBOT_NO_NOTIFY_MSG = "<notify>\\s*</notify>"
 CMSBOT_TECHNICAL_MSG = "cms-bot internal usage"
-JENKINS_HOST = cmsjenkins04
-CMS_JENKINS_HOST = cmsjenkins02
-DMWM_JENKINS_HOST = cmsjenkins11
+JENKINS_HOST = "cmsjenkins04"
+CMS_JENKINS_HOST = "cmsjenkins02"
+DMWM_JENKINS_HOST = "cmsjenkins11"
 VALID_CMS_SW_REPOS_FOR_TESTS = [
     "cmssw",
     "cmsdist",
@@ -32,3 +32,11 @@
     "cms-docker",
     "siteconf",
 ]
+
+def get_jenkins(prefix):
+  jhost = JENKINS_HOST
+  if prefix=="cms-jenkins":
+    jhost = CMS_JENKINS_HOST
+  elif prefix=="dmwm-jenkins":
+    jhost = DMWM_JENKINS_HOST
+  return "http://%s.cern.ch:8080/%s" % (jhost, prefix)
diff --git a/condor/connect.sh b/condor/connect.sh
@@ -19,7 +19,7 @@ REQUEST_CPUS="${REQUEST_CPUS-1}"
 REQUEST_UNIVERSE="${REQUEST_UNIVERSE-vanilla}"
 REQUEST_MAXRUNTIME="${REQUEST_MAXRUNTIME-432000}"
 JENKINS_DEBUG="${DEBUG-false}"
-JENKINS_CALLBACK="${JENKINS_CALLBACK-http://cmsjenkins04.cern.ch:8080/jenkins/}"
+JENKINS_CALLBACK="${JENKINS_PREFIX}"
 
 if [ $REQUEST_CPUS -lt 1 ] ; then REQUEST_CPUS=1 ; fi
 if [ "${REQUEST_MEMORY}" == "" ] ; then let REQUEST_MEMORY=${REQUEST_CPUS}*2500 ; fi