AP-2062 Change version of builders image and change kitchen cleanup t…

…ask (#17529)

* Change version of builders image and change kitchen cleanup task

* remove manual trigger

* Update builder image

.gitlab/maintenance_jobs/kitchen.yml

@@ -8,12 +8,12 @@ periodic_kitchen_cleanup_s3:
   rules:
     !reference [.on_testing_cleanup]
   script:
-    - aws s3 rm --recursive s3://$DEB_TESTING_S3_BUCKET/pool
-    - aws s3 rm --recursive s3://$DEB_TESTING_S3_BUCKET/dists
-    - aws s3 rm --recursive s3://$RPM_TESTING_S3_BUCKET/testing/
-    - aws s3 rm --recursive s3://$RPM_TESTING_S3_BUCKET/suse/testing/
-    - aws s3 rm --recursive s3://$WIN_S3_BUCKET/pipelines/A6/
-    - aws s3 rm --recursive s3://$WIN_S3_BUCKET/pipelines/A7/
+    - BUCKET_NAME=$DEB_TESTING_S3_BUCKET BUCKET_PREFIX=pool python3.6 /deploy_scripts/cleanup_s3.py
+    - BUCKET_NAME=$DEB_TESTING_S3_BUCKET BUCKET_PREFIX=dists python3.6 /deploy_scripts/cleanup_s3.py
+    - BUCKET_NAME=$RPM_TESTING_S3_BUCKET BUCKET_PREFIX=testing/ python3.6 /deploy_scripts/cleanup_s3.py
+    - BUCKET_NAME=$RPM_TESTING_S3_BUCKET BUCKET_PREFIX=suse/testing/ python3.6 /deploy_scripts/cleanup_s3.py
+    - BUCKET_NAME=$WIN_S3_BUCKET BUCKET_PREFIX=pipelines/A6/ python3.6 /deploy_scripts/cleanup_s3.py
+    - BUCKET_NAME=$WIN_S3_BUCKET BUCKET_PREFIX=pipelines/A7/ python3.6 /deploy_scripts/cleanup_s3.py
 
 # Kills any VMs that might have been left over by kitchen
 # The script only deletes VMs that have been there for >= 4 hours, which is more than the time limit