From d0d32fc04f723dccb298dfb3824c6241e3135a57 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 30 Apr 2018 20:31:19 +1200
Subject: [PATCH] gitlab-ci: Use YAML templates to reduce duplication

Inspired by WIP patches by Jamie McClymont

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---
 .gitlab-ci-private.yml | 25 +++++++--------------
 .gitlab-ci.yml         | 50 +++++++++++-------------------------------
 2 files changed, 21 insertions(+), 54 deletions(-)

diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml
index 46acf77041f..3a1e982d93d 100644
--- a/.gitlab-ci-private.yml
+++ b/.gitlab-ci-private.yml
@@ -2,47 +2,38 @@ include:
  - '/.gitlab-ci.yml'
 
 
-build_samba:
+.private_template: &private_template
   stage: build
   tags:
     - docker
     - private
+
+build_samba:
+  <<: *private_template
   script:
     # this one takes about 4 hours to finish
     - python script/autobuild.py samba            --verbose --tail --testbase /tmp/samba-testbase
 
 build_samba_nt4:
-  stage: build
-  tags:
-    - docker
-    - private
+  <<: *private_template
   script:
     # this one takes about 1 hours to finish
     - python script/autobuild.py samba-nt4        --verbose --tail --testbase /tmp/samba-testbase
 
 build_samba_fileserver:
-  stage: build
-  tags:
-    - docker
-    - private
+  <<: *private_template
   script:
     # this one takes about 1 hours to finish
     - python script/autobuild.py samba-fileserver --verbose --tail --testbase /tmp/samba-testbase
 
 build_samba_ad_dc:
-  stage: build
-  tags:
-    - docker
-    - private
+  <<: *private_template
   script:
     # this one takes about 1 hours to finish
     - python script/autobuild.py samba-ad-dc     --verbose --tail --testbase /tmp/samba-testbase
 
 build_samba_ad_dc_2:
-  stage: build
-  tags:
-    - docker
-    - private
+  <<: *private_template
   script:
     # this one takes about 1 hours to finish
     - python script/autobuild.py samba-ad-dc-2     --verbose --tail --testbase /tmp/samba-testbase
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bfefc23aa58..b151599f12c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,84 +14,60 @@ before_script:
       sudo swapon /samba-swap;
     fi
 
-build_samba_none_env:
+.shared_template: &shared_template
   stage: build
   tags:
     - docker
     - shared
+
+build_samba_none_env:
+  <<: *shared_template
   script:
     # this one takes about 1 hours to finish
     - python script/autobuild.py samba-none-env    --verbose --tail --testbase /tmp/samba-testbase
 
 build_samba_nopython:
-  stage: build
-  tags:
-    - docker
-    - shared
+  <<: *shared_template
   script:
     - python script/autobuild.py samba-nopython   --verbose --tail --testbase /tmp/samba-testbase
 
 build_samba_systemkrb5:
-  stage: build
-  tags:
-    - docker
-    - shared
+  <<: *shared_template
   script:
     - python script/autobuild.py samba-systemkrb5 --verbose --tail --testbase /tmp/samba-testbase
 
 build_samba_xc:
-  stage: build
-  tags:
-    - docker
-    - shared
+  <<: *shared_template
   script:
     - python script/autobuild.py samba-xc         --verbose --tail --testbase /tmp/samba-testbase
 
 build_samba_o3:
-  stage: build
-  tags:
-    - docker
-    - shared
+  <<: *shared_template
   script:
     - python script/autobuild.py samba-o3         --verbose --tail --testbase /tmp/samba-testbase
 
 build_samba_libs:
-  stage: build
-  tags:
-    - docker
-    - shared
+  <<: *shared_template
   script:
     - python script/autobuild.py samba-libs       --verbose --tail --testbase /tmp/samba-testbase
 
 build_samba_static:
-  stage: build
-  tags:
-    - docker
-    - shared
+  <<: *shared_template
   script:
     - python script/autobuild.py samba-static     --verbose --tail --testbase /tmp/samba-testbase
 
 build_ctdb:
-  stage: build
-  tags:
-    - docker
-    - shared
+  <<: *shared_template
   script:
     - python script/autobuild.py samba-ctdb       --verbose --tail --testbase /tmp/samba-testbase
 
 build_samba_ctdb:
-  stage: build
-  tags:
-    - docker
-    - shared
+  <<: *shared_template
   script:
     - python script/autobuild.py ctdb             --verbose --tail --testbase /tmp/samba-testbase
 
 build_others:
-  stage: build
-  tags:
-    - docker
-    - shared
+  <<: *shared_template
   script:
     - python script/autobuild.py ldb              --verbose --tail --testbase /tmp/samba-testbase
     - python script/autobuild.py pidl             --verbose --tail --testbase /tmp/samba-testbase
-- 
2.34.1