Optimize emba builds

* test/infra/Dockerfile.emba (emacs-base): Install also
libdbus-1-dev and libacl1-dev.

* test/infra/gitlab-ci.yml (prep-image-base): Comment out.  This
stage is activated by default in Dockerfile.emba.

2 files changed, 20 insertions, 15 deletions

diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba
index e79f370f170..0b69a719928 100644
--- a/test/infra/Dockerfile.emba
+++ b/test/infra/Dockerfile.emba
@@ -28,13 +28,15 @@ FROM debian:stretch as emacs-base
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
-      libc-dev gcc g++ make autoconf automake libncurses-dev gnutls-dev git texinfo \
+      libc-dev gcc g++ make autoconf automake libncurses-dev gnutls-dev \
+      libdbus-1-dev libacl1-dev git texinfo \
     && rm -rf /var/lib/apt/lists/*
 
 FROM emacs-base as emacs-inotify
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 inotify-tools \
+    apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
+      inotify-tools \
     && rm -rf /var/lib/apt/lists/*
 
 COPY . /checkout
@@ -62,7 +64,8 @@ RUN make -j4
 FROM emacs-base as emacs-gnustep
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 gnustep-devel \
+    apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
+      gnustep-devel \
     && rm -rf /var/lib/apt/lists/*
 
 COPY . /checkout
@@ -75,7 +78,8 @@ RUN make -j4
 FROM emacs-base as emacs-native-comp-speed0
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 libgccjit-6-dev \
+    apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
+      libgccjit-6-dev \
     && rm -rf /var/lib/apt/lists/*
 
 ARG make_bootstrap_params=""
@@ -84,5 +88,6 @@ COPY . /checkout
 WORKDIR /checkout
 RUN ./autogen.sh autoconf
 RUN ./configure --with-native-compilation
-RUN make bootstrap -j2 NATIVE_FULL_AOT=1 BYTE_COMPILE_EXTRA_FLAGS='--eval "(setq comp-speed 0)"'
+RUN make bootstrap -j2 \
+      NATIVE_FULL_AOT=1 BYTE_COMPILE_EXTRA_FLAGS='--eval "(setq comp-speed 0)"'
 RUN make -j4
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 898fb341b20..b6243e1063d 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -199,7 +199,7 @@ default:
   timeout: 8 hours
 
 stages:
-  - prep-images
+#  - prep-images
   - build-images
 #  - fast
   - normal
@@ -209,16 +209,16 @@ stages:
   - native-comp
   - slow
 
-prep-image-base:
-  stage: prep-images
-  extends: [.job-template, .build-template]
-  variables:
-    target: emacs-base
+# prep-image-base:
+#   stage: prep-images
+#   extends: [.job-template, .build-template]
+#   variables:
+#     target: emacs-base
 
 build-image-inotify:
   stage: build-images
   extends: [.job-template, .build-template]
-  needs: [prep-image-base]
+#  needs: [prep-image-base]
   variables:
     target: emacs-inotify
 
@@ -246,14 +246,14 @@ test-lisp-net-inotify:
 build-image-filenotify-gio:
   stage: platform-images
   extends: [.job-template, .build-template, .filenotify-gio-template]
-  needs: [prep-image-base]
+#  needs: [prep-image-base]
   variables:
     target: emacs-filenotify-gio
 
 build-image-gnustep:
   stage: platform-images
   extends: [.job-template, .build-template, .gnustep-template]
-  needs: [prep-image-base]
+#  needs: [prep-image-base]
   variables:
     target: emacs-gnustep
 
@@ -278,7 +278,7 @@ test-gnustep:
 build-native-bootstrap-speed0:
   stage: native-comp-images
   extends: [.job-template, .build-template, .native-comp-template]
-  needs: [prep-image-base]
+#  needs: [prep-image-base]
   variables:
     target: emacs-native-comp-speed0