Skip to content

Commit efa0001

Browse files
committed
test: create a proxy with --nocs before configuring
1 parent 37d1f41 commit efa0001

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

src/DIRAC/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,5 +318,6 @@ def extension_metadata():
318318
"priority": 0,
319319
"setups": {
320320
"DIRAC-Certification": "https://lbcertifdirac70.cern.ch:9135/Configuration/Server",
321+
"DIRAC-CI": "https://server:9135/Configuration/Server",
321322
},
322323
}

tests/Jenkins/dirac_ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ installSite() {
141141
# We make a relative symlink on purpose (i.e. not the full path to ca.cert.pem)
142142
# because otherwise the BundleDeliveryClient will send the full path, which
143143
# will be wrong on the client
144-
ln -s "${SERVERINSTALLDIR}/diracos/etc/grid-security/certificates/ca.cert.pem" "${SERVERINSTALLDIR}/diracos/etc/grid-security/certificates/$caHash.0"
144+
ln -s "ca.cert.pem" "${SERVERINSTALLDIR}/diracos/etc/grid-security/certificates/$caHash.0"
145145

146146
rm -rf "${SERVERINSTALLDIR}/etc"
147147
ln -s "${SERVERINSTALLDIR}/diracos/etc" "${SERVERINSTALLDIR}/etc"

tests/Jenkins/utilities.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,10 @@ installDIRAC() {
279279
fi
280280

281281
# now configuring
282-
282+
if ! dirac-proxy-init --nocs --no-upload; then
283+
echo 'ERROR: dirac-proxy-init failed' >&2
284+
exit 1
285+
fi
283286
if [[ -n "${INSTALLATION_BRANCH}" ]]; then
284287
# Use this for (e.g.) running backward-compatibility tests
285288
cmd="dirac-configure -S ${DIRACSETUP} -C ${CSURL} --SkipCAChecks ${CONFIGUREOPTIONS} ${DEBUG}"

0 commit comments

Comments
 (0)