Merge pull request #81 from chrisburr/add-apptainer

Add apptainer to DIRACOS2

Author: chrisburr

construct.yaml

@@ -92,6 +92,7 @@ specs:
   - requests >=2.9.1
   - rrdtool  # [not (osx and arm64)]
   - singularity >=3.7  # [not osx]
+  - apptainer  # [not osx]
   - six
   - subprocess32
   - suds >=1.0

tests/test_cli.sh

@@ -48,7 +48,7 @@ if ! singularity version; then
   echo "singularity version not working";
   rc=1;
 fi
-if ! singularity build --sandbox lolcow docker://godlovedc/lolcow; then
+if ! singularity build --force --sandbox lolcow docker://godlovedc/lolcow; then
   echo "singularity build not working";
   rc=1;
 fi
@@ -57,6 +57,20 @@ if ! (singularity --verbose --debug run -u lolcow || (singularity --verbose --de
   rc=1;
 fi
 
+# For apptainer
+if ! apptainer version; then
+  echo "apptainer version not working";
+  rc=1;
+fi
+if ! apptainer build --force --sandbox lolcow docker://godlovedc/lolcow; then
+  echo "apptainer build not working";
+  rc=1;
+fi
+if ! (apptainer --verbose --debug run -u lolcow || (apptainer --verbose --debug run -u lolcow 2>&1 | grep -E 'Failed to create user namespace: (Operation not permitted|Invalid argument)')); then
+  echo "apptainer run not working";
+  rc=1;
+fi
+
 # For HTCondor
 if ! condor_submit -help; then
   echo "condor_submit -help not working";

tests/test_singularity.py

@@ -0,0 +1,38 @@
+from subprocess import run
+
+import pytest
+
+IMPLEMENTATIONS_TO_TRY = ["apptainer", "singularity"]
+
+
+@pytest.mark.parametrize("implementation", IMPLEMENTATIONS_TO_TRY)
+def test_oci(implementation):
+    cmd = [implementation, "exec", "docker://centos:7"]
+    cmd += ["bash", "-c", "echo Hello world $(( 1+1 ))!"]
+    proc = run(cmd, capture_output=True, check=True, text=True)
+    assert proc.stdout == "Hello world 2!\n"
+
+
+@pytest.mark.parametrize("implementation", IMPLEMENTATIONS_TO_TRY)
+def test_build_image(implementation, tmp_path):
+    cmd = [implementation, "build", "--fix-perms", "--sandbox"]
+    cmd += [tmp_path / "container", "docker://centos:7"]
+    run(cmd, capture_output=True, check=True, text=True)
+    assert (tmp_path / "container" / "bin").is_dir()
+    assert (tmp_path / "container" / "bin" / "bash").is_file()
+
+
+@pytest.mark.parametrize("implementation", IMPLEMENTATIONS_TO_TRY)
+def test_singularity_ce(implementation, tmp_path):
+    test_build_image(implementation, tmp_path)
+
+    (tmp_path / "work").mkdir()
+    (tmp_path / "home").mkdir()
+    (tmp_path / "cvmfs").mkdir()
+
+    cmd = [implementation, "exec", "--contain", "--ipc", "--pid", "--userns"]
+    cmd += ["--workdir", tmp_path / "work", "--home", tmp_path / "home"]
+    cmd += ["--bind", tmp_path / "cvmfs", tmp_path / "container"]
+    cmd += ["bash", "-c", "echo Hello world $(( 1+1+1 ))!"]
+    proc = run(cmd, capture_output=True, check=True, text=True)
+    assert proc.stdout == "Hello world 3!\n"