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.

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

add e2e scale projects #898

Merged
merged 1 commit into from
May 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
image: gcr.io/k8s-prow/boskos/janitor:v20200422-8c8546d74
args:
- --boskos-url=http://boskos.test-pods.svc.cluster.local.
- --resource-type=k8s-infra-gce-project
- --resource-type=k8s-infra-gce-project,scalability-project
- --pool-size=20
- --
- --hours=0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ spec:
image: gcr.io/k8s-prow/boskos/reaper:v20200422-8c8546d74
args:
- --boskos-url=http://boskos.test-pods.svc.cluster.local.
- --resource-type=k8s-infra-gce-project
- --resource-type=k8s-infra-gce-project,scalability-project
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,11 @@ resources:
- k8s-infra-e2e-boskos-040
state: dirty
type: k8s-infra-gce-project
- names:
- k8s-infra-e2e-boskos-scale-01
- k8s-infra-e2e-boskos-scale-02
- k8s-infra-e2e-boskos-scale-03
- k8s-infra-e2e-boskos-scale-04
- k8s-infra-e2e-boskos-scale-05
state: dirty
type: scalability-project
22 changes: 20 additions & 2 deletions infra/gcp/ensure-e2e-projects.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,35 @@ ensure_regional_address \

## setup projects to be used by e2e tests for standing up clusters

E2E_PROJECTS=(
E2E_MANUAL_PROJECTS=(
# for manual use during node-e2e job migration, eg: --gcp-project=k8s-infra-e2e-gce-project
k8s-infra-e2e-gce-project
# for manual use during job migration, eg: --gcp-project=k8s-infra-e2e-node-e2e-project
k8s-infra-e2e-node-e2e-project
# for manual use during job migration, eg: --gcp-projec=k8s-infra-e2e-scale-project
k8s-infra-e2e-scale-project
)

# general purpose e2e projects, no quota changes
E2E_BOSKOS_PROJECTS=()
for i in $(seq 1 40); do
E2E_PROJECTS+=($(printf "k8s-infra-e2e-boskos-%03i" $i))
E2E_BOSKOS_PROJECTS+=($(printf "k8s-infra-e2e-boskos-%03i" $i))
done

# e2e projects for scalability jobs
# - us-east1 cpu quota raised to 125
# - us-east1 in-use addresses quota raised to 125
E2E_SCALE_PROJECTS=()
for i in $(seq 1 5); do
E2E_SCALE_PROJECTS+=($(printf "k8s-infra-e2e-boskos-scale-%02i" $i))
done

E2E_PROJECTS=(
"${E2E_MANUAL_PROJECTS[@]}"
"${E2E_BOSKOS_PROJECTS[@]}"
"${E2E_SCALE_PROJECTS[@]}"
)

if [ $# = 0 ]; then
# default to all e2e projects
set -- "${E2E_PROJECTS[@]}"
Expand Down