Skip to content

Commit ac22d9d

Browse files
Robin VAN DE MERGHELRobin-Van-de-Merghel
authored andcommitted
feat: Add DiracX tests into DIRAC CI, and use only latest tag.
1 parent 0ebf454 commit ac22d9d

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
requests \
5858
typer
5959
- name: Prepare environment
60-
run: ./integration_tests.py prepare-environment ${{ matrix.ARGS }}
60+
run: ./integration_tests.py prepare-environment TEST_DIRACX=Yes ${{ matrix.ARGS }}
6161
- name: Install server
6262
run: ./integration_tests.py install-server
6363
- name: Install client

tests/Jenkins/utilities.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,11 @@ installDIRAC() {
292292
# Arguments: list of DiracX submodule module names to install (core, client, etc.)
293293

294294
function installDIRACX() {
295+
# Get the latest tag from GitHub
296+
latest_tag=$(git ls-remote --tags https://github.com/DIRACGrid/diracx.git | awk -F/ '{print $NF}' | grep -v '{}' | sort -V | tail -n1)
297+
298+
echo "Installing from tag: $latest_tag"
299+
295300
for wheel_name in "$@"; do
296301
if [[ -n "${DIRACX_CUSTOM_SOURCE_PREFIXES:-}" ]]; then
297302
wheels=( $(find "${DIRACX_CUSTOM_SOURCE_PREFIXES}" -name "diracx_${wheel_name}-*.whl") )
@@ -301,7 +306,7 @@ function installDIRACX() {
301306
fi
302307
pip install "${wheels[0]}"
303308
else
304-
pip install "git+https://github.com/DIRACGrid/diracx.git@main#egg=diracx-${wheel_name}&subdirectory=diracx-${wheel_name}"
309+
pip install "git+https://github.com/DIRACGrid/diracx.git@${latest_tag}#egg=diracx-${wheel_name}&subdirectory=diracx-${wheel_name}"
305310
fi
306311
done
307312
}

0 commit comments

Comments
 (0)