update prepare script

scripts/config_sites.json

@@ -13,7 +13,6 @@
             "0083.partitionable_slots.cfg",
             "0085.auto_shutdown.cfg",
             "0088.ssh_to_job.cfg",
-            "0110.node_worker_docker.cfg",
             "0212.node_worker_bwforcluster_container.cfg"
         ],
         "scripts": [

scripts/prepare_singularity.py

@@ -55,6 +55,7 @@ def check_image_availability(image_path):
 
 def main():
     job_ad = get_job_ad()
+    status_message = ""
     # write job_ad to a json file for debugging
     dumpfilepath = "/scratch/job_ad.json"
     with open(dumpfilepath, "w") as f:
@@ -63,10 +64,17 @@ def main():
     docker_image = job_ad.get("DockerImage")
 
     if not container_image and not docker_image:
+        status_message = "No container image provided, using default container: /cvmfs/unpacked.cern.ch/registry.hub.docker.com/mschnepf/slc7-condocker:latest"
         print(
             "ContainerImage = /cvmfs/unpacked.cern.ch/registry.hub.docker.com/mschnepf/slc7-condocker:latest"
         )
         print("WantDocker = false")
+        job_ad["ContainerImage"] = (
+            "/cvmfs/unpacked.cern.ch/registry.hub.docker.com/mschnepf/slc7-condocker:latest"
+        )
+        job_ad["WantDocker"] = "false"
+        with open(dumpfilepath, "w") as f:
+            json.dump(job_ad, f, indent=4)
         return
     # pick the args parameter that is not None
     image = container_image or docker_image
@@ -79,7 +87,13 @@ def main():
         condor_arg = f"docker://{domain}/{imagename}"
     print(f"ContainerImage = {condor_arg}")
     print("WantDocker = false")
-    # write the image path to a .cfg file to be used by condor
+    # dump the updated job ad to a file for debugging
+    job_ad["ContainerImage"] = condor_arg
+    job_ad["WantDocker"] = "false"
+    with open(dumpfilepath, "w") as f:
+        json.dump(job_ad, f, indent=4)
+    status_message = f"Container image {image_path} is available, using it"
+    print(f"HookStatusMessage = {status_message}")
 
 
 if __name__ == "__main__":