use get_jenkins

cms-sw · Oct 14, 2024 · 26f2983 · 26f2983
1 parent a37b662
commit 26f2983
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/repo_config.py b/repo_config.py
@@ -1,4 +1,4 @@
-from cms_static import GH_CMSSW_ORGANIZATION, GH_CMSSW_REPO, CMSBUILD_GH_USER, JENKINS_HOST
+from cms_static import GH_CMSSW_ORGANIZATION, GH_CMSSW_REPO, CMSBUILD_GH_USER, get_jenkins
 from os.path import dirname, abspath
 
 GH_TOKEN = "~/.github-token"
@@ -9,7 +9,7 @@
 CREATE_EXTERNAL_ISSUE = True
 CHECK_DPG_POG = True
 NONBLOCKING_LABELS = True
-JENKINS_SERVER = "http://%s.cern.ch:8080/jenkins" % JENKINS_HOST
+JENKINS_SERVER = get_jenkins("jenkins")
 IGNORE_ISSUES = {
     GH_CMSSW_ORGANIZATION + "/" + GH_CMSSW_REPO: [12368],
 }
diff --git a/repos/HcalConditionsAutomatization/ConditionsValidation/repo_config.py b/repos/HcalConditionsAutomatization/ConditionsValidation/repo_config.py
@@ -1,4 +1,4 @@
-from cms_static import GH_CMSSW_ORGANIZATION, GH_CMSSW_REPO, CMSBUILD_GH_USER, CMS_JENKINS_HOST
+from cms_static import GH_CMSSW_ORGANIZATION, GH_CMSSW_REPO, CMSBUILD_GH_USER, get_jenkins
 from os.path import basename, dirname, abspath
 
 GH_TOKEN = "~/.github-token-cmsbot"
@@ -9,7 +9,7 @@
 GH_REPO_NAME = "ConditionsValidation"
 GH_REPO_FULLNAME = GH_REPO_ORGANIZATION + "/" + GH_REPO_NAME
 CREATE_EXTERNAL_ISSUE = False
-JENKINS_SERVER = "http://%s.cern.ch:8080/cms-jenkins" % CMS_JENKINS_HOST
+JENKINS_SERVER = get_jenkins("cms-jenkins")
 ADD_LABELS = False
 ADD_WEB_HOOK = True
 JENKINS_UPLOAD_DIRECTORY = "HcalConditionsAutomatization/ConditionsValidation"

diff --git a/repos/cms_patatrack/cmssw/repo_config.py b/repos/cms_patatrack/cmssw/repo_config.py
@@ -11,7 +11,7 @@
 GH_REPO_ORGANIZATION = "cms-patatrack"
 GH_REPO_FULLNAME = "cms-patatrack/cmssw"
 CREATE_EXTERNAL_ISSUE = False
-# Jenkins CI server: User default http://CMS_JENKINS_HOST.cern.ch:8080/cms-jenkins
+# Jenkins CI server: User default http://cms-jenkins.cern.ch:8080/cms-jenkins
 JENKINS_SERVER = get_jenkins("cms-jenkins")
 # GH Web hook pass phrase. This is encrypeted used bot keys.
 GITHUB_WEBHOOK_TOKEN = """U2FsdGVkX19C9pvh4GUbgDDUy0G9tSJZu7pFoQ0QodGMQtb/h4AFOKPsBxKlORAz

diff --git a/repos/dmwm/CRABServer/repo_config.py b/repos/dmwm/CRABServer/repo_config.py
@@ -1,4 +1,4 @@
-from cms_static import GH_CMSSW_ORGANIZATION, GH_CMSSW_REPO, CMSBUILD_GH_USER, DMWM_JENKINS_HOST
+from cms_static import GH_CMSSW_ORGANIZATION, GH_CMSSW_REPO, CMSBUILD_GH_USER, get_jenkins
 from os.path import basename, dirname, abspath
 
 # GH read/write token: Use default ~/.github-token-cmsbot
@@ -11,8 +11,8 @@
 GH_REPO_ORGANIZATION = basename(dirname(CONFIG_DIR))
 GH_REPO_FULLNAME = "dmwm/CRABServer"
 CREATE_EXTERNAL_ISSUE = False
-# Jenkins CI server: User default http://CMS_JENKINS_HOST.cern.ch:8080/cms-jenkins
-JENKINS_SERVER = "http://%s.cern.ch:8080/dmwm-jenkins" % DMWM_JENKINS_HOST
+# Jenkins CI server: User default http://cms-jenkins.cern.ch:8080/cms-jenkins
+JENKINS_SERVER = get_jenkins("dmwm-jenkins")
 # Set to True if you want bot to add build/test labels to your repo
 ADD_LABELS = False
 # Set to True if you want bot to add GH webhooks. cmsbot needs admin rights

diff --git a/repos/iarspider_cmssw/cmssw/repo_config.py b/repos/iarspider_cmssw/cmssw/repo_config.py
@@ -12,7 +12,7 @@
 GH_REPO_ORGANIZATION = basename(dirname(CONFIG_DIR))
 GH_REPO_FULLNAME = "iarspider-cmssw/cmssw"
 CREATE_EXTERNAL_ISSUE = False
-# Jenkins CI server: User default http://CMS_JENKINS_HOST.cern.ch:8080/cms-jenkins
+# Jenkins CI server: User default http://cms-jenkins.cern.ch:8080/cms-jenkins
 JENKINS_SERVER = "http://localhost:8080/cms-jenkins"
 # GH Web hook pass phrase. This is encrypeted used bot keys.
 # GITHUB_WEBHOOK_TOKEN = ""

diff --git a/repos/smuzaffar/cmssw/repo_config.py b/repos/smuzaffar/cmssw/repo_config.py
@@ -11,7 +11,7 @@
 GH_REPO_ORGANIZATION = basename(dirname(CONFIG_DIR))
 GH_REPO_FULLNAME = "smuzaffar/cmssw"
 CREATE_EXTERNAL_ISSUE = False
-# Jenkins CI server: User default http://CMS_JENKINS_HOST.cern.ch:8080/cms-jenkins
+# Jenkins CI server: User default http://cms-jenkins.cern.ch:8080/cms-jenkins
 JENKINS_SERVER = get_jenkins("cms-jenkins")
 # GH Web hook pass phrase. This is encrypeted used bot keys.
 GITHUB_WEBHOOK_TOKEN = "U2FsdGVkX1+GEHdp/Cmu73+ctvrzSGXc9OvL+8bZyjOe6ZPkqr/GIPgpJHiEp+hR"