Skip to content

Commit 064c5d5

Browse files
committed
Merge branch 'rel-v7r2' into integration
2 parents 767e844 + c6fed1c commit 064c5d5

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
# CLIENT_USE_PYTHON3: No
5151
- TEST_NAME: "Python 3 client"
5252
CLIENT_USE_PYTHON3: Yes
53-
CLIENT_DIRACOSVER: latest
53+
CLIENT_DIRACOSVER: latest
5454

5555
steps:
5656
- uses: actions/checkout@v2

docs/source/AdministratorGuide/HowTo/SystemAdministratorInterface.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Show setup command allows administrators to know which components, Services and
9292
'JobCleaningAgent',
9393
'StatesAccountingAgent']},
9494
'Services': {'Accounting': ['ReportGenerator',
95-
'DataStore'],
95+
'DataStore'],
9696
'Configuration': ['Server'],
9797
'Framework': ['Monitoring',
9898
'BundleDelivery',

tests/Jenkins/utilities.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,9 @@ installDIRAC() {
321321
if [[ "${CLIENT_USE_PYTHON3:-}" == "Yes" ]]; then
322322
if [[ -n "${DIRACOSVER+x}" ]]; then
323323
if [[ "${DIRACOSVER:-}" == "latest" ]]; then
324-
DIRACOS2_URL="https://github.com/DIRACGrid/DIRACOS2/releases/latest/download/DIRACOS-Linux-x86_64.sh"
324+
DIRACOS2_URL="https://github.com/DIRACGrid/DIRACOS2/releases/latest/download/DIRACOS-Linux-x86_64.sh"
325325
else
326-
DIRACOS2_URL="https://github.com/DIRACGrid/DIRACOS2/releases/download/${DIRACOSVER}/DIRACOS-Linux-x86_64.sh"
326+
DIRACOS2_URL="https://github.com/DIRACGrid/DIRACOS2/releases/download/${DIRACOSVER}/DIRACOS-Linux-x86_64.sh"
327327
fi
328328
else
329329
DIRACOS2_URL="https://github.com/DIRACGrid/DIRACOS2/releases/latest/download/DIRACOS-Linux-x86_64.sh"
@@ -336,7 +336,7 @@ installDIRAC() {
336336
source diracos/diracosrc
337337
if [[ -n "${DIRAC_RELEASE+x}" ]]; then
338338
if [[ -z "${ALTERNATIVE_MODULES}" ]]; then
339-
pip install "${DIRAC_RELEASE}"
339+
pip install "${DIRAC_RELEASE}"
340340
fi
341341
fi
342342
for module_path in "${ALTERNATIVE_MODULES[@]}"; do

0 commit comments

Comments
 (0)