Test FF and Singularity experiments in CI (#103).

aibasel · Nov 6, 2021 · 883076f · 883076f
1 parent b1867d7
commit 883076f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -66,25 +66,43 @@ jobs:
         sudo apt-get -y install g++ make flex bison
         wget http://fai.cs.uni-saarland.de/hoffmann/ff/FF-v2.3.tgz
         tar -xzvf FF-v2.3.tgz
-        cd FF-v2.3/
+        pushd FF-v2.3/
         make -j
         cp ff ../
-        cd ..
-        rm -rf FF-v2.3/ FF-v2.3.tgz
+        popd
+        rm -r FF-v2.3/ FF-v2.3.tgz
+
+    - name: Compile runsolver
+      working-directory: ../deps
+      run: |
+        sudo apt-get -y install g++ make
+        git clone https://github.com/jendrikseipp/runsolver.git runsolver-dir
+        pushd runsolver-dir/src
+        make -j
+        cp runsolver ../..
+        popd
+        rm -r runsolver-dir/
+
+    - name: Install Singularity
+      working-directory: ../deps
+      run: |
+        wget --no-verbose http://ftp.se.debian.org/debian/pool/main/s/singularity-container/singularity-container_3.5.2+ds1-1_amd64.deb -O singularity.deb
+        sudo dpkg -i singularity.deb
+        rm singularity.deb
 
     - name: Compile VAL
       working-directory: ../deps
       run: |
         sudo apt-get -y install g++ make flex bison
         git clone https://github.com/KCL-Planning/VAL.git
-        cd VAL
+        pushd VAL
         git checkout a5565396007eee73ac36527fbf904142b3077c74
         make clean  # Remove old build artifacts and binaries.
         sed -i 's/-Werror //g' Makefile  # Ignore warnings.
         make -j
         mv validate ../
-        cd ../
-        rm -rf VAL
+        popd
+        rm -r VAL
 
     - name: Clone benchmarks
       working-directory: ../deps
@@ -103,7 +121,7 @@ jobs:
     - name: Download example Singularity image
       working-directory: ../deps
       run: |
-        wget --no-verbose https://ai.dmi.unibas.ch/_tmp_files/seipp/lama-first.img
+        wget --no-verbose https://ai.dmi.unibas.ch/_tmp_files/seipp/lama-first.img -O fd1906-lama-first.img
         export SINGULARITY_IMAGES=`realpath .`
         echo "SINGULARITY_IMAGES=${SINGULARITY_IMAGES}" >> $GITHUB_ENV
 
@@ -116,7 +134,7 @@ jobs:
         echo CACHE: ${DOWNWARD_REVISION_CACHE}
 
         export DOWNWARD_REPO=${DOWNWARD_REPO}
-        time tox -e py
+        time tox -e py,ff,singularity
 
     - name: Test installation with pip
       run: |

diff --git a/examples/singularity/singularity-parser.py b/examples/singularity/singularity-parser.py
@@ -13,7 +13,8 @@ def coverage(content, props):
 def unsolvable(content, props):
     # Note that this naive test may easily generate false positives.
     props["unsolvable"] = int(
-        "Completely explored state space -- no solution!" in content
+        not props["coverage"]
+        and "Completely explored state space -- no solution!" in content
     )
 
 

diff --git a/tests/run-example-experiment b/tests/run-example-experiment
@@ -11,7 +11,7 @@ check () {
         exit 1
     fi
     set +e
-    grep "\"unexplained_errors\": \[$" "$properties"
+    grep --after-context=10 "\"unexplained_errors\": \[$" "$properties"
     exitcode="$?"
     set -e
     if [[ "$exitcode" == 0 ]]; then