diff --git a/lib/get_parser.py b/lib/get_parser.py index d0f15364..126f045d 100644 --- a/lib/get_parser.py +++ b/lib/get_parser.py @@ -628,7 +628,7 @@ def get_parser() -> argparse.ArgumentParser: "--apptainer-image", default=DEFAULT_SINGULARITY_IMAGE, help="Singularity image to run jobs in. Default is " - "/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:latest", + "/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-el9:latest", ) singularity_group.add_argument( "--no-singularity", diff --git a/lib/utils.py b/lib/utils.py index 96f2ca4c..eb0b6e2a 100644 --- a/lib/utils.py +++ b/lib/utils.py @@ -38,7 +38,7 @@ ONSITE_SITE_NAME = "FermiGrid" DEFAULT_USAGE_MODELS = ["DEDICATED", "OPPORTUNISTIC", "OFFSITE"] DEFAULT_SINGULARITY_IMAGE = ( - "/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:latest" + "/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-el9:latest" ) @@ -823,10 +823,10 @@ def resolve_singularity_image( # Parse lines. # Look for something like: - # '+SingularityImage=\\\"/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:latest\\\"' + # '+SingularityImage=\\\"/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-el9:latest\\\"' # in lines and remove it while setting lines_singularity_image # In the above example, if there were such a line, lines_singularity_image would be set to - # "/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:latest" + # "/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-el9:latest" for line in lines: m = lines_singularity_re.match(line) if m: diff --git a/tests/data/singularity_image.json b/tests/data/singularity_image.json index 4985066d..27638729 100644 --- a/tests/data/singularity_image.json +++ b/tests/data/singularity_image.json @@ -1,12 +1,12 @@ [ { - "singularity_image_arg": "/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:latest", + "singularity_image_arg": "/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-el9:latest", "lines_arg": [ "key1=value1", "key2=value2", "key3=value3" ], - "expected_singularity_image": "/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:latest", + "expected_singularity_image": "/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-el9:latest", "expected_lines": [ "key1=value1", "key2=value2", @@ -15,7 +15,7 @@ "helptext": "--singularity_image=DEFAULT_SINGULARITY_IMAGE, --lines does not have SingularityImage: DEFAULT_SINGULARITY_IMAGE, lines=old lines" }, { - "singularity_image_arg": "/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:latest", + "singularity_image_arg": "/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-el9:latest", "lines_arg": [ "key1=value1", "key2=value2",