.gitlab-ci*.yml: use 'extends: ' instead of YAML Anchors

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml
index 7ed13fda8d392482fd6be42dc02032203983d37d..f42ec08b311f08c239ad098440e79b8606b30e2a 100644 (file)
--- a/.gitlab-ci-private.yml
+++ b/.gitlab-ci-private.yml
@@ -2,44 +2,50 @@ include:
  - '/.gitlab-ci.yml'
 
 
-.private_template: &private_template
-  stage: build
+.private_template:
+  extends: .shared_template
   tags:
     - docker
     - private
+  before_script:
+    - uname -a
+    - lsb_release -a
+    - mount
+    - df -h
+    - free -h
 
 samba:
-  <<: *private_template
+  extends: .private_template
   script:
     # this one takes about 4 hours to finish
     - script/autobuild.py samba            --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_py2:
-  <<: *private_template
+  extends: .private_template
   script:
     # this one takes about 4 hours to finish
     - script/autobuild.py samba-py2            --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_fileserver:
-  <<: *private_template
+  extends: .private_template
   script:
     # this one takes about 1 hours to finish
     - script/autobuild.py samba-fileserver --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_ad_dc:
-  <<: *private_template
+  extends: .private_template
   script:
     # this one takes about 1 hours to finish
     - script/autobuild.py samba-ad-dc     --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 
 samba_ad_dc_py2:
-  <<: *private_template
+  extends: .private_template
   script:
     # this one takes about 1 hours to finish
     - script/autobuild.py samba-ad-dc-py2     --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 nt4:
-  <<: *private_template
+  extends: .private_template
   script:
     - script/autobuild.py samba-nt4 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b9766d94753d06e456229cec4c16d0692c5c2c1c..2dbfd8700fad4d00d03ce52bf0a9c24f5ac9d1ff 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ variables:
   GIT_STRATEGY: fetch
   GIT_DEPTH: "3"
 
-.shared_template: &shared_template
+.shared_template:
   image: $CI_REGISTRY/$SAMBA_BUILD_IMAGES_PROJECT:$SAMBA_BUILD
   stage: build
   tags:
@@ -35,81 +35,81 @@ variables:
       - /tmp/samba-testbase/*/*/bin/config.log
 
 samba_none_env:
-  <<: *shared_template
+  extends: .shared_template
   script:
     # this one takes about 1 hours to finish
     - script/autobuild.py samba-none-env    --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_none_env_py2:
-  <<: *shared_template
+  extends: .shared_template
   script:
     # this one takes about 1 hours to finish
     - script/autobuild.py samba-none-env-py2    --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_nopython:
-  <<: *shared_template
+  extends: .shared_template
   script:
     - script/autobuild.py samba-nopython   --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_systemkrb5:
-  <<: *shared_template
+  extends: .shared_template
   script:
     - script/autobuild.py samba-systemkrb5 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_xc:
-  <<: *shared_template
+  extends: .shared_template
   script:
     - script/autobuild.py samba-xc         --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_o3:
-  <<: *shared_template
+  extends: .shared_template
   script:
     - script/autobuild.py samba-o3         --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_ad_dc_2:
-  <<: *shared_template
+  extends: .shared_template
   script:
     # this one takes about 1 hours to finish
     - script/autobuild.py samba-ad-dc-2     --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_ad_dc_backup:
-  <<: *shared_template
+  extends: .shared_template
   script:
     - script/autobuild.py samba-ad-dc-backup    --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_ad_dc_2_py2:
-  <<: *shared_template
+  extends: .shared_template
   script:
     # this one takes about 1 hours to finish
     - script/autobuild.py samba-ad-dc-2-py2     --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_libs:
-  <<: *shared_template
+  extends: .shared_template
   script:
     - script/autobuild.py samba-libs       --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_libs_py2:
-  <<: *shared_template
+  extends: .shared_template
   script:
     - script/autobuild.py samba-libs-py2       --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_static:
-  <<: *shared_template
+  extends: .shared_template
   script:
     - script/autobuild.py samba-static     --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 ctdb:
-  <<: *shared_template
+  extends: .shared_template
   script:
     - script/autobuild.py ctdb       --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_ctdb:
-  <<: *shared_template
+  extends: .shared_template
   script:
     - script/autobuild.py samba-ctdb             --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 others:
-  <<: *shared_template
+  extends: .shared_template
   script:
     - script/autobuild.py ldb              --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
     - script/autobuild.py pidl             --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
@@ -119,17 +119,17 @@ others:
     - script/autobuild.py tevent           --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_buildpy2_only:
-  <<: *shared_template
+  extends: .shared_template
   script:
     - python script/autobuild.py samba-buildpy2-only             --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_ad_dc_ntvfs:
-  <<: *shared_template
+  extends: .shared_template
   script:
     # this one takes about 100 mins to finish
     - script/autobuild.py samba-ad-dc-ntvfs --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
 samba_ad_dc_ntvfs_py2:
-  <<: *shared_template
+  extends: .shared_template
   script:
     - script/autobuild.py samba-ad-dc-ntvfs-py2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase