diff options
author | Andrew Bartlett <abartlet@samba.org> | 2018-04-30 20:38:43 +1200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2018-05-03 08:17:44 +0200 |
commit | 6784283844dc231dad428d0c45088c1f7df404b3 (patch) | |
tree | 9c1f4df3929242f0c9b09db6a3fa1329be11fd87 | |
parent | d0d32fc04f723dccb298dfb3824c6241e3135a57 (diff) | |
download | samba-6784283844dc231dad428d0c45088c1f7df404b3.tar.gz |
gitlab-ci: Run samba-ad-dc-2 in the shared environment
This will allow more AD DC tests to run for those without access
to a private gitlab runner.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
-rw-r--r-- | .gitlab-ci-private.yml | 5 | ||||
-rw-r--r-- | .gitlab-ci.yml | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml index 3a1e982d93d..6956e712425 100644 --- a/.gitlab-ci-private.yml +++ b/.gitlab-ci-private.yml @@ -32,8 +32,3 @@ build_samba_ad_dc: # this one takes about 1 hours to finish - python script/autobuild.py samba-ad-dc --verbose --tail --testbase /tmp/samba-testbase -build_samba_ad_dc_2: - <<: *private_template - script: - # this one takes about 1 hours to finish - - python script/autobuild.py samba-ad-dc-2 --verbose --tail --testbase /tmp/samba-testbase diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b151599f12c..71e44c6081c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,6 +46,12 @@ build_samba_o3: script: - python script/autobuild.py samba-o3 --verbose --tail --testbase /tmp/samba-testbase +build_samba_ad_dc_2: + <<: *shared_template + script: + # this one takes about 1 hours to finish + - python script/autobuild.py samba-ad-dc-2 --verbose --tail --testbase /tmp/samba-testbase + build_samba_libs: <<: *shared_template script: |