Skip to content

Commit 3214d64

Browse files
committed
test: copy over certs for Pilot
1 parent efa0001 commit 3214d64

File tree

3 files changed

+15
-32
lines changed

3 files changed

+15
-32
lines changed

integration_tests.py

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -396,33 +396,6 @@ def install_server():
396396
check=True,
397397
)
398398

399-
typer.secho("Copying credentials and certificates", fg=c.GREEN)
400-
base_cmd = _build_docker_cmd("client", tty=False)
401-
subprocess.run(
402-
base_cmd
403-
+ [
404-
"mkdir",
405-
"-p",
406-
"/home/dirac/ServerInstallDIR/user",
407-
"/home/dirac/ClientInstallDIR/etc",
408-
"/home/dirac/.globus",
409-
],
410-
check=True,
411-
)
412-
413-
base_cmd = _build_docker_cmd("pilot", tty=False)
414-
subprocess.run(
415-
base_cmd
416-
+ [
417-
"mkdir",
418-
"-p",
419-
"/home/dirac/ServerInstallDIR/user",
420-
"/home/dirac/PilotInstallDIR/etc",
421-
"/home/dirac/.globus",
422-
],
423-
check=True,
424-
)
425-
426399

427400
@app.command()
428401
def install_client():

tests/CI/install_client.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ source CONFIG
1616
# shellcheck disable=SC2034
1717
CSURL=https://$SERVER_HOST:9135/Configuration/Server
1818

19+
mkdir -p /home/dirac/ClientInstallDIR/etc
20+
mkdir -p /home/dirac/.globus
21+
1922
echo -e "*** $(date -u) **** Getting the tests ****\n"
2023

2124
mkdir -p "$PWD/TestCode"

tests/CI/run_pilot.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,18 @@ set -x
1111
source CONFIG
1212

1313
# Creating "the worker node"
14+
mkdir -p /home/dirac/PilotInstallDIR/etc/grid-security/certificates
15+
mkdir -p /home/dirac/PilotInstallDIR/etc/grid-security/vomsdir
16+
mkdir -p /home/dirac/PilotInstallDIR/etc/grid-security/vomses
17+
18+
cp /ca/certs/pilot.pem /home/dirac/PilotInstallDIR/etc/grid-security/hostcert.pem
19+
cp /ca/certs/pilot.key /home/dirac/PilotInstallDIR/etc/grid-security/hostkey.pem
20+
cp /ca/certs/ca.cert.pem /home/dirac/PilotInstallDIR/etc/grid-security/certificates
21+
22+
touch /home/dirac/PilotInstallDIR/etc/grid-security/vomsdir/vomsdir
23+
touch /home/dirac/PilotInstallDIR/etc/grid-security/vomses/vomses
24+
1425
cd /home/dirac/PilotInstallDIR
15-
mkdir -p etc/grid-security/vomsdir
16-
mkdir -p etc/grid-security/vomses
17-
touch etc/grid-security/vomsdir/vomsdir
18-
touch etc/grid-security/vomses/vomses
1926

2027
eval "${PILOT_DOWNLOAD_COMMAND}"
2128

@@ -29,7 +36,7 @@ elif command -v python2 &> /dev/null; then
2936
py='python2'
3037
fi
3138

32-
more pilot.json
39+
more pilot.json | jq
3340

3441
# shellcheck disable=SC2086
3542
$py ${PILOT_INSTALLATION_COMMAND}

0 commit comments

Comments
 (0)