Adapt emba integration (don't merge)

* test/infra/Dockerfile.emba (emacs-inotify): Don't install clangd.

* test/infra/gitlab-ci.yml (.job-template): Make actions in
after_script more robust.

2 files changed, 3 insertions, 4 deletions

diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba
index 8c6641b19b9..4c46193c555 100644
--- a/test/infra/Dockerfile.emba
+++ b/test/infra/Dockerfile.emba
@@ -34,10 +34,9 @@ RUN apt-get update && \
 
 FROM emacs-base as emacs-inotify
 
-# We install clangd for Eglot tests.
 RUN apt-get update && \
     apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
-      inotify-tools clangd \
+      inotify-tools \
     && rm -rf /var/lib/apt/lists/*
 
 COPY . /checkout
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 2b443d14c24..0d7d31c3fdd 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -93,9 +93,9 @@ default:
     - test -n "$(docker ps -aq -f name=${test_name})" && docker cp ${test_name}:checkout/test ${test_name}
     - test -n "$(docker ps -aq -f name=${test_name})" && docker cp ${test_name}:checkout/config.log ${test_name} || true
     - test -n "$(docker ps -aq -f name=${test_name})" && docker rm ${test_name}
-    - find ${test_name} ! \( -name "*.log" -o -name ${EMACS_TEST_JUNIT_REPORT} \) -type f -delete
+    - test -d ${test_name} && find ${test_name} ! \( -name "*.log" -o -name ${EMACS_TEST_JUNIT_REPORT} \) -type f -delete
     # BusyBox find does not know -empty.
-    - find ${test_name} -type d -depth -exec rmdir {} + 2>/dev/null
+    - test -d ${test_name} && find ${test_name} -type d -depth -exec rmdir {} + 2>/dev/null
 
 .build-template:
   needs: []