search

puppetlabs / gatling-puppet-load-test

34 stars 44 forks source link

(SLV-691) Delete left over puppet logdir #351

Closed johnduarte closed 4 years ago

johnduarte commented 4 years ago

This commit updates the copy_system_logs helper to delete the system log file tree left over by the beaker archive_file_from helper.

billclaytor commented 4 years ago

The contents of the .tgz file includes the full directory tree of the results dir. It seems like the directory tree should just include the log dir:

bill.claytor:~/Downloads/PERF_1573500768/ip-10-227-1-19.amz-dev.puppet.net> tree results
results
└── perf
    └── PERF_1573500768
        └── ip-10-227-1-19.amz-dev.puppet.net
            └── var
                └── log
                    └── puppetlabs
johnduarte commented 4 years ago

The contents of the .tgz file includes the full directory tree of the results dir. It seems like the directory tree should just include the log dir:

bill.claytor:~/Downloads/PERF_1573500768/ip-10-227-1-19.amz-dev.puppet.net> tree results
results
└── perf
    └── PERF_1573500768
        └── ip-10-227-1-19.amz-dev.puppet.net
            └── var
                └── log
                    └── puppetlabs

@billclaytor this bug has been addressed. The PR has undergone a complete rewrite, so this PR need a complete re-review.

In a test case where @archive_root is set to /tmp/foobar, the following results are obtained when running the copy_system_logs helper...

$ tree /tmp/foobar
/tmp/foobar
├── aerobic-record.delivery.puppetlabs.net
│   └── puppet_logdir.tgz
└── western-ileum.delivery.puppetlabs.net
    └── puppet_logdir.tgz
$ tar -tzf /tmp/foobar/aerobic-record.delivery.puppetlabs.net/puppet_logdir.tgz
puppetlabs/
puppetlabs/installer/
puppetlabs/installer/2019-11-12T18.23.28+0000.install.log
puppetlabs/puppet/
puppetlabs/pxp-agent/
puppetlabs/pxp-agent/pxp-agent.log
puppetlabs/puppetserver/
...