Skip to content

Commit a5a02bc

Browse files
Robin VAN DE MERGHELRobin-Van-de-Merghel
authored andcommitted
fix: Activate job endpoints in CI
1 parent a1bc1b1 commit a5a02bc

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

tests/CI/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ services:
277277
- DIRACX_SERVICE_AUTH_STATE_KEY=uSNPPtZ1EbC5np13zOwmWJ84Duix753Hejzk/u/MQE4=
278278
# Obtained with echo 'InsecureChangeMe' | base64 -d | openssl sha256
279279
- DIRACX_LEGACY_EXCHANGE_HASHED_API_KEY=07cddf6948d316ac9d186544dc3120c4c6697d8f994619665985c0a5bf76265a
280-
- DIRACX_SERVICE_JOBS_ENABLED=false
280+
- DIRACX_SERVICE_JOBS_ENABLED=true
281281
ports:
282282
- 8000:8000
283283
depends_on:

tests/CI/install_client.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,15 @@ cd ..
5252

5353
echo -e "*** $(date -u) **** Got the DIRAC tests ****\n"
5454

55-
source "${DIRAC_CI_SETUP_SCRIPT}"
55+
if ! source "${DIRAC_CI_SETUP_SCRIPT}"; then
56+
echo "Setup script failed, aborting."
57+
exit 1
58+
fi
5659

57-
if [[ -n "${INSTALLATION_BRANCH}" ]]; then
58-
# shellcheck disable=SC2034
59-
DIRACSETUP=$(< "${INSTALL_CFG_FILE}" grep "Setup = " | cut -f5 -d " ")
60-
fi
60+
if [[ -n "${INSTALLATION_BRANCH}" ]]; then
61+
# shellcheck disable=SC2034
62+
DIRACSETUP=$(< "${INSTALL_CFG_FILE}" grep "Setup = " | cut -f5 -d " ")
63+
fi
6164

6265
echo -e "*** $(date -u) **** Client INSTALLATION START ****\n"
6366

tests/CI/install_server.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ echo -e "*** $(date -u) **** Got the DIRAC tests ****\n"
4545

4646
echo -e "*** $(date -u) **** Server INSTALLATION START ****\n"
4747

48-
source "${DIRAC_CI_SETUP_SCRIPT}"
48+
if ! source "${DIRAC_CI_SETUP_SCRIPT}"; then
49+
echo "Setup script failed, aborting."
50+
exit 1
51+
fi
52+
4953
sed -i "0,/\(Host = \).*/s//\1$SERVER_HOST/" "${INSTALL_CFG_FILE}"
5054

5155
X509_CERT_DIR=$SERVERINSTALLDIR/etc/grid-security/certificates/ fullInstallDIRAC

tests/CI/run_tests.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ cd "$INSTALLROOT" || exit 1
1919

2020
# shellcheck source=tests/CI/CONFIG
2121
source CONFIG
22-
source "${DIRAC_CI_SETUP_SCRIPT}"
22+
23+
if ! source "${DIRAC_CI_SETUP_SCRIPT}"; then
24+
echo "Setup script failed, aborting."
25+
exit 1
26+
fi
2327

2428
echo -e "*** $(date -u) **** Starting integration tests on ${INSTALLTYPE} ****\n"
2529

0 commit comments

Comments
 (0)