Skip to content

test: move to rel-v9r0 for backward compatibility #8573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fstagni merged 1 commit into from
Jun 4, 2026
+3 −13
Merged

test: move to rel-v9r0 for backward compatibility #8573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion integration_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
5 changes: 0 additions & 5 deletions tests/CI/install_client.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions tests/Jenkins/utilities.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading