diff options
author | Joe Guo <joeg@catalyst.net.nz> | 2017-11-28 10:20:54 +1300 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2018-03-27 23:03:13 +0200 |
commit | 75d2be7da584a017beab493355cb88ce7dc61f4a (patch) | |
tree | 356ea498c78778026946c3654aa9549eea20e472 /.gitlab-ci.yml | |
parent | a8e825c41c4b829a174451bd02162c763a2e887e (diff) | |
download | samba-75d2be7da584a017beab493355cb88ce7dc61f4a.tar.gz |
gitlab-ci: set docker image and change tag
1. Specify docker image to use in gitlab-ci.yml
2. Change tag autobuild to docker
So we can use gitlab.com shared runners.
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 287011cd568..ef1cddad45b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,7 @@ # 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 (preparing swap)..." - if [ $(df -m / --output=avail | tail -n1) -gt 10240 ]; then @@ -11,7 +13,7 @@ before_script: build_samba: stage: build tags: - - autobuild + - docker script: # this one takes about 4 hours to finish - python script/autobuild.py samba --verbose --tail --testbase /tmp/samba-testbase @@ -27,7 +29,7 @@ build_samba_none_env: build_samba_others: stage: build tags: - - autobuild + - docker 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 @@ -39,7 +41,7 @@ build_samba_others: build_ctdb: stage: build tags: - - autobuild + - docker script: - python script/autobuild.py samba-ctdb --verbose --tail --testbase /tmp/samba-testbase - python script/autobuild.py ctdb --verbose --tail --testbase /tmp/samba-testbase @@ -47,7 +49,7 @@ build_ctdb: build_others: stage: build tags: - - autobuild + - docker script: - python script/autobuild.py ldb --verbose --tail --testbase /tmp/samba-testbase - python script/autobuild.py pidl --verbose --tail --testbase /tmp/samba-testbase |