File tree Expand file tree Collapse file tree 4 files changed +19
-8
lines changed Expand file tree Collapse file tree 4 files changed +19
-8
lines changed Original file line number Diff line number Diff line change @@ -277,7 +277,7 @@ services:
277
277
- DIRACX_SERVICE_AUTH_STATE_KEY=uSNPPtZ1EbC5np13zOwmWJ84Duix753Hejzk/u/MQE4=
278
278
# Obtained with echo 'InsecureChangeMe' | base64 -d | openssl sha256
279
279
- DIRACX_LEGACY_EXCHANGE_HASHED_API_KEY=07cddf6948d316ac9d186544dc3120c4c6697d8f994619665985c0a5bf76265a
280
- - DIRACX_SERVICE_JOBS_ENABLED=false
280
+ - DIRACX_SERVICE_JOBS_ENABLED=true
281
281
ports :
282
282
- 8000:8000
283
283
depends_on :
Original file line number Diff line number Diff line change @@ -52,12 +52,15 @@ cd ..
52
52
53
53
echo -e " *** $( date -u) **** Got the DIRAC tests ****\n"
54
54
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
56
59
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
61
64
62
65
echo -e " *** $( date -u) **** Client INSTALLATION START ****\n"
63
66
Original file line number Diff line number Diff line change @@ -45,7 +45,11 @@ echo -e "*** $(date -u) **** Got the DIRAC tests ****\n"
45
45
46
46
echo -e " *** $( date -u) **** Server INSTALLATION START ****\n"
47
47
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
+
49
53
sed -i " 0,/\(Host = \).*/s//\1$SERVER_HOST /" " ${INSTALL_CFG_FILE} "
50
54
51
55
X509_CERT_DIR=$SERVERINSTALLDIR /etc/grid-security/certificates/ fullInstallDIRAC
Original file line number Diff line number Diff line change @@ -19,7 +19,11 @@ cd "$INSTALLROOT" || exit 1
19
19
20
20
# shellcheck source=tests/CI/CONFIG
21
21
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
23
27
24
28
echo -e " *** $( date -u) **** Starting integration tests on ${INSTALLTYPE} ****\n"
25
29
You can’t perform that action at this time.
0 commit comments