[loadgen] Support per-repo clone targets

gitpod-io · Jul 19, 2021 · f5793c3 · f5793c3
1 parent 7aaab34
commit f5793c3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/dev/loadgen/pkg/loadgen/generator.go b/dev/loadgen/pkg/loadgen/generator.go
@@ -156,6 +156,7 @@ func (f *FixedLoadGenerator) Close() error {
 type WorkspaceCfg struct {
 	CloneURL       string `json:"cloneURL"`
 	WorkspaceImage string `json:"workspaceImage"`
+	CloneTarget    string `json:"cloneTarget"`
 }
 
 type MultiWorkspaceGenerator struct {
@@ -183,7 +184,7 @@ func (f *MultiWorkspaceGenerator) Generate() (*StartWorkspaceSpec, error) {
 		Spec: &csapi.WorkspaceInitializer_Git{
 			Git: &csapi.GitInitializer{
 				CheckoutLocation: "",
-				CloneTaget:       "main",
+				CloneTaget:       repo.CloneTarget,
 				RemoteUri:        repo.CloneURL,
 				TargetMode:       csapi.CloneTargetMode_REMOTE_BRANCH,
 				Config: &csapi.GitConfig{

diff --git a/dev/loadgen/prod-benchmark.yaml b/dev/loadgen/prod-benchmark.yaml
@@ -2,21 +2,26 @@
 ##    loadgen benchmark prod-benchmark.yaml
 
 workspaces: 500
-ideImage: eu.gcr.io/gitpod-core-dev/build/ide/code:commit-8c1466008dedabe79d82cbb91931a16f7ce7994c
+ideImage: eu.gcr.io/gitpod-core-dev/build/ide/code:commit-ff263e14024f00d0ed78386b4417dfa6bcd4ae2f
 repos:
   - cloneURL: https://github.com/gitpod-io/template-typescript-node/
+    cloneTarget: master
     # image: gitpod/workspace-mongodb
     workspaceImage: eu.gcr.io/gitpod-dev/workspace-images:53489ee25aa4d1797edd10485d8ecc2fc7a7456ae37718399a54efb498f7236f
   - cloneURL: https://github.com/gitpod-io/template-typescript-react
+    cloneTarget: main
     # image: gitpod/workspace-full:latest
     workspaceImage: eu.gcr.io/gitpod-dev/workspace-images:63bf2cbae693a7ecf60a40fb1eadc90b83a99919a2a010019a336a81b0c54b84
   - cloneURL: https://github.com/gitpod-io/template-python-django/
+    cloneTarget: master
     # image: gitpod/workspace-full:latest
     workspaceImage: eu.gcr.io/gitpod-dev/workspace-images:63bf2cbae693a7ecf60a40fb1eadc90b83a99919a2a010019a336a81b0c54b84
   - cloneURL: https://github.com/gitpod-io/template-python-flask
+    cloneTarget: master
     # image: gitpod/workspace-full:latest
     workspaceImage: eu.gcr.io/gitpod-dev/workspace-images:63bf2cbae693a7ecf60a40fb1eadc90b83a99919a2a010019a336a81b0c54b84
   - cloneURL: https://github.com/gitpod-io/spring-petclinic/
+    cloneTarget: main
     # image: gitpod/workspace-full:latest
     workspaceImage: eu.gcr.io/gitpod-dev/workspace-images:63bf2cbae693a7ecf60a40fb1eadc90b83a99919a2a010019a336a81b0c54b84
 #  - cloneURL: https://github.com/gitpod-io/template-php-drupal-ddev
@@ -29,14 +34,18 @@ repos:
     # image: (dockerfile)
     #workspaceImage:
   - cloneURL: https://github.com/gitpod-io/template-golang-cli/
+    cloneTarget: master
     # image: gitpod/workspace-full:latest
     workspaceImage: eu.gcr.io/gitpod-dev/workspace-images:63bf2cbae693a7ecf60a40fb1eadc90b83a99919a2a010019a336a81b0c54b84
   - cloneURL: https://github.com/gitpod-io/template-rust-cli/
+    cloneTarget: main
     # image: gitpod/workspace-full:latest
     workspaceImage: eu.gcr.io/gitpod-dev/workspace-images:63bf2cbae693a7ecf60a40fb1eadc90b83a99919a2a010019a336a81b0c54b84
   - cloneURL: https://github.com/gitpod-io/template-dotnet-core-cli-csharp/
+    cloneTarget: main
     # image: gitpod/workspace-dotnet
     workspaceImage: eu.gcr.io/gitpod-dev/workspace-images:0b62a3c575c8f00b9130f8a6572d9b4fd935e06de4498cef4ec2db8507cd6159
   - cloneURL: https://github.com/gitpod-io/template-sveltejs/
+    cloneTarget: main
     # image: gitpod/workspace-full:latest
     workspaceImage: eu.gcr.io/gitpod-dev/workspace-images:63bf2cbae693a7ecf60a40fb1eadc90b83a99919a2a010019a336a81b0c54b84