[Spice-devel] [linux/vd-agent v2 3/3] gitlab-ci: run singular job for build options

[Victor Toso]

From: Victor Toso <me at victortoso.com>

There are two main bottlenecks in CI:
1. Network might be slow for bootstrapping;
2. Big job queues to get a runners to run our jobs.

This patch reduces the three jobs to a single one in order to prevent
long delays when CI resources are scarce which is a common scenario.

No major losses in log should happen. We might add specific .log
files as artifacts if we need them later on.

For completeness, use git clean -xfd for a clean git tree instead of
make distclean.

Signed-off-by: Victor Toso <victortoso at redhat.com>
---
 .gitlab-ci.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b894eb..1d31b0d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,32 +12,28 @@ before_script:
   - git clone https://gitlab.freedesktop.org/spice/spice-protocol.git
   - (cd spice-protocol && ./autogen.sh --prefix=/usr && make install)
 
-make-check-distcheck:
+fedora-autotools:
   script:
   - ./autogen.sh
   - make
   - make check
   - make distcheck
-  - make distclean
+  - git clean -xfd
 
-configure-optional-packages:
-  script:
   - ./autogen.sh --with-session-info=systemd --with-init-script=systemd+redhat
   - make
   - make install
   - make uninstall
-  - make distclean
+  - git clean -xfd
 
   - ./autogen.sh --with-session-info=console-kit --with-init-script=redhat
   - make
   - make install
   - make uninstall
-  - make distclean
+  - git clean -xfd
 
-configure-without-optionals:
-  script:
   - ./autogen.sh --with-gtk=no --with-session-info=none
   - make
   - make install
   - make uninstall
-  - make distclean
+  - git clean -xfd
-- 
2.20.1