Puppetizing cp3015-cp3018 as cache uploads

Change-Id: I4bb1445c7f6cbfa1126b46a32afc6d5cf2dfafda