From cc4f7f98c507bb19a3b37e7a346ff190713c8528 Mon Sep 17 00:00:00 2001
From: Volodymyr Yurchenko <volodymyr.yurchenko@cern.ch>
Date: Mon, 4 Apr 2022 15:38:58 +0200
Subject: [PATCH] [CI] Remove legacy ACL rules from CI
---
.../docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh | 4 ++--
.../ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
index bfbd5ff3af..a1abc9e9d4 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
@@ -323,7 +323,7 @@ fi
# ACLs in EOS are evaluated when unix permissions are failing, hence the 555 unix permission.
eos mkdir ${CTA_TEST_DIR}
eos chmod 555 ${CTA_TEST_DIR}
- eos attr set sys.acl=g:eosusers:rwx!d,u:poweruser1:rwx+dp,u:poweruser2:rwx+dp,z:'!'u,u:root:+u ${CTA_TEST_DIR}
+ eos attr set sys.acl=g:eosusers:rwx!d,u:poweruser1:rwx+dp,u:poweruser2:rwx+dp,z:'!'u'!'d ${CTA_TEST_DIR}
eos attr set sys.archive.storage_class=ctaStorageClass ${CTA_TEST_DIR}
# Link the attributes of CTA worklow directory to the test directory
@@ -335,7 +335,7 @@ fi
# This directory is created inside ${CTA_TEST_DIR}.
# ACLs in EOS are evaluated when unix permissions are failing, hence the 555 unix permission.
eos mkdir ${CTA_TEST_NO_P_DIR}
- eos attr set sys.acl=g:eosusers:rwx!d,u:poweruser1:rwx+d,u:poweruser2:rwx+d,z:'!'u,u:root:+u ${CTA_TEST_NO_P_DIR}
+ eos attr set sys.acl=g:eosusers:rwx!d,u:poweruser1:rwx+d,u:poweruser2:rwx+d,z:'!'u'!'d ${CTA_TEST_NO_P_DIR}
# Prepare the tmp dir so that we can test that the EOS instance is OK
eos mkdir ${EOS_TMP_DIR}
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh
index 76888301c3..0ea3221998 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/eos_configure_preprod.sh
@@ -19,7 +19,7 @@ PREPROD_DIR=/eos/ctaeos/preprod
eos mkdir ${PREPROD_DIR}
eos chmod 555 ${PREPROD_DIR}
-eos attr set sys.acl=g:eosusers:rwx!d,u:poweruser1:rwx+dp,u:poweruser2:rwx+dp,z:'!'u,u:root:+u ${PREPROD_DIR}
+eos attr set sys.acl=g:eosusers:rwx!d,u:poweruser1:rwx+dp,u:poweruser2:rwx+dp,z:'!'u'!'d ${PREPROD_DIR}
eos attr set sys.archive.storage_class=ctaStorageClass ${PREPROD_DIR}
--
GitLab