From d9c5629127921b5b8bfce1685c1382b8db19267b Mon Sep 17 00:00:00 2001
From: Kylian Schmidt <kylian.schmidt@kit.edu>
Date: Mon, 8 Sep 2025 15:06:45 +0200
Subject: [PATCH] Fix pipeline attempt (2): Fakeroot

---
 .gitlab-ci.yml | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b864468..5ddc3b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,6 @@ stages:
 
 variables:
   CONTAINER_IMAGE: "gallery-generator.sif"
-  APPTAINER_CACHE_DIR: "$CI_PROJECT_DIR/.apptainer-cache"
 
 # Cache to speed up builds
 cache:
@@ -18,17 +17,11 @@ cache:
 # Build the Apptainer container
 build:container:
   stage: build
-  image: ubuntu:22.04
-  before_script:
-    - apt-get update -qq
-    - apt-get install -y wget curl gpg
-    - wget -O /tmp/apptainer.deb https://github.com/apptainer/apptainer/releases/download/v1.2.5/apptainer_1.2.5_amd64.deb
-    - apt-get install -y /tmp/apptainer.deb
-    - mkdir -p $APPTAINER_CACHE_DIR
+  image: quay.io/singularity/singularity:v3.8.7
   script:
     - echo "Building Apptainer container..."
-    - apptainer --version
-    - apptainer build $CONTAINER_IMAGE Singularity.def
+    - singularity --version
+    - singularity build --fakeroot $CONTAINER_IMAGE Singularity.def
     - ls -lh $CONTAINER_IMAGE
   artifacts:
     paths:
@@ -38,35 +31,25 @@ build:container:
 # Run tests inside the container
 test:pytest:
   stage: test
-  image: ubuntu:22.04
+  image: quay.io/singularity/singularity:v3.8.7
   dependencies:
     - build:container
-  before_script:
-    - apt-get update -qq
-    - apt-get install -y wget curl gpg
-    - wget -O /tmp/apptainer.deb https://github.com/apptainer/apptainer/releases/download/v1.2.5/apptainer_1.2.5_amd64.deb
-    - apt-get install -y /tmp/apptainer.deb
   script:
     - echo "Running pytest inside container..."
-    - apptainer exec $CONTAINER_IMAGE pytest /src/tests/ -v
+    - singularity exec $CONTAINER_IMAGE pytest /src/tests/ -v
   artifacts:
     when: always
 
 # Run tests with coverage
 test:coverage:
   stage: test
-  image: ubuntu:22.04
+  image: quay.io/singularity/singularity:v3.8.7
   dependencies:
     - build:container
-  before_script:
-    - apt-get update -qq
-    - apt-get install -y wget curl gpg
-    - wget -O /tmp/apptainer.deb https://github.com/apptainer/apptainer/releases/download/v1.2.5/apptainer_1.2.5_amd64.deb
-    - apt-get install -y /tmp/apptainer.deb
   script:
     - echo "Running coverage analysis inside container..."
-    - apptainer exec $CONTAINER_IMAGE pytest /src/tests/ --cov=/src --cov-report=xml --cov-report=term
-    - apptainer exec $CONTAINER_IMAGE cat /src/coverage.xml > coverage.xml || echo "No coverage.xml found"
+    - singularity exec $CONTAINER_IMAGE pytest /src/tests/ --cov=/src --cov-report=xml --cov-report=term
+    - singularity exec $CONTAINER_IMAGE cat /src/coverage.xml > coverage.xml || echo "No coverage.xml found"
   coverage: '/TOTAL.*\s+(\d+%)$/'
   artifacts:
     reports: