diff options
| author | Noel Power <noel.power@suse.com> | 2018-12-10 07:36:15 +0000 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2018-12-10 14:32:24 +0100 |
| commit | f7516971b566f6099abcaf4e6ad42102cc6c9b07 (patch) | |
| tree | f3285d5ff29ce94866600185d228db38c74c39f6 | |
| parent | bc92277a79bd393b9e1389e0069e4a4725675eff (diff) | |
| download | samba-f7516971b566f6099abcaf4e6ad42102cc6c9b07.tar.gz | |
CI: Adjust CI tasks for new python3 autobuild.py default
Now that autobuild has defaulted to python3 (via shebang) we no longer
need to explicity call autobuild.py with 'python3'
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Mon Dec 10 14:32:24 CET 2018 on sn-devel-144
| -rw-r--r-- | .gitlab-ci-private.yml | 6 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 34 |
2 files changed, 20 insertions, 20 deletions
diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml index 7513c9df6ea..c3860685a80 100644 --- a/.gitlab-ci-private.yml +++ b/.gitlab-ci-private.yml @@ -12,7 +12,7 @@ build_samba: <<: *private_template script: # this one takes about 4 hours to finish - - python3 script/autobuild.py samba --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py samba --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_samba_py2: <<: *private_template @@ -24,13 +24,13 @@ build_samba_fileserver: <<: *private_template script: # this one takes about 1 hours to finish - - python3 script/autobuild.py samba-fileserver --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py samba-fileserver --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_samba_ad_dc: <<: *private_template script: # this one takes about 1 hours to finish - - python3 script/autobuild.py samba-ad-dc --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py samba-ad-dc --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_samba_ad_dc_py2: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8409dd1827f..04d57cb0491 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ build_samba_none_env: <<: *shared_template script: # this one takes about 1 hours to finish - - python3 script/autobuild.py samba-none-env --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py samba-none-env --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_samba_none_env_py2: <<: *shared_template @@ -38,28 +38,28 @@ build_samba_none_env_py2: build_samba_nopython: <<: *shared_template script: - - python3 script/autobuild.py samba-nopython --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py samba-nopython --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_samba_systemkrb5: <<: *shared_template script: - - python3 script/autobuild.py samba-systemkrb5 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py samba-systemkrb5 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_samba_xc: <<: *shared_template script: - - python3 script/autobuild.py samba-xc --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py samba-xc --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_samba_o3: <<: *shared_template script: - - python3 script/autobuild.py samba-o3 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py samba-o3 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_samba_ad_dc_2: <<: *shared_template script: # this one takes about 1 hours to finish - - python3 script/autobuild.py samba-ad-dc-2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py samba-ad-dc-2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_samba_ad_dc_2_py2: <<: *shared_template @@ -70,37 +70,37 @@ build_samba_ad_dc_2_py2: build_samba_libs: <<: *shared_template script: - - python3 script/autobuild.py samba-libs --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - 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 + - script/autobuild.py samba-libs-py2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_samba_static: <<: *shared_template script: - - python3 script/autobuild.py samba-static --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py samba-static --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_ctdb: <<: *shared_template script: - - python3 script/autobuild.py ctdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py ctdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_samba_ctdb: <<: *shared_template script: - - python3 script/autobuild.py samba-ctdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py samba-ctdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_others: <<: *shared_template script: - - python3 script/autobuild.py ldb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase - - python3 script/autobuild.py pidl --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase - - python3 script/autobuild.py replace --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase - - python3 script/autobuild.py talloc --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase - - python3 script/autobuild.py tdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase - - python3 script/autobuild.py tevent --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py ldb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py pidl --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py replace --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py talloc --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py tdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase + - script/autobuild.py tevent --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase build_samba_buildpy2_only: <<: *shared_template |