Skip to content

Commit

Permalink
Merge branch 'main' into update-readme
Browse files Browse the repository at this point in the history
  • Loading branch information
clauyan authored Dec 5, 2024
2 parents 6bd6406 + 8d7744e commit a3bafc9
Show file tree
Hide file tree
Showing 168 changed files with 25,640 additions and 164 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/trigger-loadtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
description: "Branch to take test code and helm/cron setup from"
required: false
type: string
default: main
default: "main"
branch_img:
description: "Branch to take Dockerfile/img from"
required: false
Expand All @@ -23,7 +23,7 @@ on:
description: "sets CONFIG env var used as k6 input"
required: false
type: string
default: "debug"
default: "plateau"
max_vus:
description: "sets the maximum number of virtual users"
required: false
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,4 @@ dist
.pnp.*

loadtest/data/users.json
loadtest/api-client/generated/
output/
8 changes: 3 additions & 5 deletions charts/schulportal-load-tests/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@ cronjobs:
serviceName: dev-scenario
spsh_base: "https://main.dev.spsh.dbildungsplattform.de"
kc_base: "kc_base"
# jobsParallelism: not used yet but available? test it
staging-scenario:
serviceName: staging-scenario
spsh_base: "https://spsh.staging.spsh.dbildungsplattform.de"
kc_base: "https://keycloak.staging.spsh.dbildungsplattform.de"
# prod-scenario:
# serviceName: prod-scenario
# image: ghcr.io/dbildungsplattform/schulportal-load-tests:latest
# environment: spsh.dbildungsplattform.de
prod-scenario:
serviceName: prod-scenario
spsh_base: "https://spsh.dbildungsplattform.de"
8 changes: 8 additions & 0 deletions loadtest/api-client/generated/.gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions loadtest/api-client/generated/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions loadtest/api-client/generated/.openapi-generator-ignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

144 changes: 144 additions & 0 deletions loadtest/api-client/generated/.openapi-generator/FILES

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions loadtest/api-client/generated/.openapi-generator/VERSION

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a3bafc9

Please sign in to comment.