Merge pull request #208 from matyasselmeci/pr/pelican-setup

ITB: Use pelican-setup script

Author: matyasselmeci

10-setup-htcondor.sh

@@ -418,6 +418,7 @@ prepare_hook=${script_lib_prefix}prepare-hook
 default_image_executable=${script_exec_prefix}osgvo-default-image
 singularity_extras_lib=${script_lib_prefix}singularity-extras
 ospool_lib=${script_lib_prefix}ospool-lib
+pelican_setup=${script_lib_prefix}pelican-setup
 
 cat <<EOF
 This pilot will accept new jobs for $ACCEPT_JOBS_FOR_HOURS hours, and
@@ -602,6 +603,9 @@ export GLIDEIN_SINGULARITY_BINARY_OVERRIDE=$APPTAINER_PATH
 ${default_image_executable} $glidein_config
 ./main/singularity_setup.sh $glidein_config
 ${singularity_extras_lib}   $glidein_config
+if [[ -e ${pelican_setup} ]]; then
+    ${pelican_setup} $glidein_config
+fi
 
 # run the osgvo userenv advertise script
 cp ${osgvo_advertise_userenv} .

Dockerfile

@@ -119,6 +119,7 @@ RUN git clone --branch ${OSG_FLOCK_BRANCH} https://github.com/${OSG_FLOCK_REPO}
  && install ospool-pilot/itb/pilot/advertise-base                       /usr/sbin/itb-osgvo-advertise-base \
  && install ospool-pilot/itb/pilot/advertise-userenv                    /usr/sbin/itb-osgvo-advertise-userenv \
  && install ospool-pilot/itb/pilot/additional-htcondor-config           /usr/sbin/itb-osgvo-additional-htcondor-config \
+ && install ospool-pilot/itb/pilot/pelican-setup                        /gwms/client_group_itb/itb-pelican-setup \
  && install ospool-pilot/itb/lib/ospool-lib                             /gwms/client_group_itb/itb-ospool-lib \
  && install ospool-pilot/itb/pilot/singularity-extras                   /gwms/client_group_itb/itb-singularity-extras \
  && install job-wrappers/itb-default_singularity_wrapper.sh             /usr/sbin/itb-osgvo-singularity-wrapper \