Skip to content

Commit d20fbd7

Browse files
committed
fix: no need for docker cp: certificates from the volume
1 parent 3bfa477 commit d20fbd7

File tree

2 files changed

+1
-59
lines changed

2 files changed

+1
-59
lines changed

integration_tests.py

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -409,35 +409,6 @@ def install_server():
409409
],
410410
check=True,
411411
)
412-
for path in [
413-
"etc/grid-security",
414-
"user/client.pem",
415-
"user/client.key",
416-
f"/tmp/x509up_u{os.getuid()}",
417-
]:
418-
source = os.path.join("/home/dirac/ServerInstallDIR", path)
419-
ret = subprocess.run(
420-
["docker", "cp", f"server:{source}", "-"],
421-
check=True,
422-
text=False,
423-
stdout=subprocess.PIPE,
424-
)
425-
if path.startswith("user/"):
426-
dest = f"client:/home/dirac/ServerInstallDIR/{os.path.dirname(path)}"
427-
elif path.startswith("/"):
428-
dest = f"client:{os.path.dirname(path)}"
429-
else:
430-
dest = f"client:/home/dirac/ClientInstallDIR/{os.path.dirname(path)}"
431-
subprocess.run(["docker", "cp", "-", dest], check=True, text=False, input=ret.stdout)
432-
subprocess.run(
433-
base_cmd
434-
+ [
435-
"bash",
436-
"-c",
437-
"cp /home/dirac/ServerInstallDIR/user/client.* /home/dirac/.globus/",
438-
],
439-
check=True,
440-
)
441412

442413
base_cmd = _build_docker_cmd("pilot", tty=False)
443414
subprocess.run(
@@ -451,35 +422,6 @@ def install_server():
451422
],
452423
check=True,
453424
)
454-
for path in [
455-
"etc/grid-security",
456-
"user/client.pem",
457-
"user/client.key",
458-
f"/tmp/x509up_u{os.getuid()}",
459-
]:
460-
source = os.path.join("/home/dirac/ServerInstallDIR", path)
461-
ret = subprocess.run(
462-
["docker", "cp", f"server:{source}", "-"],
463-
check=True,
464-
text=False,
465-
stdout=subprocess.PIPE,
466-
)
467-
if path.startswith("user/"):
468-
dest = f"pilot:/home/dirac/ServerInstallDIR/{os.path.dirname(path)}"
469-
elif path.startswith("/"):
470-
dest = f"pilot:{os.path.dirname(path)}"
471-
else:
472-
dest = f"pilot:/home/dirac/PilotInstallDIR/{os.path.dirname(path)}"
473-
subprocess.run(["docker", "cp", "-", dest], check=True, text=False, input=ret.stdout)
474-
subprocess.run(
475-
base_cmd
476-
+ [
477-
"bash",
478-
"-c",
479-
"cp /home/dirac/ServerInstallDIR/user/client.* /home/dirac/.globus/",
480-
],
481-
check=True,
482-
)
483425

484426

485427
@app.command()

tests/Jenkins/dirac_ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ source "${TESTCODE}/DIRAC/tests/Jenkins/utilities.sh"
8383
#
8484
# installSite:
8585
#
86-
# This function will install DIRAC
86+
# This function will install DIRAC server
8787
#
8888
#...............................................................................
8989

0 commit comments

Comments
 (0)