diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c022ade6a1550a66932e92cbd12c030c4d56c8c7..b16a893f0e6a200d89887bef3c69a7afa4acc53c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,10 +63,9 @@ copy: - 'echo -e "Host *\n\tGSSAPIDelegateCredentials yes\n\tGSSAPITrustDNS yes\n\n" > ~/.ssh/config' script: - PACKAGE_DIR=squashfs/package - - CONTENT_DIR=cgi-folder # make sure to get a forwardable Kerberos ticket so lxplus can access AFS/EOS on behalf of the user - echo "${EOS_ACCOUNT_PASSWORD}" | kinit -f ${EOS_ACCOUNT_USERNAME}@CERN.CH - - ssh ${EOS_ACCOUNT_USERNAME}@lxplus "bash -s" < ./.gitlab/squashfs.sh $EOS_PATH $PACKAGE_DIR $CONTENT_DIR + - ssh ${EOS_ACCOUNT_USERNAME}@lxplus "bash -s" < ./.gitlab/squashfs.sh $EOS_PATH $PACKAGE_DIR Test deploy: diff --git a/.gitlab/squashfs.sh b/.gitlab/squashfs.sh index e92c6b85506170f5723289fea493398df5dbeae1..1a82f8fcf68785524a42a169b62931f02a59019c 100644 --- a/.gitlab/squashfs.sh +++ b/.gitlab/squashfs.sh @@ -3,12 +3,9 @@ # Input: # $1: The EOS path # $2: The subdirectory of the package -# $3: The subdirectory to copy into the package -echo "Params given as input: " echo "Package path: $1$2" -echo "Copied Directory: $1$3" eos root://eoshome-a.cern.ch squash new $1$2 -cp -r $1$3/. $1$2/ +cp -r $1/. $1$2/ eos root://eoshome-a.cern.ch squash pack $1$2