ci,builders: refactor debian to reduce layers

Author: asaezper

.gitlab/ci/builders/debian/Dockerfile

@@ -10,29 +10,25 @@ ARG VERSION=22.04
 ARG OS_NAME=ubuntu
 FROM $OS_NAME:$VERSION
 
-ADD install_dependencies.sh /usr/local/bin
-RUN chmod +x /usr/local/bin/install_dependencies.sh
-
-RUN TZ=Europe/Madrid && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-RUN install_dependencies.sh && apt-get install -y --no-install-recommends \
-  git git-lfs \
-  clang llvm \
-  ccache gcovr valgrind \
-  python3-dev python3-venv \
-  && apt-get autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* && git lfs install
-
-RUN (DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends libclang-rt-dev || true) \
-  && apt-get autoremove && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-ADD builder.sh /usr/local/bin
-RUN chmod +x /usr/local/bin/builder.sh
-
-RUN python3 -m venv /usr/local/builder_tools
-RUN /usr/local/builder_tools/bin/pip install "pandas<3" "psutil"
-ADD changed_tests.py /usr/local/bin
-RUN chmod +x /usr/local/bin/changed_tests.py
-ADD ram_reporter.py /usr/local/bin
-RUN chmod +x /usr/local/bin/ram_reporter.py
+RUN TZ=Europe/Madrid && \
+    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \
+    echo $TZ > /etc/timezone && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
+    git git-lfs \
+    clang llvm \
+    ccache gcovr valgrind \
+    python3-dev python3-venv && \
+    (apt-get install -y --no-install-recommends libclang-rt-dev || true) && \
+    apt-get autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* && \
+    git lfs install
+
+ADD install_dependencies.sh builder.sh changed_tests.py ram_reporter.py /usr/local/bin/
+RUN chmod +x /usr/local/bin/install_dependencies.sh /usr/local/bin/builder.sh /usr/local/bin/changed_tests.py /usr/local/bin/ram_reporter.py && \
+    /usr/local/bin/install_dependencies.sh && \
+    apt-get autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* && \
+    python3 -m venv /usr/local/builder_tools && \
+    /usr/local/builder_tools/bin/pip install "pandas<3" "psutil"
 
 ADD uhd /opt/uhd
 ADD dpdk /opt/dpdk

.gitlab/ci/e2e/.env

@@ -1,6 +1,6 @@
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.42.1
+RETINA_VERSION=0.42.2
 AMARISOFT_VERSION=2023-03-17
 SRSUE_VERSION=23.11
 OPEN5GS_VERSION=2.6.1