[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed May 23 22:43:03 UTC 2018
The branch, master has been updated
via 0e11fab autobuild: Include information of disk free in system-info.txt
via a092a66 gitlab-ci: Do not hide a possible out-of-space condition by cleaning up the tree
via 2db4cb3 gitlab-ci: Include system-info.txt to give info on possible failures
from 2fa2f13 dsdb: Avoid calculating the PSO multiple times
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0e11fabbfaf201e733cee7d39559714fb4a18c17
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 18 15:57:39 2018 +1200
autobuild: Include information of disk free in system-info.txt
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Thu May 24 00:42:48 CEST 2018 on sn-devel-144
commit a092a6650017290efd80eb73bdfc3a09be95f025
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 18 15:53:33 2018 +1200
gitlab-ci: Do not hide a possible out-of-space condition by cleaning up the tree
These are VMs anyway and will soon vanish, so a cleanup is totally wasted in any case.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 2db4cb3596d1dc79a861f6f2be4ef0aeefd00f0f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 18 15:51:34 2018 +1200
gitlab-ci: Include system-info.txt to give info on possible failures
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-private.yml | 8 ++++----
.gitlab-ci.yml | 37 +++++++++++++++++++------------------
script/autobuild.py | 3 ++-
3 files changed, 25 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml
index 6956e71..bf045ca 100644
--- a/.gitlab-ci-private.yml
+++ b/.gitlab-ci-private.yml
@@ -12,23 +12,23 @@ build_samba:
<<: *private_template
script:
# this one takes about 4 hours to finish
- - python script/autobuild.py samba --verbose --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py samba --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 --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py samba-nt4 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
build_samba_fileserver:
<<: *private_template
script:
# this one takes about 1 hours to finish
- - python script/autobuild.py samba-fileserver --verbose --tail --testbase /tmp/samba-testbase
+ - python 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
- - python script/autobuild.py samba-ad-dc --verbose --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py samba-ad-dc --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71e44c6..42a425e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,9 @@ before_script:
sudo swapon /samba-swap;
fi
+after_script:
+ - tar -xf logs.tar.gz system-info.txt -O
+
.shared_template: &shared_template
stage: build
tags:
@@ -24,63 +27,61 @@ build_samba_none_env:
<<: *shared_template
script:
# this one takes about 1 hours to finish
- - python script/autobuild.py samba-none-env --verbose --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py samba-none-env --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
build_samba_nopython:
<<: *shared_template
script:
- - python script/autobuild.py samba-nopython --verbose --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py samba-nopython --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
build_samba_systemkrb5:
<<: *shared_template
script:
- - python script/autobuild.py samba-systemkrb5 --verbose --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py samba-systemkrb5 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
build_samba_xc:
<<: *shared_template
script:
- - python script/autobuild.py samba-xc --verbose --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py samba-xc --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
build_samba_o3:
<<: *shared_template
script:
- - python script/autobuild.py samba-o3 --verbose --tail --testbase /tmp/samba-testbase
+ - python 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
- - python script/autobuild.py samba-ad-dc-2 --verbose --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py samba-ad-dc-2 --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
build_samba_libs:
<<: *shared_template
script:
- - python script/autobuild.py samba-libs --verbose --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py samba-libs --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
build_samba_static:
<<: *shared_template
script:
- - python script/autobuild.py samba-static --verbose --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py samba-static --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
build_ctdb:
<<: *shared_template
script:
- - python script/autobuild.py samba-ctdb --verbose --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py samba-ctdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
build_samba_ctdb:
<<: *shared_template
script:
- - python script/autobuild.py ctdb --verbose --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py ctdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
build_others:
<<: *shared_template
script:
- - python script/autobuild.py ldb --verbose --tail --testbase /tmp/samba-testbase
- - python script/autobuild.py pidl --verbose --tail --testbase /tmp/samba-testbase
- - python script/autobuild.py replace --verbose --tail --testbase /tmp/samba-testbase
- - python script/autobuild.py talloc --verbose --tail --testbase /tmp/samba-testbase
- - python script/autobuild.py tdb --verbose --tail --testbase /tmp/samba-testbase
- - python script/autobuild.py tevent --verbose --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py ldb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py pidl --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py replace --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py talloc --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py tdb --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py tevent --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
-after_script:
- - echo "Build finished!"
diff --git a/script/autobuild.py b/script/autobuild.py
index 5fff092..2d71b5e 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -523,7 +523,8 @@ class buildlist(object):
def write_system_info(self):
filename = 'system-info.txt'
f = open(filename, 'w')
- for cmd in ['uname -a', 'free', 'cat /proc/cpuinfo', 'cc --version']:
+ for cmd in ['uname -a', 'free', 'cat /proc/cpuinfo',
+ 'cc --version', 'df -m .', 'df -m %s' % testbase]:
print('### %s' % cmd, file=f)
print(run_cmd(cmd, output=True, checkfail=False), file=f)
print(file=f)
--
Samba Shared Repository
More information about the samba-cvs
mailing list