bind all files/paths needed for host condor config (#36)

* bind all files/paths needed for host condor config

* remove unneeded line

* turn off -e after installation

* define CONDOR_CONFIG globally

* bind a fake python3 script

* add top-level .condor_config file that includes lpc global condor config.
it disables use of the local config file specified by /usr/local/bin/cmslpc-local-conf.py;
cmslpc-local-conf still runs, but the attribute it adds (location of local config file) will now be ignored by condor.
this avoids "ERROR: Can't read config source" from condor commands (because the /storage area has wrong ownership inside the container)
the local config file is not actually created until the custom /usr/local/bin/condor_submit is used, and it is never used here.

* hide fake python3

* don't actually need to bind /storage anymore

* keep existing bindpath values

* fake cmslpc-local-conf.py instead of fake python3

* further simplification: just suppress unwanted output from cmslpc-local-conf

* Guard against misisng env var

* Better user instructions for updating

---------

Co-authored-by: Nick Smith <nick.smith@cern.ch>

Author: kpedro88

bootstrap.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+LPC_CONDOR_CONFIG=/etc/condor/config.d/01_cmslpc_interactive
+LPC_CONDOR_LOCAL=/usr/local/bin/cmslpc-local-conf.py
+
 cat <<EOF > shell
 #!/usr/bin/env bash
 
@@ -18,15 +21,18 @@ else
   export COFFEA_IMAGE=\$1
 fi
 
-grep -v '^include' /etc/condor/config.d/01_cmslpc_interactive > .condor_config
-
-export APPTAINER_BINDPATH=/uscmst1b_scratch,/cvmfs,/cvmfs/grid.cern.ch/etc/grid-security:/etc/grid-security
+export APPTAINER_BINDPATH=${APPTAINER_BINDPATH}${APPTAINER_BINDPATH:+,}/uscmst1b_scratch,/cvmfs,/cvmfs/grid.cern.ch/etc/grid-security:/etc/grid-security,${LPC_CONDOR_CONFIG},${LPC_CONDOR_LOCAL}:${LPC_CONDOR_LOCAL}.orig,.cmslpc-local-conf:${LPC_CONDOR_LOCAL}
 
 APPTAINER_SHELL=\$(which bash) apptainer exec -B \${PWD}:/srv --pwd /srv \\
   /cvmfs/unpacked.cern.ch/registry.hub.docker.com/\${COFFEA_IMAGE} \\
   /bin/bash --rcfile /srv/.bashrc
 EOF
 
+cat <<EOF > .cmslpc-local-conf
+#!/bin/bash
+python3 ${LPC_CONDOR_LOCAL}.orig | grep -v "LOCAL_CONFIG_FILE"
+EOF
+
 cat <<EOF > .bashrc
 LPCJQ_VERSION="0.3.1"
 install_env() {
@@ -40,8 +46,10 @@ install_env() {
   rm -rf \$TMPDIR && unset TMPDIR
   .env/bin/python -m pip install -q git+https://github.com/CoffeaTeam/lpcjobqueue.git@v\${LPCJQ_VERSION}
   echo "done."
+  set +e
 }
 
+export CONDOR_CONFIG=${LPC_CONDOR_CONFIG}
 export JUPYTER_PATH=/srv/.jupyter
 export JUPYTER_RUNTIME_DIR=/srv/.local/share/jupyter/runtime
 export JUPYTER_DATA_DIR=/srv/.local/share/jupyter
@@ -54,5 +62,5 @@ alias pip="python -m pip"
 pip show lpcjobqueue 2>/dev/null | grep -q "Version: \${LPCJQ_VERSION}" || pip install -q git+https://github.com/CoffeaTeam/lpcjobqueue.git@v\${LPCJQ_VERSION}
 EOF
 
-chmod u+x shell .bashrc
+chmod u+x shell .bashrc .cmslpc-local-conf
 echo "Wrote shell and .bashrc to current directory. You can delete this file. Run ./shell to start the apptainer shell"

src/lpcjobqueue/schedd.py

@@ -5,10 +5,12 @@
 import re
 
 logger = logging.getLogger(__name__)
-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 apptainer instance")
-    logger.warn(f"grep -v '^include' /etc/condor/config.d/01_cmslpc_interactive > .condor_config")
+if "CONDOR_CONFIG" not in os.environ or not os.path.isfile(os.environ["CONDOR_CONFIG"]):
+    raise RuntimeError(
+        f"Condor configuration {os.environ.get('CONDOR_CONFIG', '')} not found!\n"
+        "Please download and run bootstrap.sh again to update the shell with:\n"
+        "curl -OL https://raw.githubusercontent.com/CoffeaTeam/lpcjobqueue/main/bootstrap.sh; bash bootstrap.sh"
+    )
 import htcondor  # noqa: E402