Merge lp:~fnordahl/ubuntu-openstack-ci/bug-1733984 into lp:ubuntu-openstack-ci

Proposed by Frode Nordahl
Status: Merged
Approved by: Frode Nordahl
Approved revision: 440
Merged at revision: 440
Proposed branch: lp:~fnordahl/ubuntu-openstack-ci/bug-1733984
Merge into: lp:ubuntu-openstack-ci
Diff against target: 12 lines (+2/-2)
1 file modified
run/job-parts/osci_job_common.sh (+2/-2)
To merge this branch: bzr merge lp:~fnordahl/ubuntu-openstack-ci/bug-1733984
Reviewer Review Type Date Requested Status
Frode Nordahl Approve
Aurelien Lourot (community) Approve
Review via email: mp+390663@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Aurelien Lourot (aurelien-lourot) :
review: Approve
Revision history for this message
Frode Nordahl (fnordahl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'run/job-parts/osci_job_common.sh'
2--- run/job-parts/osci_job_common.sh 2020-06-16 11:04:05 +0000
3+++ run/job-parts/osci_job_common.sh 2020-09-14 09:29:22 +0000
4@@ -477,8 +477,8 @@
5 function f_tmp_cleanup(){
6 # Clean up tmp dir items as the jenkins user
7 f_line "Cleaning up /tmp (Safe to ignore file/dir permission errors)"
8- time find /tmp -type f -user jenkins -writable -readable -mmin +60 | xargs rm -rf ||:
9- time find /tmp -type d -user jenkins -writable -readable -mmin +60 | xargs rm -rf ||:
10+ time find /tmp -type f -user jenkins -writable -readable -cmin +60 | xargs rm -rf ||:
11+ time find /tmp -type d -user jenkins -writable -readable -cmin +60 | xargs rm -rf ||:
12 }
13
14

Subscribers

People subscribed via source and target branches