Skip to content

Commit ed1d670

Browse files
committed
sweep: DIRACGrid#8076 integration test fixes (actually mounting volumes)
1 parent 6444057 commit ed1d670

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

tests/CI/docker-compose.yml

+13
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ volumes:
33
diracx-cs-store:
44
# Volume used to store the pair of keys to sign the tokens
55
diracx-key-store:
6+
# Volume used to store the certificates of dirac
7+
certs_data:
68
# Volume used to store the jwks of the IAM service
79
diracx-iam-key-store:
810

@@ -99,6 +101,14 @@ services:
99101
mysql:
100102
condition: service_healthy
101103
command: /home/dirac/LocalRepo/ALTERNATIVE_MODULES/DIRAC/tests/CI/check_db_initialized.sh
104+
105+
dirac-init-certificates:
106+
image: ghcr.io/diracgrid/management/certificates-generation:latest
107+
container_name: dirac-init-certificates
108+
volumes:
109+
- certs_data:/ca/certs/
110+
entrypoint: |
111+
/entrypoint.sh
102112
pull_policy: always
103113

104114
dirac-server:
@@ -125,6 +135,7 @@ services:
125135
volumes:
126136
- diracx-cs-store:/cs_store
127137
- diracx-key-store:/signing-key
138+
- certs_data:/ca/certs
128139
environment:
129140
- DIRACX_CONFIG_BACKEND_URL=git+file:///cs_store/initialRepo
130141
- DIRACX_SERVICE_AUTH_TOKEN_KEY=file:///signing-key/rs256.key
@@ -139,6 +150,8 @@ services:
139150
user: "${DIRAC_UID}:${DIRAC_GID}"
140151
depends_on:
141152
- dirac-server
153+
volumes:
154+
- certs_data:/ca/certs
142155
ulimits:
143156
nofile: 8192
144157
pull_policy: always

tests/Jenkins/utilities.sh

+5
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,11 @@ installDIRAC() {
269269
echo "$DIRAC"
270270
echo "$PATH"
271271

272+
if ! dirac-proxy-init -g dirac_admin --nocs --no-upload -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" "${DEBUG}"; then
273+
echo 'ERROR: dirac-proxy-init --nocs --no-upload failed' >&2
274+
exit 1
275+
fi
276+
272277
# now configuring
273278

274279
if [[ -n "${INSTALLATION_BRANCH}" ]]; then

0 commit comments

Comments
 (0)