Skip to content

Commit a1bc1b1

Browse files
Robin VAN DE MERGHELRobin-Van-de-Merghel
authored andcommitted
fix: Applied changes to the ci workflows
1 parent 282efcb commit a1bc1b1

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.github/workflows/integration.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ jobs:
3737
ARGS: DIRAC_USE_JSON_ENCODE=NO MYSQL_VER=mysql:8.0.40
3838
- TEST_NAME: "Backward Compatibility"
3939
ARGS: CLIENT_INSTALLATION_BRANCH=rel-v8r0 PILOT_INSTALLATION_BRANCH=rel-v8r0
40+
- TEST_NAME: "NoTestDIRACX"
41+
ARGS: TEST_DIRACX=No
4042

4143
steps:
4244
- uses: actions/checkout@v4
@@ -57,7 +59,7 @@ jobs:
5759
requests \
5860
typer
5961
- name: Prepare environment
60-
run: ./integration_tests.py prepare-environment TEST_DIRACX=Yes ${{ matrix.ARGS }}
62+
run: ./integration_tests.py prepare-environment ${{ matrix.ARGS }}
6163
- name: Install server
6264
run: ./integration_tests.py install-server
6365
- name: Install client

integration_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"DIRACOSVER": "master",
3131
"DIRACOS_TARBALL_PATH": None,
3232
"TEST_HTTPS": "No",
33-
"TEST_DIRACX": "No",
33+
"TEST_DIRACX": "Yes",
3434
"DIRAC_FEWER_CFG_LOCKS": None,
3535
"DIRAC_USE_JSON_ENCODE": None,
3636
"INSTALLATION_BRANCH": "",

src/DIRAC/Core/Tornado/Client/ClientSelector.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from DIRAC.Core.DISET.RPCClient import RPCClient
1717
from DIRAC.Core.DISET.TransferClient import TransferClient
1818
from DIRAC.Core.Tornado.Client.TornadoClient import TornadoClient
19-
import traceback
2019

2120
sLog = gLogger.getSubLogger(__name__)
2221

@@ -86,7 +85,7 @@ def ClientSelector(disetClient, *args, **kwargs): # We use same interface as RP
8685
# If anything went wrong in the resolution, we return default RPCClient
8786
# So the behaviour is exactly the same as before implementation of Tornado
8887
sLog.warn("Could not select DISET or Tornado client", f"{repr(e)}")
89-
print(traceback.format_exc())
88+
sLog.exception()
9089
return disetClient(*args, **kwargs)
9190

9291

tests/Jenkins/utilities.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ installDIRAC() {
294294

295295
function installDIRACX() {
296296
# Get the latest tag from GitHub
297-
latest_tag=$(git ls-remote --tags https://github.com/DIRACGrid/diracx.git | awk -F/ '{print $NF}' | grep -v '{}' | sort -V | tail -n1)
297+
latest_tag=$(curl -s "https://api.github.com/repos/DIRACGrid/diracx/releases" | jq -r '.[].tag_name' | sort -V | tail -n 1)
298298

299299
echo "Installing from tag: $latest_tag"
300300

0 commit comments

Comments
 (0)