diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 4d26bc42ba1..7ee77ee18e3 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -36,7 +36,7 @@ jobs: - TEST_NAME: "Force DEncode and MySQL8" 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 + ARGS: CLIENT_INSTALLATION_BRANCH=rel-v9r0 PILOT_INSTALLATION_BRANCH=rel-v9r0 - TEST_NAME: "Test DiracX latest" ARGS: TEST_DIRACX=Yes diff --git a/integration_tests.py b/integration_tests.py index f46b8c7c5b6..96b4a8d1b39 100755 --- a/integration_tests.py +++ b/integration_tests.py @@ -738,7 +738,7 @@ def _check_containers_running(*, is_up=True): def _find_dirac_release(): # Start by looking for the GitHub/GitLab environment variables - if "GITHUB_BASE_REF" in os.environ: # this will be "rel-v8r0" + if "GITHUB_BASE_REF" in os.environ: # this will be "rel-v9r0" return os.environ["GITHUB_BASE_REF"] if "CI_COMMIT_REF_NAME" in os.environ: return os.environ["CI_COMMIT_REF_NAME"] diff --git a/tests/CI/install_client.sh b/tests/CI/install_client.sh index 324902c4868..a1fa7081746 100755 --- a/tests/CI/install_client.sh +++ b/tests/CI/install_client.sh @@ -54,11 +54,6 @@ echo -e "*** $(date -u) **** Got the DIRAC tests ****\n" source "${DIRAC_CI_SETUP_SCRIPT}" -if [[ -n "${INSTALLATION_BRANCH}" ]]; then - # shellcheck disable=SC2034 - DIRACSETUP=$(< "${INSTALL_CFG_FILE}" grep "Setup = " | cut -f5 -d " ") -fi - echo -e "*** $(date -u) **** Client INSTALLATION START ****\n" installDIRAC diff --git a/tests/Jenkins/utilities.sh b/tests/Jenkins/utilities.sh index 2a020e578e7..c9bdb9929d2 100644 --- a/tests/Jenkins/utilities.sh +++ b/tests/Jenkins/utilities.sh @@ -325,12 +325,7 @@ installDIRAC() { configureArgs+=("--LegacyExchangeApiKey=diracx:legacy:InsecureChangeMe") fi - if [[ -n "${INSTALLATION_BRANCH}" ]]; then - # Use this for (e.g.) running backward-compatibility tests - cmd="dirac-configure -S ${DIRACSETUP} -C ${CSURL} --SkipCAChecks "${configureArgs[@]}" ${CONFIGUREOPTIONS} ${DEBUG}" - else - cmd="dirac-configure -C ${CSURL} --SkipCAChecks ${CONFIGUREOPTIONS} ${DEBUG}" - fi + cmd="dirac-configure -C ${CSURL} --SkipCAChecks ${CONFIGUREOPTIONS} ${DEBUG}" if ! bash -c "${cmd}"; then echo 'ERROR: dirac-configure failed' >&2 exit 1