feat: Add diracx repo choice in the integration test

Author: Robin-Van-de-Merghel

.github/workflows/integration.yml

@@ -1,5 +1,9 @@
 name: Integration tests
 
+env:
+  DIRACX_REPO: default
+  DIRACX_BRANCH: main
+
 on:
   push:
     paths-ignore:
@@ -37,7 +41,7 @@ jobs:
             ARGS: DIRAC_USE_JSON_ENCODE=NO MYSQL_VER=mysql:8.0.40
           - TEST_NAME: "Backward Compatibility"
             ARGS: CLIENT_INSTALLATION_BRANCH=rel-v8r0 PILOT_INSTALLATION_BRANCH=rel-v8r0
-          - TEST_NAME: "NoTestDIRACX"
+          - TEST_NAME: "TestDIRACX"
             ARGS: TEST_DIRACX=Yes
 
     steps:
@@ -58,8 +62,19 @@ jobs:
             pyyaml \
             requests \
             typer
+    - name: Set DIRACX args
+      if: ${{ contains(matrix.ARGS, 'TEST_DIRACX=Yes') }}
+      run: |
+        if [ "${DIRACX_REPO}" != "default" ]; then
+          echo "DIRACX_REPO=${DIRACX_REPO}" >> $GITHUB_ENV
+          echo "DIRACX_BRANCH=${DIRACX_BRANCH}" >> $GITHUB_ENV
+        else
+          echo "DIRACX_ARGS=" >> $GITHUB_ENV
+        fi
+
     - name: Prepare environment
-      run: ./integration_tests.py prepare-environment ${{ matrix.ARGS }}
+      run: |
+        ./integration_tests.py prepare-environment ${{ matrix.ARGS }} ${DIRACX_ARGS}
     - name: Install server
       run: ./integration_tests.py install-server
     - name: Install client

integration_tests.py

@@ -35,6 +35,8 @@
     "DIRAC_USE_JSON_ENCODE": None,
     "INSTALLATION_BRANCH": "",
     "DEBUG": "Yes",
+    "DIRACX_REPO": "",
+    "DIRACX_BRANCH": "",
 }
 DIRACX_OPTIONS = ()
 DEFAULT_MODULES = {"DIRAC": Path(__file__).parent.absolute()}

tests/CI/install_client.sh

@@ -58,8 +58,8 @@ if ! source "${DIRAC_CI_SETUP_SCRIPT}"; then
 fi
 
 if [[ -n "${INSTALLATION_BRANCH}" ]]; then
-# shellcheck disable=SC2034
-DIRACSETUP=$(< "${INSTALL_CFG_FILE}" grep "Setup = " | cut -f5 -d " ")
+    # shellcheck disable=SC2034
+    DIRACSETUP=$(< "${INSTALL_CFG_FILE}" grep "Setup = " | cut -f5 -d " ")
 fi
 
 echo -e "*** $(date -u) **** Client INSTALLATION START ****\n"

tests/Jenkins/utilities.sh

@@ -293,21 +293,33 @@ installDIRAC() {
 # Arguments: list of DiracX submodule module names to install (core, client, etc.)
 
 function installDIRACX() {
-    # Get the latest tag from GitHub
-  latest_tag=$(git ls-remote --tags https://github.com/DIRACGrid/diracx.git | awk -F/ '{print $NF}' | grep -v '{}' | sort -V | tail -n1)
+  # Determine repo and ref to install from
+  local repo="${DIRACX_REPO:-https://github.com/DIRACGrid/diracx.git}"
+  local ref
 
-  echo "Installing from tag: $latest_tag"
+  if [[ -n "${DIRACX_BRANCH:-}" ]]; then
+    ref="$DIRACX_BRANCH"
+    echo "Installing from branch: $ref"
+  else
+    # fetch latest tag from main repo
+    ref=$(git ls-remote --tags "$repo" \
+      | awk -F/ '{print $NF}' \
+      | grep -v '{}' \
+      | sort -V \
+      | tail -n1)
+    echo "Installing from tag: $ref"
+  fi
 
   for wheel_name in "$@"; do
     if [[ -n "${DIRACX_CUSTOM_SOURCE_PREFIXES:-}" ]]; then
       wheels=( $(find "${DIRACX_CUSTOM_SOURCE_PREFIXES}" -name "diracx_${wheel_name}-*.whl") )
-      if [[ ! ${#wheels[@]} -eq 1 ]]; then
-          echo "ERROR: Multiple or no wheels found for ${wheel_name} in ${DIRACX_CUSTOM_SOURCE_PREFIXES}"
-          exit 1
+      if [[ ${#wheels[@]} -ne 1 ]]; then
+        echo "ERROR: Multiple or no wheels found for ${wheel_name}"
+        exit 1
       fi
       pip install "${wheels[0]}"
     else
-      pip install "git+https://github.com/DIRACGrid/diracx.git@${latest_tag}#egg=diracx-${wheel_name}&subdirectory=diracx-${wheel_name}"
+      pip install "git+${repo}@${ref}#egg=diracx-${wheel_name}&subdirectory=diracx-${wheel_name}"
     fi
   done
 }