rapid-cdn: Sync ATS log retention to configuration:rotate-num

software/rapid-cdn/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
 
 [profile-frontend]
 filename = instance-frontend.cfg.in
-md5sum = b3c5694042035f13832479dca3481597
+md5sum = af6c2d8dfa36c9012c6ef905689972ff
 
 [profile-master]
 filename = instance-master.cfg.in

software/rapid-cdn/instance-frontend.cfg.in

@@ -651,7 +651,7 @@ output = ${directory:bin}/trafficserver-rotate
 xz_binary = {{ software_parameter_dict['xz_location'] ~ '/bin/xz' }}
 pattern = *.old
 # days to keep log files
-keep_days = 365
+keep_days = ${configuration:rotate-num}
 
 extra-context =
   raw find_executable {{ software_parameter_dict['findutils'] }}/bin/find

software/rapid-cdn/test/test.py

@@ -2111,7 +2111,8 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
       )
 
     # check retention
-    old_time = time.time() - (400 * 24 * 3600)
+    # 4000 is default configuration:rotate-num, so make the log a bit older
+    old_time = time.time() - (4010 * 24 * 3600)
     os.utime(
       os.path.join(ats_logrotate_dir, older_file_name + '.xz'),
       (old_time, old_time))