diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2018-08-16 13:53:20 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-08-29 05:28:16 +0200 |
| commit | ce53dd9cf41f195ba784f40f74910891895bf695 (patch) | |
| tree | cc317b92e0bef00915623329dfc0e068799d09c5 | |
| parent | 0da15fa764c61bece2c99e1816ba0e782f2753de (diff) | |
| download | samba-ce53dd9cf41f195ba784f40f74910891895bf695.tar.gz | |
gitlab-ci: Run the new python3 autobuild tasks
These additional tasks should be less complex than the full build and help get us to
a pure python3 build eventually
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
| -rw-r--r-- | .gitlab-ci-private.yml | 18 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 17 |
2 files changed, 35 insertions, 0 deletions
diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml index bf045ca3ce6..bbbeae2cc83 100644 --- a/.gitlab-ci-private.yml +++ b/.gitlab-ci-private.yml @@ -14,12 +14,24 @@ build_samba: # this one takes about 4 hours to finish - python script/autobuild.py samba --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase +build_samba_py3: + <<: *private_template + script: + # this one takes about 4 hours to finish + - python script/autobuild.py samba-py3 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + build_samba_nt4: <<: *private_template script: # this one takes about 1 hours to finish - python script/autobuild.py samba-nt4 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase +build_samba_nt4_py3: + <<: *private_template + script: + # this one takes about 1 hours to finish + - python script/autobuild.py samba-nt4-py3 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + build_samba_fileserver: <<: *private_template script: @@ -32,3 +44,9 @@ build_samba_ad_dc: # this one takes about 1 hours to finish - python script/autobuild.py samba-ad-dc --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase +build_samba_ad_dc_py3: + <<: *private_template + script: + # this one takes about 1 hours to finish + - python script/autobuild.py samba-ad-dc-py3 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42a425ea68d..9aa9fb28ccf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,12 @@ build_samba_none_env: # this one takes about 1 hours to finish - python script/autobuild.py samba-none-env --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase +build_samba_none_env_py3: + <<: *shared_template + script: + # this one takes about 1 hours to finish + - python script/autobuild.py samba-none-env-py3 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + build_samba_nopython: <<: *shared_template script: @@ -55,11 +61,22 @@ build_samba_ad_dc_2: # this one takes about 1 hours to finish - python script/autobuild.py samba-ad-dc-2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase +build_samba_ad_dc_2_py3: + <<: *shared_template + script: + # this one takes about 1 hours to finish + - python script/autobuild.py samba-ad-dc-2-py3 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + build_samba_libs: <<: *shared_template script: - python script/autobuild.py samba-libs --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase +build_samba_libs_py3: + <<: *shared_template + script: + - python script/autobuild.py samba-libs-py3 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + build_samba_static: <<: *shared_template script: |