Change endpoint for emulators to keep jenkins happy

khurtado · khurtado · commit 5add130ca3fb · 2025-09-02T12:23:57.000-04:00
diff --git a/bin/createStoreResults.py b/bin/createStoreResults.py
@@ -43,7 +43,8 @@
     "AcquisitionEra": "UPDATEME",
     "ProcessingVersion": 1,  # will be updated too
     "Campaign": "StoreResults",
-    "DbsUrl": "https://cmsweb-prod.cern.ch/dbs/prod/phys03/DBSReader",
+    #"DbsUrl": "https://cmsweb-prod.cern.ch/dbs/prod/phys03/DBSReader",
+    "DbsUrl": "https://cmsweb.cern.ch/dbs/prod/phys03/DBSReader",
     "GlobalTag": "crab3_tag",
     "Memory": 2000,
     "RequestPriority": 999999,
diff --git a/src/python/WMQuality/Emulators/DBSClient/MockDbsApi.py b/src/python/WMQuality/Emulators/DBSClient/MockDbsApi.py
@@ -36,8 +36,10 @@
 except IOError:
     mockData03 = {}
 
-mockData['https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader'] = mockDataGlobal
-mockData['https://cmsweb-prod.cern.ch/dbs/prod/phys03/DBSReader'] = mockData03
+#mockData['https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader'] = mockDataGlobal
+#mockData['https://cmsweb-prod.cern.ch/dbs/prod/phys03/DBSReader'] = mockData03
+mockData['https://cmsweb.cern.ch/dbs/prod/global/DBSReader'] = mockDataGlobal
+mockData['https://cmsweb.cern.ch/dbs/prod/phys03/DBSReader'] = mockData03
 
 class MockDbsApi(object):
     def __init__(self, url):
diff --git a/src/python/WMQuality/Emulators/DBSClient/MockedDBSGlobalCalls.py b/src/python/WMQuality/Emulators/DBSClient/MockedDBSGlobalCalls.py
@@ -2,7 +2,8 @@
 
 from __future__ import (division, print_function)
 
-endpoint = 'https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader'
+#endpoint = 'https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader'
+endpoint = 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader'
 
 # Datasets to get all blocks, array, and lumis from
 datasets = ['/HighPileUp/Run2011A-v1/RAW', '/MinimumBias/ComissioningHI-v1/RAW', '/Cosmics/ComissioningHI-v1/RAW',
diff --git a/src/python/WMQuality/Emulators/DBSClient/MockedDBSphys03Calls.py b/src/python/WMQuality/Emulators/DBSClient/MockedDBSphys03Calls.py
@@ -2,7 +2,8 @@
 
 from __future__ import (division, print_function)
 
-endpoint = 'https://cmsweb-prod.cern.ch/dbs/prod/phys03/DBSReader'
+#endpoint = 'https://cmsweb-prod.cern.ch/dbs/prod/phys03/DBSReader'
+endpoint = 'https://cmsweb.cern.ch/dbs/prod/phys03/DBSReader'
 
 datasets = []
 
diff --git a/src/python/WMQuality/Emulators/RucioClient/MockRucioApi.py b/src/python/WMQuality/Emulators/RucioClient/MockRucioApi.py
@@ -19,7 +19,8 @@
 from Utils.PythonVersion import PY2, PY3
 from Utils.Utilities import encodeUnicodeToBytesConditional
 
-PROD_DBS = 'https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader'
+#PROD_DBS = 'https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader'
+PROD_DBS = 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader'
 
 NOT_EXIST_DATASET = 'thisdoesntexist'
 # PILEUP_DATASET = '/HighPileUp/Run2011A-v1/RAW'
diff --git a/src/python/WMQuality/Emulators/WMSpecGenerator/Samples/BasicProcessingWorkload.py b/src/python/WMQuality/Emulators/WMSpecGenerator/Samples/BasicProcessingWorkload.py
@@ -32,7 +32,8 @@ def createWorkload(name="BasicProcessing"):
         primary = "Cosmics",
         processed = "CRAFT09-PromptReco-v1",
         tier = "RECO",
-        dbsurl = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader")
+        #dbsurl = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader")
+        dbsurl = "https://cmsweb.cern.ch/dbs/prod/global/DBSReader")
 
     #  //
     # // rereco cmssw step
diff --git a/src/python/WMQuality/Emulators/WMSpecGenerator/Samples/MultiTaskProcessingWorkload.py b/src/python/WMQuality/Emulators/WMSpecGenerator/Samples/MultiTaskProcessingWorkload.py
@@ -8,7 +8,8 @@
 from WMCore.WMSpec.WMWorkload import newWorkload
 
 
-DBSURL = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
+#DBSURL = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
+DBSURL = "https://cmsweb.cern.ch/dbs/prod/global/DBSReader"
 
 #  //
 # // Set up the basic workload task and step structure
diff --git a/test/python/WMCore_t/Lexicon_t.py b/test/python/WMCore_t/Lexicon_t.py
@@ -793,7 +793,7 @@ def testUrlValidation(self):
         Test the validateUrl function for some use case of DBS 3
         """
         # Good http(s) urls
-        for url in ['https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader',
+        for url in ['https://cmsweb.cern.ch/dbs/prod/global/DBSReader',
                     'https://mydbs.mydomain.de:8443',
                     'http://localhost',
                     'http://192.168.1.1',
diff --git a/test/python/WMCore_t/MicroService_t/MSTransferor_t/DataStructs_t/Workflow_t.py b/test/python/WMCore_t/MicroService_t/MSTransferor_t/DataStructs_t/Workflow_t.py
@@ -40,7 +40,8 @@ def testCampaignMap(self):
                       }
         wflow = Workflow(tChainSpec['RequestName'], tChainSpec)
         self.assertEqual(len(wflow.getDataCampaignMap()), 3)
-        self.assertEqual(wflow.getDbsUrl(), "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader")
+        #self.assertEqual(wflow.getDbsUrl(), "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader")
+        self.assertEqual(wflow.getDbsUrl(), "https://cmsweb.cern.ch/dbs/prod/global/DBSReader")
         for dataIn in wflow.getDataCampaignMap():
             if dataIn['type'] == "primary":
                 self.assertItemsEqual(dataIn, {"type": "primary", "campaign": tChainSpec['Task1']['Campaign'],
diff --git a/test/python/WMCore_t/MicroService_t/Tools_t/Common_t.py b/test/python/WMCore_t/MicroService_t/Tools_t/Common_t.py
@@ -18,7 +18,8 @@ class CommonTest(unittest.TestCase):
     """Unit test for Common module"""
 
     def setUp(self):
-        self.dbsUrl = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
+        #self.dbsUrl = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
+        self.dbsUrl = "https://cmsweb.cern.ch/dbs/prod/global/DBSReader"
         self.datasets = ['/ZMM/Summer11-DESIGN42_V11_428_SLHC1-v1/GEN-SIM',
                          '/ZMM_14TeV/Summer12-DESIGN42_V17_SLHCTk-v1/GEN-SIM']
         self.child = ['/SingleElectron/Run2016B-18Apr2017_ver2-v1/AOD']
diff --git a/test/python/WMCore_t/ReqMgr_t/Utils_t/Validation_t.py b/test/python/WMCore_t/ReqMgr_t/Utils_t/Validation_t.py
@@ -24,7 +24,8 @@ def testValidateOutputDatasets(self):
         """
         Test the validateOutputDatasets function
         """
-        dbsUrl = 'https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader/'
+        #dbsUrl = 'https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader/'
+        dbsUrl = 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader/'
 
         outputDsets = ['/PD1/AcqEra1-ProcStr1-v1/GEN']
         self.assertIsNone(validateOutputDatasets(outputDsets, dbsUrl))
diff --git a/test/python/WMCore_t/Services_t/DBS_t/DBSReader_t.py b/test/python/WMCore_t/Services_t/DBS_t/DBSReader_t.py
@@ -44,7 +44,8 @@ def setUp(self):
         Initialize the PhEDEx API to point at the test server.
         """
 
-        self.endpoint = 'https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader'
+        #self.endpoint = 'https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader'
+        self.endpoint = 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader'
         self.dbs = None
         super(DBSReaderTest, self).setUp()
         if PY3:
@@ -258,7 +259,8 @@ def testListFileBlockLocation(self):
                     'ea0972193530f531086947d06eb0f121/USER#fb978442-a61b-413a-b4f4-526e6cdb142e'
         DBS_BLOCK2 = '/GenericTTbar/hernan-140317_231446_crab_JH_ASO_test_T2_ES_CIEMAT_5000_100_140318_0014-' + \
                      'ea0972193530f531086947d06eb0f121/USER#0b04d417-d734-4ef2-88b0-392c48254dab'
-        self.dbs = DBSReader('https://cmsweb-prod.cern.ch/dbs/prod/phys03/DBSReader/')
+        #self.dbs = DBSReader('https://cmsweb-prod.cern.ch/dbs/prod/phys03/DBSReader/')
+        self.dbs = DBSReader('https://cmsweb.cern.ch/dbs/prod/phys03/DBSReader/')
 
         self.assertEqual(self.dbs.listFileBlockLocation(BLOCK), [])
         # This block is only found on DBS
diff --git a/test/python/WMCore_t/Services_t/WMStats_t/WMStatsDocGenerator.py b/test/python/WMCore_t/Services_t/WMStats_t/WMStatsDocGenerator.py
@@ -430,7 +430,8 @@ def generate_jobsummary(request, number=NUM_OF_JOBS_PER_REQUEST):
  'DQMHarvestUnit': 'multiRun',
  'DQMUploadUrl': 'https://cmsweb-testbed.cern.ch/dqm/dev',
  'Dashboard': 'integration',
- 'DbsUrl': 'https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader',
+ #'DbsUrl': 'https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader',
+ 'DbsUrl': 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader',
  'GlobalTag': 'GR_R_73_V0A',
  'GracePeriod': 1000,
  'Group': 'DATAOPS',
diff --git a/test/python/WMCore_t/WMRuntime_t/Scripts_t/SetupCMSSWPset_t.py b/test/python/WMCore_t/WMRuntime_t/Scripts_t/SetupCMSSWPset_t.py
@@ -259,7 +259,8 @@ def testPileupSetup(self):
         # modifications of job input files
         pileupConfig = {"data": ["/Mu/PenguinsPenguinsEverywhere-SingleMu-HorriblyJaundicedYellowEyedPenginsSearchingForCarrots-v31/RECO"],
                         "mc": ["/Mu/PenguinsPenguinsEverywhere-SingleMu-HorriblyJaundicedYellowEyedPenginsSearchingForCarrots-v31/RECO"]}
-        dbsUrl = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
+        #dbsUrl = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
+        dbsUrl = "https://cmsweb.cern.ch/dbs/prod/global/DBSReader"
         setupScript.step.setupPileup(pileupConfig, dbsUrl)
         # SetupCMSSWPset pileup handling will be consulting SiteLocalConfig
         # to determine StorageElement (SE) name the job is running on
diff --git a/test/python/WMCore_t/WMSpec_t/StdSpecs_t/DQMHarvest_t.py b/test/python/WMCore_t/WMSpec_t/StdSpecs_t/DQMHarvest_t.py
@@ -30,7 +30,8 @@
     "DQMConfigCacheID": "253c586d672c6c7a88c048d8c7b62135",
     "DQMHarvestUnit": "byRun",
     "DQMUploadUrl": "https://cmsweb-testbed.cern.ch/dqm/dev",
-    "DbsUrl": "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader",
+    #"DbsUrl": "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader",
+    "DbsUrl": "https://cmsweb.cern.ch/dbs/prod/global/DBSReader",
     "GlobalTag": "80X_dataRun2_2016SeptRepro_v3",
     "InputDataset": "/NoBPTX/Run2016F-23Sep2016-v1/DQMIO",
     "Memory": 1000,
diff --git a/test/python/WMCore_t/WMSpec_t/TestSpec.py b/test/python/WMCore_t/WMSpec_t/TestSpec.py
@@ -47,7 +47,8 @@ def setupProcessingTask(self, procTask):
 
         procTask.addInputDataset(name="/MinimumBias/Comissioning10-v4/RAW",
                                  primary="MinimumBias", processed="Comissioning10-v4", tier="RAW",
-                                 dbsurl="https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader",
+                                 #dbsurl="https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader",
+                                 dbsurl="https://cmsweb.cern.ch/dbs/prod/global/DBSReader",
                                  block_blacklist=[], block_whitelist=[],
                                  run_blacklist=[], run_whitelist=[])
         procTask.data.constraints.sites.whitelist = []
diff --git a/test/python/WMCore_t/WMSpec_t/TestWorkloads.py b/test/python/WMCore_t/WMSpec_t/TestWorkloads.py
@@ -12,7 +12,8 @@
 
 def oneTaskTwoStep():
     workload = newWorkload("OneTaskTwoStepTest")
-    workload.setDbsUrl("https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader")
+    #workload.setDbsUrl("https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader")
+    workload.setDbsUrl("https://cmsweb.cern.ch/dbs/prod/global/DBSReader")
 
     task1 = workload.newTask("FirstTask")
 
@@ -29,7 +30,8 @@ def oneTaskTwoStep():
 
 def oneTaskFourStep():
     workload = newWorkload("OneTaskFourStepTest")
-    workload.setDbsUrl("https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader")
+    #workload.setDbsUrl("https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader")
+    workload.setDbsUrl("https://cmsweb.cern.ch/dbs/prod/global/DBSReader")
 
     task1 = workload.newTask("FirstTask")
 
@@ -50,7 +52,8 @@ def oneTaskFourStep():
 
 def twoTaskTree():
     workload = newWorkload("TwoTaskTree")
-    workload.setDbsUrl("https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader")
+    #workload.setDbsUrl("https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader")
+    workload.setDbsUrl("https://cmsweb.cern.ch/dbs/prod/global/DBSReader")
 
     task1 = workload.newTask("FirstTask")
 
diff --git a/test/python/WMCore_t/WMSpec_t/WMWorkload_t.py b/test/python/WMCore_t/WMSpec_t/WMWorkload_t.py
@@ -338,7 +338,8 @@ def testDbsUrl(self):
         """
         testWorkload = TestSpecs.oneTaskTwoStep()
         url = testWorkload.getDbsUrl()
-        self.assertEqual(url, "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader")
+        #self.assertEqual(url, "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader")
+        self.assertEqual(url, "https://cmsweb.cern.ch/dbs/prod/global/DBSReader")
         return
 
     def testGetSiteWhitelist(self):
diff --git a/test/python/WMCore_t/WMSpec_t/samples/MultiTaskProcessingWorkload.py b/test/python/WMCore_t/WMSpec_t/samples/MultiTaskProcessingWorkload.py
@@ -7,7 +7,8 @@
 """
 from WMCore.WMSpec.WMWorkload import newWorkload
 
-DBSURL = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
+#DBSURL = "https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader"
+DBSURL = "https://cmsweb.cern.ch/dbs/prod/global/DBSReader"
 
 #  //
 # // Set up the basic workload task and step structure
diff --git a/test/python/WMQuality_t/Emulators_t/DBSClient_t/MockDbsApi_t.py b/test/python/WMQuality_t/Emulators_t/DBSClient_t/MockDbsApi_t.py
@@ -23,7 +23,8 @@ class MockDbsApiTest(ExtendedUnitTestCase):
     """
 
     def setUp(self):
-        self.endpoint = 'https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader'
+        #self.endpoint = 'https://cmsweb-prod.cern.ch/dbs/prod/global/DBSReader'
+        self.endpoint = 'https://cmsweb.cern.ch/dbs/prod/global/DBSReader'
         self.realDBS = DbsApi(self.endpoint)
         self.mockDBS = MockDbsApi(self.endpoint)
         return
