From 6b4ae52f224ea6700527cd034353fe561cda0485 Mon Sep 17 00:00:00 2001 From: Joe Guo Date: Fri, 15 Feb 2019 22:25:07 +1300 Subject: .gitlab-ci.yml: merge .gitlab-ci-private.yml `.gitlab-ci.yml` support conditional jobs with `only` and `except`. And variables can be read from repo CI/CD settings as condition: build_samba: script: ... only: variables: - $SUPPORT_PRIVATE_TEST == 'yes' Instead of having 2 copies of yml file, we can use this feature to trigger private jobs only when a var like `SUPPORT_PRIVATE_TEST` is defined. I've already added above var to our repos. Once merged, we can remove custom CI config file in gitlab repo settings, and remove .gitlab-ci-private.yml file from code. Signed-off-by: Joe Guo Reviewed-by: Tim Beale Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Mon Feb 18 10:54:19 CET 2019 on sn-devel-144 --- .gitlab-ci-private.yml | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) (limited to '.gitlab-ci-private.yml') diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml index 4e83c197b89..04d33d5c549 100644 --- a/.gitlab-ci-private.yml +++ b/.gitlab-ci-private.yml @@ -1,30 +1,2 @@ include: - - '/.gitlab-ci.yml' - - -.private_template: - extends: .shared_template - tags: - - docker - - private - before_script: - - uname -a - - lsb_release -a - - mount - - df -h - - free -h - -samba: - extends: .private_template - # this one takes about 4 hours to finish - -samba-fileserver: - extends: .private_template - # this one takes about 1 hours to finish - -samba-ad-dc: - extends: .private_template - # this one takes about 1 hours to finish - -samba-nt4: - extends: .private_template + - '/.gitlab-ci.yml' -- cgit v1.2.1