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

fix sig-testing janitor jobs #23848

Merged
merged 2 commits into from
Oct 1, 2021
Merged

fix sig-testing janitor jobs #23848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
731ec58
rm missing projects from janitors
spiffxp Sep 29, 2021
18bc2b3
experiment/ci-janitor: exclude k8s-infra projects
spiffxp Sep 29, 2021
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
9 changes: 3 additions & 6 deletions experiment/ci-janitor/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,15 @@ var (
"kubernetes-scale", // Let it's up/down job handle the resources
"k8s-scale-testing", // As it can be running some manual experiments
// PR projects, migrate to boskos!
"k8s-jkns-pr-gce",
"k8s-jkns-pr-gce-bazel",
"k8s-jkns-pr-gce-etcd3",
"k8s-jkns-pr-gci-gce",
"k8s-jkns-pr-gci-gke",
"k8s-jkns-pr-gci-kubemark",
"k8s-jkns-pr-gke",
"k8s-jkns-pr-kubeadm",
"k8s-jkns-pr-kubemark",
"k8s-jkns-pr-node-e2e",
"k8s-jkns-pr-gce-gpus",
"k8s-presubmit-scale",
// k8s-infra projects, can't be cleaned by k8s-prow serviceaccounts
"k8s-infra-e2e-scale-5k-project",
"k8s-infra-e2e-gpu-project",
Comment on lines +51 to +53
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to list these in the other file you edited as well?

}
)

Expand Down
6 changes: 0 additions & 6 deletions scenarios/kubernetes_janitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,9 @@ def clean_project(project, hours=24, dryrun=False, ratelimit=None, filt=None):
# k8s-jkns-pr-cnry-e2e-gce-fdrtn
# cleans up resources older than 3h
# which is more than enough for presubmit jobs to finish.
'k8s-jkns-pr-gce': 3,
'k8s-jkns-pr-gce-bazel': 3,
'k8s-jkns-pr-gce-etcd3': 3,
'k8s-jkns-pr-gci-gce': 3,
'k8s-jkns-pr-gci-gke': 3,
'k8s-jkns-pr-gci-kubemark': 3,
'k8s-jkns-pr-gke': 3,
'k8s-jkns-pr-kubeadm': 3,
'k8s-jkns-pr-kubemark': 3,
'k8s-jkns-pr-node-e2e': 3,
'k8s-jkns-pr-gce-gpus': 3,
}
Expand Down