From 305db94c581ebc59a8080d0569d14b5cbf123499 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 11 Feb 2019 12:47:29 +0100 Subject: [PATCH] .gitlab-ci*.yml: remove build_ prefixes It's useless to see 'builf_samba_ad...' 7 times in the gitlab pipeline summary. Signed-off-by: Stefan Metzmacher Reviewed-by: Tim Beale Reviewed-by: Andrew Bartlett --- .gitlab-ci-private.yml | 12 ++++++------ .gitlab-ci.yml | 36 ++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml index ea22eaa044f..7ed13fda8d3 100644 --- a/.gitlab-ci-private.yml +++ b/.gitlab-ci-private.yml @@ -8,38 +8,38 @@ include: - docker - private -build_samba: +samba: <<: *private_template script: # this one takes about 4 hours to finish - script/autobuild.py samba --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_samba_py2: +samba_py2: <<: *private_template script: # this one takes about 4 hours to finish - script/autobuild.py samba-py2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_samba_fileserver: +samba_fileserver: <<: *private_template script: # this one takes about 1 hours to finish - script/autobuild.py samba-fileserver --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_samba_ad_dc: +samba_ad_dc: <<: *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 -build_samba_ad_dc_py2: +samba_ad_dc_py2: <<: *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 -build_nt4: +nt4: <<: *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 cc7a623ac82..b9766d94753 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,81 +34,81 @@ variables: - system-info.txt - /tmp/samba-testbase/*/*/bin/config.log -build_samba_none_env: +samba_none_env: <<: *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 -build_samba_none_env_py2: +samba_none_env_py2: <<: *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 -build_samba_nopython: +samba_nopython: <<: *shared_template script: - script/autobuild.py samba-nopython --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_samba_systemkrb5: +samba_systemkrb5: <<: *shared_template script: - script/autobuild.py samba-systemkrb5 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_samba_xc: +samba_xc: <<: *shared_template script: - script/autobuild.py samba-xc --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_samba_o3: +samba_o3: <<: *shared_template script: - script/autobuild.py samba-o3 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_samba_ad_dc_2: +samba_ad_dc_2: <<: *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 -build_samba_ad_dc_backup: +samba_ad_dc_backup: <<: *shared_template script: - script/autobuild.py samba-ad-dc-backup --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_samba_ad_dc_2_py2: +samba_ad_dc_2_py2: <<: *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 -build_samba_libs: +samba_libs: <<: *shared_template script: - script/autobuild.py samba-libs --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_samba_libs_py2: +samba_libs_py2: <<: *shared_template script: - script/autobuild.py samba-libs-py2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_samba_static: +samba_static: <<: *shared_template script: - script/autobuild.py samba-static --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_ctdb: +ctdb: <<: *shared_template script: - script/autobuild.py ctdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_samba_ctdb: +samba_ctdb: <<: *shared_template script: - script/autobuild.py samba-ctdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_others: +others: <<: *shared_template script: - script/autobuild.py ldb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase @@ -118,18 +118,18 @@ build_others: - script/autobuild.py tdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase - script/autobuild.py tevent --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_samba_buildpy2_only: +samba_buildpy2_only: <<: *shared_template script: - python script/autobuild.py samba-buildpy2-only --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase -build_samba_ad_dc_ntvfs: +samba_ad_dc_ntvfs: <<: *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 -build_samba_ad_dc_ntvfs_py2: +samba_ad_dc_ntvfs_py2: <<: *shared_template script: - script/autobuild.py samba-ad-dc-ntvfs-py2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase