Skip to content

Commit

Permalink
test: removed CESNET from config
Browse files Browse the repository at this point in the history
  • Loading branch information
fstagni committed Nov 4, 2024
1 parent 0b4509a commit c18e33b
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 26 deletions.
13 changes: 10 additions & 3 deletions src/DIRAC/tests/Utilities/testJobDefinitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ def helloWorld_input():
try:
J.setInputSandbox([find_all("exe-script-with-input.py", ".", "DIRAC/tests/Workflow")[0]])
except IndexError: # we are in Jenkins
J.setInputSandbox([find_all("exe-script-with-input.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
J.setInputSandbox(
[find_all("exe-script-with-input.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]]
)
J.setExecutable("exe-script-with-input.py", "", "helloWorld.log")
return endOfAllJobs(J)

Expand All @@ -89,7 +91,13 @@ def helloWorld_input_single():
try:
J.setInputSandbox([find_all("exe-script-with-input-single-location.py", ".", "DIRAC/tests/Workflow")[0]])
except IndexError: # we are in Jenkins
J.setInputSandbox([find_all("exe-script-with-input-single-location.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow")[0]])
J.setInputSandbox(
[
find_all(
"exe-script-with-input-single-location.py", os.environ["WORKSPACE"], "DIRAC/tests/Workflow"
)[0]
]
)
J.setExecutable("exe-script-with-input-single-location.py", "", "helloWorld.log")
return endOfAllJobs(J)

Expand Down Expand Up @@ -313,7 +321,6 @@ def parametricJobInputData():
return endOfAllJobs(J)



def jobWithOutput():
"""Creates a job that uploads an output.
The output SE is not set here, so it would use the default /Resources/StorageElementGroups/SE-USER
Expand Down
11 changes: 1 addition & 10 deletions tests/System/exe-script-with-input-single-location.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
#!/usr/bin/env python
###############################################################################
# (c) Copyright 2019 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "LICENSE". #
# #
# In applying this licence, CERN does not waive the privileges and immunities #
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################

"""Script to run Executable application"""
from os import system
import sys
Expand Down
11 changes: 1 addition & 10 deletions tests/System/exe-script-with-input.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
#!/usr/bin/env python
###############################################################################
# (c) Copyright 2019 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "LICENSE". #
# #
# In applying this licence, CERN does not waive the privileges and immunities #
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################

"""Script to run Executable application"""
import sys
from os import system
Expand Down
2 changes: 1 addition & 1 deletion tests/System/transformationSystem.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ directory=/dteam/diracCertification/Test/INIT/$version/$tdate/$stime
#selecting a random USER Storage Element
#SEs=$(dirac-dms-show-se-status |grep USER |grep -v 'Banned\|Degraded\|-2' | awk '{print $1}')
#get all SEs ending with -SE that are Active
SEs=$(dirac-dms-show-se-status | grep -e "-SE \|-disk" | grep -v 'RAL\|CESNET-SE\|Banned\|Probing\|Error\|-new' | awk '{print $1}')
SEs=$(dirac-dms-show-se-status | grep -e "-SE \|-disk" | grep -v 'RAL\|Banned\|Probing\|Error\|-new' | awk '{print $1}')

x=0
for n in $SEs
Expand Down
2 changes: 1 addition & 1 deletion tests/System/transformation_replication.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ echo "Creating TransformationSystemTest"
mkdir -p TransformationSystemTest
directory=/dteam/diracCertification/Test/INIT/$version/$tdate/$stime/replication
#get all SEs ending with -SE that are Active, randomize, turn into array
SEs=( $(dirac-dms-show-se-status | grep -e "-SE \|-disk " | grep -v 'RAL\|CESNET\|Banned\|Probing\|Error\|-new' | awk '{print $1}' | sort -R | xargs) )
SEs=( $(dirac-dms-show-se-status | grep -e "-SE \|-disk " | grep -v 'RAL\|Banned\|Probing\|Error\|-new' | awk '{print $1}' | sort -R | xargs) )

SOURCE_SE=${SEs[0]}
TARGET_SE=${SEs[1]}
Expand Down
5 changes: 4 additions & 1 deletion tests/System/unitTestUserJobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ def setUp(self):
sys.exit(1)

res = DataManager().getReplicas(
["/dteam/user/f/fstagni/test/testInputFileSingleLocation.txt", "/dteam/user/f/fstagni/test/testInputFile.txt"]
[
"/dteam/user/f/fstagni/test/testInputFileSingleLocation.txt",
"/dteam/user/f/fstagni/test/testInputFile.txt",
]
)
if not res["OK"]:
print(f"DATAMANAGER.getRepicas failure: {res['Message']}")
Expand Down

0 comments on commit c18e33b

Please sign in to comment.