From ad4c8f8394d3f325b05e4f7be1e3faf53e3649ac Mon Sep 17 00:00:00 2001 From: Eric Cano <Eric.Cano@cern.ch> Date: Thu, 16 Nov 2017 14:39:37 +0100 Subject: [PATCH] Fixed logs permissions and added symlink to config file for buildtree. --- .../docker/ctafrontend/cc7/opt/run/bin/init_pod.sh | 1 + .../docker/ctafrontend/cc7/opt/run/bin/mkSymlinks.sh | 5 ++++- xroot_plugins/cta-frontend-xrootd.conf | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init_pod.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init_pod.sh index 58f66d6588..cd8a60fb14 100755 --- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init_pod.sh +++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init_pod.sh @@ -46,6 +46,7 @@ if [[ -n ${BUILDTREE_BASE} ]]; then chmod 666 /dev/nst* /dev/st* /dev/sg* # creating /var/log/cta needed by taped mkdir -p /var/log/cta + chmod a+rwx /var/log/cta else # some yum optimisations for the standard system SQUID_PROXY=squid.kube-system.svc.cluster.local diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/mkSymlinks.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/mkSymlinks.sh index bd871e691b..f4fd431ebc 100755 --- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/mkSymlinks.sh +++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/mkSymlinks.sh @@ -2,6 +2,9 @@ # make symbolic links to all CTA binaries. -echo Creating symlinks for CTA binaries and symlinks. +echo Creating symlinks for CTA binaries. ln -s -v -t /usr/bin `find ${BUILDTREE_BASE}/${BUILDTREE_SUBDIR} -type f -executable | egrep -v '\.so(\.|$)' | egrep -v '\.sh$' | grep -v RPM/BUILD | grep -v CMake | grep -v CPack` +echo Creating symlinks for CTA libraries. find ${BUILDTREE_BASE}/${BUILDTREE_SUBDIR} | grep '.so$' | xargs -itoto ln -s -v -t /usr/lib64 toto +echo Creating symlink for frontend configuration file. +ln -s -v -t /etc/cta `perl -e 'while (<>) { if (/cta_SOURCE_DIR:STATIC=(.*)/ ) { print $1."\n"; } }' < ${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/CMakeCache.txt`/xroot_plugins/cta-frontend-xrootd.conf diff --git a/xroot_plugins/cta-frontend-xrootd.conf b/xroot_plugins/cta-frontend-xrootd.conf index 2cb7237f6a..062bbd45e3 100644 --- a/xroot_plugins/cta-frontend-xrootd.conf +++ b/xroot_plugins/cta-frontend-xrootd.conf @@ -43,4 +43,3 @@ all.export /ctafrontend nolock r/w # a substring of '/ctafrontend', so it is not possible to simply export '/'. all.export /Y3Rh all.export /L3Vzci9iaW4vY3Rh - -- GitLab