print

.gitlab-ci.yml

@@ -67,11 +67,20 @@ copy:
   # 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 "eos root://eoshome-a.cern.ch squash new $EOS_PATH$PACKAGE_DIR"
-  #- ssh ${EOS_ACCOUNT_USERNAME}@lxplus "cp -r $EOS_PATH$CONTENT_DIR/. $EOS_PATH$PACKAGE_DIR/"
-  #- ssh ${EOS_ACCOUNT_USERNAME}@lxplus "eos root://eoshome-a.cern.ch squash pack $EOS_PATH$PACKAGE_DIR"
 
 
+Test deploy:
+  <<: *base_deploy
+  variables:
+    <<: *dev_variables
+
+Deploy:
+  <<: *base_deploy
+  only:
+  - master
+  variables:
+    <<: *master_variables
+
 Test squashfs:
   <<: *add_squashfs
   variables:
@@ -84,16 +93,4 @@ squashfs:
     <<: *master_variables
     <<: *common_variables
   only:
-  - master
-
-Test deploy:
-  <<: *base_deploy
-  variables:
-    <<: *dev_variables
-
-Deploy:
-  <<: *base_deploy
-  only:
-  - master
-  variables:
-    <<: *master_variables
+  - master
\ No newline at end of file

.gitlab/squashfs.sh

@@ -6,9 +6,8 @@
 # $3: The subdirectory to copy into the package
 
 echo "Params given as input: "
-echo "EOS path: $1"
-echo "Package directory: $2"
-echo "Content directory: $3"
+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/