From 786f485d78fca0e0ccad017dd6cfdd40e42fe3bf Mon Sep 17 00:00:00 2001
From: Maxime Besson <maxime.besson@worteks.com>
Date: Fri, 15 Jan 2021 18:31:54 +0100
Subject: [PATCH] Refactor .gitlab-ci.yml

---
 .gitlab-ci.yml | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1765a9704..493838272 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,22 @@
-.build_job: &job_build
+.build_job:
   stage: build
-  script:
-     - apt-get update && apt-get -y dist-upgrade
-    # Workaround for bionic
-     - DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata
-     - ci-build-pkg
   artifacts:
     expire_in: 1 hour
     paths:
       - result/*
 
+.debian_build_job:
+  extends: .build_job
+  script:
+     - apt-get update && apt-get -y dist-upgrade
+     - DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata
+     - ci-build-pkg
+  before_script:
+     - env | grep ^CI_
+     # Converting to native package...
+     - sed -i "1{s/-1) /$suffix) /}" debian/changelog
+     - sed -i "1{s/-2) /$suffix) /}" debian/changelog
+     - sed -i 's/3.0 (quilt)/3.0 (native)/' debian/source/format
 
 stages:
 - build
@@ -18,53 +25,42 @@ stages:
 
 before_script:
   - env | grep ^CI_
-  # Converting to native package...
-  - sed -i "1{s/-1) /$suffix) /}" debian/changelog
-  - sed -i "1{s/-2) /$suffix) /}" debian/changelog
-  - sed -i 's/3.0 (quilt)/3.0 (native)/' debian/source/format
 
 build_stretch:
+  extends: .debian_build_job
   image: buildpkg/debian:stretch
-  <<: *job_build
 
 build_buster:
+  extends: .debian_build_job
   image: buildpkg/debian:buster
-  <<: *job_build
 
 #build_xenial:
+#  extends: .debian_build_job
 #  image: buildpkg/ubuntu:xenial
 #  <<: *job_build
 
 build_bionic:
+  extends: .debian_build_job
   image: buildpkg/ubuntu:bionic
-  <<: *job_build
 
 build_centos_7:
+  extends: .build_job
   image: buildpkg/centos:7
-  stage: build
   script:
      - rm -f /etc/yum.repos.d/CentOS-Sources.repo
      - yum -y install epel-release
      - make rpm-dist
      - ci-build-pkg
-  artifacts:
-     expire_in: 1 day
-     paths:
-       - result/*
 
 build_centos_8:
+  extends: .build_job
   image: buildpkg/centos:8
-  stage: build
   script:
      - yum-config-manager --enable PowerTools
      - yum-config-manager --enable AppStream
      - yum -y install epel-release
      - make rpm-dist
      - ci-build-pkg
-  artifacts:
-     expire_in: 1 day
-     paths:
-       - result/*
 
 sign:
   image: buildpkg/debian:stretch