openstack
/
tripleo-ci
Code Issues Proposed changes

Exclude /var/log/journal from devstack-logs 

Because these are binary, it doesn't make sense to copy these to
logs.o.o.

Change-Id: I85ef6cef0d3977a1e31e1bc59e667b996830711c
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-02-15 14:07:36 -05:00
parent 62400b2b04
commit 6985a2c16a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/common_functions.sh
View File

@ -222,7 +222,7 @@ function postci(){
local i=2
$TARCMD $HOME/*.log > $WORKSPACE/logs/primary_node.tar.xz
# Extract /var/log for easy viewing
tar xf $WORKSPACE/logs/primary_node.tar.xz -C $WORKSPACE/logs/ var/log etc
tar xf $WORKSPACE/logs/primary_node.tar.xz -C $WORKSPACE/logs/ var/log etc --exclude=var/log/journal
# Clean out symlinks, because these seem to break reporting job results
find $WORKSPACE/logs/etc -type l | xargs -t rm -f
for ip in $(cat /etc/nodepool/sub_nodes_private); do
@ -233,7 +233,7 @@ function postci(){
ssh $SSH_OPTIONS -i /etc/nodepool/id_rsa $ip \
$TARCMD > $WORKSPACE/logs/subnode-$i/subnode-$i.tar.xz
# Extract /var/log and /etc for easy viewing
tar xf $WORKSPACE/logs/subnode-$i/subnode-$i.tar.xz -C $WORKSPACE/logs/subnode-$i/ var/log etc
tar xf $WORKSPACE/logs/subnode-$i/subnode-$i.tar.xz -C $WORKSPACE/logs/subnode-$i/ var/log etc --exclude=var/log/journal
# Clean out symlinks, because these seem to break reporting job results
find $WORKSPACE/logs/subnode-$i/etc -type l | xargs -t rm -f
# These files are causing the publish logs ansible

2
scripts/common_vars.bash
View File

@ -30,5 +30,5 @@ export UNDERCLOUD_VM_NAME=instack
SSH_OPTIONS='-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=Verbose -o PasswordAuthentication=no -o ConnectionAttempts=32'
# NOTE(pabelanger): this logic should be inverted to only include what developers need, not exclude things on the filesystem.
TARCMD="sudo XZ_OPT=-3 tar -cJf - --exclude=udev/hwdb.bin --exclude=etc/puppet/modules --exclude=etc/project-config --exclude=etc/services --exclude=selinux/targeted --exclude=etc/services --exclude=etc/pki /var/log /etc"
TARCMD="sudo XZ_OPT=-3 tar -cJf - --exclude=var/log/journal --exclude=udev/hwdb.bin --exclude=etc/puppet/modules --exclude=etc/project-config --exclude=etc/services --exclude=selinux/targeted --exclude=etc/services --exclude=etc/pki /var/log /etc"
JLOGCMD="sudo journalctl --output short-precise | gzip -c | sudo dd of=/var/log/journal-text.txt.gz"