Condor configuration update (#21)

* bump to condor update performed on 2023-Feb-28

* Pull a clean copy of the current lpc condor configuration at start up

* Fixed boot strap script to have config generation be inside shell and not bashrc

* Moved CONDOR_CONFIG to only be modified by python, added warning message for if .condor_config is not found

* Bumped the lpcjobqueue version in the bootstrap script

bootstrap.sh

@@ -10,6 +10,8 @@ else
   export COFFEA_IMAGE=\$1
 fi
 
+grep -v '^include' /etc/condor/config.d/01_cmslpc_interactive > .condor_config
+
 SINGULARITY_SHELL=\$(which bash) singularity exec -B \${PWD}:/srv -B /cvmfs -B /uscmst1b_scratch --pwd /srv \\
   /cvmfs/unpacked.cern.ch/registry.hub.docker.com/\${COFFEA_IMAGE} \\
   /bin/bash --rcfile /srv/.bashrc
@@ -25,7 +27,7 @@ install_env() {
   export TMPDIR=\$(mktemp -d -p .)
   .env/bin/python -m ipykernel install --user
   rm -rf \$TMPDIR && unset TMPDIR
-  .env/bin/python -m pip install -q git+https://github.com/CoffeaTeam/[email protected].8
+  .env/bin/python -m pip install -q git+https://github.com/CoffeaTeam/[email protected].9
   echo "done."
 }
 

src/lpcjobqueue/schedd.py

@@ -4,7 +4,10 @@
 import re
 
 logger = logging.getLogger(__name__)
-os.environ["CONDOR_CONFIG"] = os.path.join(os.path.dirname(__file__), "condor_config")
+os.environ["CONDOR_CONFIG"] = os.path.join("/srv/.condor_config")
+if not os.path.isfile(os.environ['CONDOR_CONFIG']):
+    logger.warn(f"Condor configuration not found! run the following command outside the singularity instance")
+    logger.warn(f"grep -v '^include' /etc/condor/config.d/01_cmslpc_interactive > .condor_config")
 import htcondor  # noqa: E402