diff options
author | Noel Power <noel.power@suse.com> | 2018-11-29 21:28:11 +0000 |
---|---|---|
committer | Noel Power <npower@samba.org> | 2018-12-10 10:38:25 +0100 |
commit | 5a804050717e9e885c6354ffacac7827236c81e4 (patch) | |
tree | 66544be9a87ed43bad6ddae799b24f5bb2214463 | |
parent | b0b9c62e1cfcadb1189559e3b4834f2b4a053f8a (diff) | |
download | samba-5a804050717e9e885c6354ffacac7827236c81e4.tar.gz |
CI: Add new py2 CI jobs to replace old py3 ones
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r-- | .gitlab-ci-private.yml | 13 | ||||
-rw-r--r-- | .gitlab-ci.yml | 17 |
2 files changed, 30 insertions, 0 deletions
diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml index 912b28f0d1a..7513c9df6ea 100644 --- a/.gitlab-ci-private.yml +++ b/.gitlab-ci-private.yml @@ -14,6 +14,12 @@ build_samba: # this one takes about 4 hours to finish - python3 script/autobuild.py samba --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase +build_samba_py2: + <<: *private_template + script: + # this one takes about 4 hours to finish + - script/autobuild.py samba-py2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + build_samba_fileserver: <<: *private_template script: @@ -26,3 +32,10 @@ build_samba_ad_dc: # this one takes about 1 hours to finish - python3 script/autobuild.py samba-ad-dc --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + +build_samba_ad_dc_py2: + <<: *private_template + script: + # this one takes about 1 hours to finish + - script/autobuild.py samba-ad-dc-py2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b074bb564f..8409dd1827f 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 - python3 script/autobuild.py samba-none-env --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase +build_samba_none_env_py2: + <<: *shared_template + script: + # this one takes about 1 hours to finish + - script/autobuild.py samba-none-env-py2 --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 - python3 script/autobuild.py samba-ad-dc-2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase +build_samba_ad_dc_2_py2: + <<: *shared_template + script: + # this one takes about 1 hours to finish + - script/autobuild.py samba-ad-dc-2-py2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + build_samba_libs: <<: *shared_template script: - python3 script/autobuild.py samba-libs --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase +build_samba_libs_py2: + <<: *shared_template + script: + - python3 script/autobuild.py samba-libs-py2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + build_samba_static: <<: *shared_template script: |