[PATCH] Include df in system-info.txt and print in gitlab output,
Andrew Bartlett
abartlet at samba.org
Wed May 23 01:48:05 UTC 2018
This patch changes system-info.txt in the autobuild tarball to include
'df -m .' and 'df -m $TESTBASE'.
It also changes the gitlab ONLY to include this in the normal output.
It is not included in --tail, so shouldn't show up in other public
settings.
Instead for gitlab we keep the tarball and extract the system-info.txt
file in the .gitlab-ci.yml script.
Please review and push!
Thanks,
Andrew Bartlett
--
Andrew Bartlett
https://samba.org/~abartlet/
Authentication Developer, Samba Team https://samba.org
Samba Development and Support, Catalyst IT
https://catalyst.net.nz/services/samba
-------------- next part --------------
From d01764b111bfa1ac6e61b3637b6883b76e55a98e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet at samba.org>
Date: Fri, 18 May 2018 15:51:34 +1200
Subject: [PATCH 1/3] gitlab-ci: Include system-info.txt to give info on
possible failures
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
---
.gitlab-ci-private.yml | 8 ++++----
.gitlab-ci.yml | 37 +++++++++++++++++++------------------
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml
index 6956e712425..6df398f34d8 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 --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 --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 --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 --keeplogs --tail --testbase /tmp/samba-testbase
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71e44c6081c..828472597fa 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 --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 --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 --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 --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 --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 --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 --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 --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 --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 --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 --keeplogs --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py pidl --verbose --keeplogs --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py replace --verbose --keeplogs --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py talloc --verbose --keeplogs --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py tdb --verbose --keeplogs --tail --testbase /tmp/samba-testbase
+ - python script/autobuild.py tevent --verbose --keeplogs --tail --testbase /tmp/samba-testbase
-after_script:
- - echo "Build finished!"
--
2.11.0
From 58154eaee873e9c274a8401271ae96b3f2a9b897 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet at samba.org>
Date: Fri, 18 May 2018 15:53:33 +1200
Subject: [PATCH 2/3] 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>
---
.gitlab-ci-private.yml | 8 ++++----
.gitlab-ci.yml | 32 ++++++++++++++++----------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci-private.yml b/.gitlab-ci-private.yml
index 6df398f34d8..bf045ca3ce6 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 --keeplogs --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 --keeplogs --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 --keeplogs --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 --keeplogs --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 828472597fa..42a425ea68d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,61 +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 --keeplogs --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 --keeplogs --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 --keeplogs --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 --keeplogs --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 --keeplogs --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 --keeplogs --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 --keeplogs --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 --keeplogs --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 --keeplogs --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 --keeplogs --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 --keeplogs --tail --testbase /tmp/samba-testbase
- - python script/autobuild.py pidl --verbose --keeplogs --tail --testbase /tmp/samba-testbase
- - python script/autobuild.py replace --verbose --keeplogs --tail --testbase /tmp/samba-testbase
- - python script/autobuild.py talloc --verbose --keeplogs --tail --testbase /tmp/samba-testbase
- - python script/autobuild.py tdb --verbose --keeplogs --tail --testbase /tmp/samba-testbase
- - python script/autobuild.py tevent --verbose --keeplogs --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
--
2.11.0
From 57e5e374981679e2f98825842a150cbd6496cd12 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet at samba.org>
Date: Fri, 18 May 2018 15:57:39 +1200
Subject: [PATCH 3/3] autobuild: Include information of disk free in
system-info.txt
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
---
script/autobuild.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/script/autobuild.py b/script/autobuild.py
index 65b89d1b40a..98ee90bd532 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -520,7 +520,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)
--
2.11.0
More information about the samba-technical
mailing list