summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2018-06-26 14:59:26 +1200
committerKarolin Seeger <kseeger@samba.org>2018-06-26 09:19:17 +0200
commitfb522c1ba0afa1b2298e66dfde42806cae72e5b9 (patch)
treeb40b14cac73595c0a8b3cf0ee472ca99919654ac
parent7ccd1eb5393f76642a96db0037d9f4b3bb10709a (diff)
downloadsamba-fb522c1ba0afa1b2298e66dfde42806cae72e5b9.tar.gz
.gitlab-ci.yml: Adapt to current GitLab CI setup
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--.gitlab-ci-private.yml (renamed from .gitlab-ci.yml)14
1 files changed, 10 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci-private.yml
index 2ae9eb4032d..584b853c25e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci-private.yml
@@ -1,12 +1,15 @@
# see https://docs.gitlab.com/ce/ci/yaml/README.html for all available options
+image: registry.gitlab.com/samba-team/samba:latest
+
before_script:
- echo "Build starting ..."
build_samba:
stage: build
tags:
- - autobuild
+ - docker
+ - private
script:
# this one takes about 4 hours to finish
- python script/autobuild.py samba --verbose --tail --testbase /tmp/samba-testbase
@@ -14,7 +17,8 @@ build_samba:
build_samba_others:
stage: build
tags:
- - autobuild
+ - docker
+ - private
script:
- python script/autobuild.py samba-nopython --verbose --tail --testbase /tmp/samba-testbase
- python script/autobuild.py samba-systemkrb5 --verbose --tail --testbase /tmp/samba-testbase
@@ -26,7 +30,8 @@ build_samba_others:
build_ctdb:
stage: build
tags:
- - autobuild
+ - docker
+ - private
script:
- python script/autobuild.py samba-ctdb --verbose --tail --testbase /tmp/samba-testbase
- python script/autobuild.py ctdb --verbose --tail --testbase /tmp/samba-testbase
@@ -34,7 +39,8 @@ build_ctdb:
build_others:
stage: build
tags:
- - autobuild
+ - docker
+ - private
script:
- python script/autobuild.py ldb --verbose --tail --testbase /tmp/samba-testbase
- python script/autobuild.py pidl --verbose --tail --testbase /tmp/samba-testbase