Merge pull request #119 from brianhlin/cleanup-fixups

Cleanup fixups
opensciencegrid · Mar 27, 2020 · e3833bd · e3833bd
2 parents 4ea50dc + a5d0261
commit e3833bd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/bin/vm-test-cleanup b/bin/vm-test-cleanup
@@ -8,7 +8,12 @@ day='[0-3][0-9]'
 hour='[012][0-9]'
 minute='[0-5][0-9]'
 
-cd /osgtest/runs
+cd /osgtest/runs/
 /bin/ls -d run-${year}${month}${day}-${hour}${minute} | head -n -${RUNS_TO_KEEP} | while read rundir; do
     rm -rf "$rundir"
 done
+
+cd /var/www/html/
+/bin/ls -d ${year}${month}${day}-${hour}${minute} | head -n -${RUNS_TO_KEEP} | while read rundir; do
+    rm -rf "$rundir"
+done
diff --git a/rpm/vm-test-cleanup.timer b/rpm/vm-test-cleanup.timer
@@ -1,5 +1,6 @@
 [Unit]
 Description=Cleanup old OSG VM Universe integration test runs periodically
+Requires=vm-test-cleanup.service
 
 [Timer]
 OnBootSec=10min

diff --git a/rpm/vm-test-runs.spec b/rpm/vm-test-runs.spec
@@ -1,6 +1,6 @@
 Summary: OSG VMU test scripts
 Name: vm-test-runs
-Version: 1.0
+Version: 1.1
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: Apache 2.0
@@ -66,6 +66,9 @@ install -D vmu.css %{buildroot}/%{_localstatedir}/www/html/vmu.css
 %{_localstatedir}/www/html/vmu.css
 
 %changelog
+* Fri Mar 27 2020 Brian Lin <blin@cs.wisc.edu> 1.1-1
+- VM test run service cleanup fixes
+
 * Tue Mar 24 2020 Brian Lin <blin@cs.wisc.edu> 1.0-1
 - Package CSS file
 - Systemd unit file fixes