Skip to content

Commit

Permalink
Merge pull request #24872 from chaodaiG/doc-boskos
Browse files Browse the repository at this point in the history
Document why /boskos directory exists, migrate to make rule
  • Loading branch information
k8s-ci-robot authored Mar 7, 2022
2 parents d19f895 + 469bf19 commit 7fa60e9
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 46 deletions.
8 changes: 8 additions & 0 deletions boskos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,11 @@
Boskos has been moved into its own repository under kubernetes-sigs:

https://github.com/kubernetes-sigs/boskos

# What's still here

The only thing matters here is `./cmd/janitor/gcp_janitor.py` script, which is
still used by
[/scenarios/kubernetes_janitor.py#L66](https://github.com/kubernetes/test-infra/blob/d641897cea52d493ef883a4dfa6728ffdfa02dfa/scenarios/kubernetes_janitor.py#L66),
and `/scenarios` had been announced deprecated since 2018, which will be done
with https://github.com/kubernetes/test-infra/issues/20760.
42 changes: 0 additions & 42 deletions boskos/update_prow_config.sh

This file was deleted.

8 changes: 6 additions & 2 deletions config/jobs/kubernetes/test-infra/test-infra-trusted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -442,9 +442,13 @@ postsubmits:
spec:
serviceAccountName: deployer # TODO(fejta): should be pusher
containers:
- image: gcr.io/k8s-staging-test-infra/bazelbuild:v20210930-b6c4097796-test-infra
- image: gcr.io/k8s-staging-test-infra/gcloud-in-go:v20211210-cf89952124
command:
- ./boskos/update_prow_config.sh
- make
args:
- -C
- config/prow
- update-boskos-resources
annotations:
testgrid-dashboards: sig-testing-maintenance
testgrid-tab-name: boskos-config-upload
Expand Down
7 changes: 5 additions & 2 deletions config/prow/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ ZONE_BUILD ?= us-central1-f
JOB_NAMESPACE ?= test-pods

update-config: get-cluster-credentials
kubectl create configmap config --from-file=config.yaml=config.yaml --dry-run -o yaml | kubectl replace configmap config -f -
kubectl create configmap config --from-file=config.yaml=config.yaml --dry-run=client -o yaml | kubectl replace configmap config -f -

update-plugins: get-cluster-credentials
kubectl create configmap plugins --from-file=plugins.yaml=plugins.yaml --dry-run -o yaml | kubectl replace configmap plugins -f -
kubectl create configmap plugins --from-file=plugins.yaml=plugins.yaml --dry-run=client -o yaml | kubectl replace configmap plugins -f -

deploy-prow: get-cluster-credentials
kubectl apply --server-side=true -f ./cluster/prowjob-crd/prowjob_customresourcedefinition.yaml
Expand All @@ -38,6 +38,9 @@ deploy-prow: get-cluster-credentials
deploy-build: get-build-cluster-credentials
kubectl apply -f ./cluster/build/

update-boskos-resources: get-build-cluster-credentials
kubectl create configmap resources --from-file=config=./cluster/build/boskos-resources.yaml --dry-run=client -o yaml | kubectl --namespace=test-pods replace configmap resources -f -

deploy-monitoring: get-cluster-credentials
$(MAKE) -C ./cluster/monitoring apply

Expand Down

0 comments on commit 7fa60e9

Please sign in to comment.