Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AP-2062 Change version of builders image and change kitchen cleanup task #17529

Merged
merged 4 commits into from
Jun 16, 2023
Merged

AP-2062 Change version of builders image and change kitchen cleanup task #17529

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f431833
Change version of builders image and change kitchen cleanup task
KevinFairise2 Jun 8, 2023
58362e9
remove manual trigger
KevinFairise2 Jun 8, 2023
99f28df
Update builder image
KevinFairise2 Jun 15, 2023
e876cbb
Merge branch 'main' into kfairise/cleanup-artifact-older-than-4-hours
KevinFairise2 Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ variables:
DATADOG_AGENT_NIKOS_BUILDIMAGES: v16026304-782441d
DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v16026304-782441d
DATADOG_AGENT_BUILDERS: v9930706-ef9d493
DATADOG_AGENT_BUILDERS: v16852259-65c480c

DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
DEB_GPG_KEY_ID: ad9589b7
Expand Down
12 changes: 6 additions & 6 deletions .gitlab/maintenance_jobs/kitchen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down