diff --git a/components/BUILD.yaml b/components/BUILD.yaml index 6247c18b82221e..43bfe64f6938f8 100644 --- a/components/BUILD.yaml +++ b/components/BUILD.yaml @@ -41,6 +41,7 @@ packages: - components/ide/code-desktop:docker - components/ide/code-desktop:docker-insiders - components/ide/code:docker + - components/ide/jetbrains/launcher:docker - components/ide/jetbrains/backend-plugin:stable - components/ide/jetbrains/backend-plugin:latest - components/ide/jetbrains/image:goland @@ -134,6 +135,7 @@ packages: - components/ws-manager:app - components/ide-metrics:app - components/ide-service:app + - components/ide/jetbrains/launcher:app scripts: - name: update-license-header description: Updates the license header in all source files diff --git a/components/ide-service-api/go/config/ideconfig.go b/components/ide-service-api/go/config/ideconfig.go index c44125235b2ec4..020e8234ed7d8a 100644 --- a/components/ide-service-api/go/config/ideconfig.go +++ b/components/ide-service-api/go/config/ideconfig.go @@ -52,13 +52,19 @@ type IDEOption struct { // This is useful if this image points to a tag like `nightly` that will be updated regularly. When `resolveImageDigest` is `true`, we make sure that we resolve the tag regularly to the most recent image version. ResolveImageDigest bool `json:"resolveImageDigest,omitempty"` // PluginImage ref for the IDE image, this image ref always resolve to digest. + // DEPRECATED use ImageLayers instead PluginImage string `json:"pluginImage,omitempty"` // PluginLatestImage ref for the latest IDE image, this image ref always resolve to digest. + // DEPRECATED use LatestImageLayers instead PluginLatestImage string `json:"pluginLatestImage,omitempty"` // ImageVersion the semantic version of the IDE image. ImageVersion string `json:"imageVersion,omitempty"` // LatestImageVersion the semantic version of the latest IDE image. LatestImageVersion string `json:"latestImageVersion,omitempty"` + // ImageLayers for additional ide layers and dependencies + ImageLayers []string `json:"imageLayers,omitempty"` + // LatestImageLayers for latest additional ide layers and dependencies + LatestImageLayers []string `json:"latestImageLayers,omitempty"` } type IDEClient struct { diff --git a/components/ide-service/example-ide-config.json b/components/ide-service/example-ide-config.json index 77dab087397616..5408d5792a5141 100644 --- a/components/ide-service/example-ide-config.json +++ b/components/ide-service/example-ide-config.json @@ -26,8 +26,14 @@ "logo": "https://ide.gitpod.io/image/ide-logo/golandLogo.svg", "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest@sha256:e07524e52089829dc8d3b38f7d18fb51b24f07aed7d8e4e6e447899687978d43", - "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a-latest" + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a-latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + ] }, "intellij": { "orderKey": "04", @@ -36,8 +42,14 @@ "logo": "https://ide.gitpod.io/image/ide-logo/intellijIdeaLogo.svg", "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest@sha256:e07524e52089829dc8d3b38f7d18fb51b24f07aed7d8e4e6e447899687978d43", - "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a-latest" + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a-latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + ] }, "phpstorm": { "orderKey": "07", @@ -46,8 +58,14 @@ "logo": "https://ide.gitpod.io/image/ide-logo/phpstormLogo.svg", "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest@sha256:e07524e52089829dc8d3b38f7d18fb51b24f07aed7d8e4e6e447899687978d43", - "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a-latest" + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a-latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + ] }, "pycharm": { "orderKey": "06", @@ -56,8 +74,14 @@ "logo": "https://ide.gitpod.io/image/ide-logo/pycharmLogo.svg", "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest@sha256:e07524e52089829dc8d3b38f7d18fb51b24f07aed7d8e4e6e447899687978d43", - "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a-latest" + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a-latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + ] } }, "defaultIde": "code", diff --git a/components/ide-service/pkg/server/server.go b/components/ide-service/pkg/server/server.go index 41d85b39968f65..84447e765f2b76 100644 --- a/components/ide-service/pkg/server/server.go +++ b/components/ide-service/pkg/server/server.go @@ -188,20 +188,6 @@ type WorkspaceContext struct { ReferrerIde string `json:"referrerIde,omitempty"` } -var JetbrainsCode map[string]string - -func init() { - JetbrainsCode = make(map[string]string) - JetbrainsCode["intellij"] = "IIU" - JetbrainsCode["goland"] = "GO" - JetbrainsCode["pycharm"] = "PCP" - JetbrainsCode["phpstorm"] = "PS" - JetbrainsCode["rubymine"] = "RM" - JetbrainsCode["webstorm"] = "WS" - JetbrainsCode["rider"] = "RD" - JetbrainsCode["clion"] = "CL" -} - func (s *IDEServiceServer) resolveReferrerIDE(ideConfig *config.IDEConfig, wsCtx *WorkspaceContext, chosenIDEName string) (ideName string, ideOption *config.IDEOption) { if wsCtx == nil || wsCtx.Referrer == "" { return @@ -264,159 +250,141 @@ func (s *IDEServiceServer) ResolveWorkspaceConfig(ctx context.Context, req *api. WebImage: defaultIde.Image, } - // TODO: reconsider this - // if req.Type != api.WorkspaceType_REGULAR { - // return resp, nil - // } - var wsConfig *gitpodapi.GitpodConfig - var wsContext *WorkspaceContext - var ideSettings *IDESettings - if req.IdeSettings != "" { - if err := json.Unmarshal([]byte(req.IdeSettings), &ideSettings); err != nil { - log.WithError(err).WithField("ideSetting", req.IdeSettings).Error("failed to parse ide settings") - } - } if req.WorkspaceConfig != "" { if err := json.Unmarshal([]byte(req.WorkspaceConfig), &wsConfig); err != nil { log.WithError(err).WithField("workspaceConfig", req.WorkspaceConfig).Error("failed to parse workspace config") } } - if req.Context != "" { - if err := json.Unmarshal([]byte(req.Context), &wsContext); err != nil { - log.WithError(err).WithField("context", req.Context).Error("failed to parse context") - } - } - userIdeName := "" - useLatest := false + if req.Type == api.WorkspaceType_REGULAR { + var ideSettings *IDESettings + var wsContext *WorkspaceContext - if ideSettings != nil { - userIdeName = ideSettings.DefaultIde - useLatest = ideSettings.UseLatestVersion - } + if req.IdeSettings != "" { + if err := json.Unmarshal([]byte(req.IdeSettings), &ideSettings); err != nil { + log.WithError(err).WithField("ideSetting", req.IdeSettings).Error("failed to parse ide settings") + } + } - chosenIDE := defaultIde + if req.Context != "" { + if err := json.Unmarshal([]byte(req.Context), &wsContext); err != nil { + log.WithError(err).WithField("context", req.Context).Error("failed to parse context") + } + } - getUserIDEImage := func(ideOption *config.IDEOption) string { - if useLatest && ideOption.LatestImage != "" { - return ideOption.LatestImage + userIdeName := "" + useLatest := false + + if ideSettings != nil { + userIdeName = ideSettings.DefaultIde + useLatest = ideSettings.UseLatestVersion } - return ideOption.Image - } + chosenIDE := defaultIde - getUserPluginImage := func(ideOption *config.IDEOption) string { - if useLatest && ideOption.PluginLatestImage != "" { - return ideOption.PluginLatestImage + getUserIDEImage := func(ideOption *config.IDEOption) string { + if useLatest && ideOption.LatestImage != "" { + return ideOption.LatestImage + } + + return ideOption.Image } - return ideOption.PluginImage - } + getUserImageLayers := func(ideOption *config.IDEOption) []string { + if useLatest { + return ideOption.LatestImageLayers + } - if userIdeName != "" { - if ide, ok := ideConfig.IdeOptions.Options[userIdeName]; ok { - chosenIDE = &ide + return ideOption.ImageLayers + } - // TODO: Currently this variable reflects the IDE selected in - // user's settings for backward compatibility but in the future - // we want to make it represent the actual IDE. - ideAlias := api.EnvironmentVariable{ - Name: "GITPOD_IDE_ALIAS", - Value: userIdeName, + if userIdeName != "" { + if ide, ok := ideConfig.IdeOptions.Options[userIdeName]; ok { + chosenIDE = &ide + + // TODO: Currently this variable reflects the IDE selected in + // user's settings for backward compatibility but in the future + // we want to make it represent the actual IDE. + ideAlias := api.EnvironmentVariable{ + Name: "GITPOD_IDE_ALIAS", + Value: userIdeName, + } + resp.Envvars = append(resp.Envvars, &ideAlias) } - resp.Envvars = append(resp.Envvars, &ideAlias) } - } - // we always need WebImage for when the user chooses a desktop ide - resp.WebImage = getUserIDEImage(defaultIde) + // we always need WebImage for when the user chooses a desktop ide + resp.WebImage = getUserIDEImage(defaultIde) - var desktopImageLayer string - var desktopPluginImageLayer string - if chosenIDE.Type == config.IDETypeDesktop { - desktopImageLayer = getUserIDEImage(chosenIDE) - desktopPluginImageLayer = getUserPluginImage(chosenIDE) - } else { - resp.WebImage = getUserIDEImage(chosenIDE) - } + var desktopImageLayer string + var userImageLayers []string + if chosenIDE.Type == config.IDETypeDesktop { + desktopImageLayer = getUserIDEImage(chosenIDE) + userImageLayers = getUserImageLayers(chosenIDE) + } else { + resp.WebImage = getUserIDEImage(chosenIDE) + } - ideName, referrer := s.resolveReferrerIDE(ideConfig, wsContext, userIdeName) - if ideName != "" { - resp.RefererIde = ideName - desktopImageLayer = getUserIDEImage(referrer) - desktopPluginImageLayer = getUserPluginImage(referrer) - } + ideName, referrer := s.resolveReferrerIDE(ideConfig, wsContext, userIdeName) + if ideName != "" { + resp.RefererIde = ideName + desktopImageLayer = getUserIDEImage(referrer) + userImageLayers = getUserImageLayers(referrer) + } - if desktopImageLayer != "" { - resp.IdeImageLayers = append(resp.IdeImageLayers, desktopImageLayer) - if desktopPluginImageLayer != "" { - resp.IdeImageLayers = append(resp.IdeImageLayers, desktopPluginImageLayer) + if desktopImageLayer != "" { + resp.IdeImageLayers = append(resp.IdeImageLayers, desktopImageLayer) + resp.IdeImageLayers = append(resp.IdeImageLayers, userImageLayers...) } } jbGW, ok := ideConfig.IdeOptions.Clients["jetbrains-gateway"] if req.Type == api.WorkspaceType_PREBUILD && ok { warmUpTask := "" + imageLayers := make(map[string]struct{}) for _, alias := range jbGW.DesktopIDEs { prebuilds := getPrebuilds(wsConfig, alias) if prebuilds != nil { if prebuilds.Version != "latest" { - template := ` + if ide, ok := ideConfig.IdeOptions.Options[alias]; ok { + for _, ideImageLayer := range ide.ImageLayers { + if _, ok := imageLayers[ideImageLayer]; !ok { + imageLayers[ideImageLayer] = struct{}{} + resp.IdeImageLayers = append(resp.IdeImageLayers, ideImageLayer) + } + } + resp.IdeImageLayers = append(resp.IdeImageLayers, ide.Image) + template := ` echo 'warming up stable release of ${key}...' -echo 'downloading stable ${key} backend...' -mkdir /tmp/backend -curl -sSLo /tmp/backend/backend.tar.gz "https://download.jetbrains.com/product?type=release&distribution=linux&code=${productCode}" -tar -xf /tmp/backend/backend.tar.gz --strip-components=1 --directory /tmp/backend - -echo 'configuring JB system config and caches aligned with runtime...' -printf '\nshared.indexes.download.auto.consent=true' >> "/tmp/backend/bin/idea.properties" -unset JAVA_TOOL_OPTIONS -export IJ_HOST_CONFIG_BASE_DIR=/workspace/.config/JetBrains -export IJ_HOST_SYSTEM_BASE_DIR=/workspace/.cache/JetBrains - -echo 'running stable ${key} backend in warmup mode...' -/tmp/backend/bin/remote-dev-server.sh warmup "$GITPOD_REPO_ROOT" - -echo 'removing stable ${key} backend...' -rm -rf /tmp/backend +JETBRAINS_BACKEND_QUALIFIER=stable /ide-desktop/jb-launcher warmup ${key} ` - if code, ok := JetbrainsCode[alias]; ok { template = strings.ReplaceAll(template, "${key}", alias) - template = strings.ReplaceAll(template, "${productCode}", code) warmUpTask += template } } if prebuilds.Version != "stable" { - template := ` + if ide, ok := ideConfig.IdeOptions.Options[alias]; ok { + for _, latestIdeImageLayer := range ide.LatestImageLayers { + if _, ok := imageLayers[latestIdeImageLayer]; !ok { + imageLayers[latestIdeImageLayer] = struct{}{} + resp.IdeImageLayers = append(resp.IdeImageLayers, latestIdeImageLayer) + } + } + resp.IdeImageLayers = append(resp.IdeImageLayers, ide.LatestImage) + template := ` echo 'warming up latest release of ${key}...' -echo 'downloading latest ${key} backend...' -mkdir /tmp/backend-latest -curl -sSLo /tmp/backend-latest/backend-latest.tar.gz "https://download.jetbrains.com/product?type=release,eap,rc&distribution=linux&code=${productCode}" -tar -xf /tmp/backend-latest/backend-latest.tar.gz --strip-components=1 --directory /tmp/backend-latest - -echo 'configuring JB system config and caches aligned with runtime...' -printf '\nshared.indexes.download.auto.consent=true' >> "/tmp/backend-latest/bin/idea.properties" -unset JAVA_TOOL_OPTIONS -export IJ_HOST_CONFIG_BASE_DIR=/workspace/.config/JetBrains-latest -export IJ_HOST_SYSTEM_BASE_DIR=/workspace/.cache/JetBrains-latest - -echo 'running ${key} backend in warmup mode...' -/tmp/backend-latest/bin/remote-dev-server.sh warmup "$GITPOD_REPO_ROOT" - -echo 'removing latest ${key} backend...' -rm -rf /tmp/backend-latest +JETBRAINS_BACKEND_QUALIFIER=latest /ide-desktop/jb-launcher warmup ${key} ` - if code, ok := JetbrainsCode[alias]; ok { template = strings.ReplaceAll(template, "${key}", alias) - template = strings.ReplaceAll(template, "${productCode}", code) warmUpTask += template } } } } + if warmUpTask != "" { warmUpEncoded := new(bytes.Buffer) enc := json.NewEncoder(warmUpEncoded) @@ -424,6 +392,7 @@ rm -rf /tmp/backend-latest err := enc.Encode(&[]gitpodapi.TaskConfig{{ Init: strings.TrimSpace(warmUpTask), + Name: "GITPOD_JB_WARMUP_TASK", }}) if err != nil { log.WithError(err).Error("cannot marshal warm up task") @@ -432,6 +401,7 @@ rm -rf /tmp/backend-latest resp.Tasks = warmUpEncoded.String() } } + return } diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_imagebuild.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_imagebuild.golden index 22e8d5a9e166fc..d4ab298f485431 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_imagebuild.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_imagebuild.golden @@ -1,13 +1,7 @@ { "Resp": { - "envvars": [ - { - "name": "GITPOD_IDE_ALIAS", - "value": "code" - } - ], "supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139", "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9" }, "Err": "" -} \ No newline at end of file +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild.json b/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild.json deleted file mode 100644 index 6504c0e5bfc45a..00000000000000 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": 1, - "context": "{\"ref\":\"jb-proxy-test\",\"refType\":\"branch\",\"isFile\":false,\"path\":\"\",\"title\":\"andreafalzetti/parcel-demo - jb-proxy-test\",\"revision\":\"3e5e8ce8e2133d9b82259f978cfd10e5b68cc9b4\",\"repository\":{\"cloneUrl\":\"https://github.com/andreafalzetti/parcel-demo.git\",\"host\":\"github.com\",\"name\":\"parcel-demo\",\"owner\":\"andreafalzetti\",\"private\":false,\"fork\":{\"parent\":{\"cloneUrl\":\"https://github.com/akosyakov/parcel-demo.git\",\"host\":\"github.com\",\"name\":\"parcel-demo\",\"owner\":\"akosyakov\",\"private\":false}}},\"normalizedContextURL\":\"https://github.com/andreafalzetti/parcel-demo/tree/jb-proxy-test\",\"checkoutLocation\":\"parcel-demo\",\"upstreamRemoteURI\":\"https://github.com/akosyakov/parcel-demo.git\"}", - "ide_settings": "{\"settingVersion\":\"2.0\",\"defaultIde\":\"code\",\"useLatestVersion\":false}", - "workspace_config": "{\"image\":\"gitpod/workspace-dotnet:latest\",\"tasks\":[{\"command\":\"sudo tinyproxy\\nsudo tail -f /var/log/tinyproxy/tinyproxy.log\\n\"}],\"jetbrains\":{\"intellij\":{\"vmoptions\":\"-Didea.log.debug.categories=#com.intellij.util\",\"plugins\":[\"com.haulmont.jpab\"]}},\"_origin\":\"repo\",\"vscode\":{\"extensions\":[]}}" -} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_code.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_code.golden new file mode 100644 index 00000000000000..063f6ed09e9f3e --- /dev/null +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_code.golden @@ -0,0 +1,17 @@ +{ + "Resp": { + "supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139", + "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9", + "ide_image_layers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", + "eu.gcr.io/gitpod-core-dev/build/ide/goland:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a-latest", + "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest@sha256:e07524e52089829dc8d3b38f7d18fb51b24f07aed7d8e4e6e447899687978d43", + "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest@sha256:e07524e52089829dc8d3b38f7d18fb51b24f07aed7d8e4e6e447899687978d43" + ], + "tasks": "[{\"init\":\"echo 'warming up stable release of intellij...'\\nJETBRAINS_BACKEND_QUALIFIER=stable /ide-desktop/jb-launcher warmup intellij\\n\\necho 'warming up stable release of goland...'\\nJETBRAINS_BACKEND_QUALIFIER=stable /ide-desktop/jb-launcher warmup goland\\n\\necho 'warming up latest release of goland...'\\nJETBRAINS_BACKEND_QUALIFIER=latest /ide-desktop/jb-launcher warmup goland\\n\\necho 'warming up latest release of phpstorm...'\\nJETBRAINS_BACKEND_QUALIFIER=latest /ide-desktop/jb-launcher warmup phpstorm\",\"name\":\"GITPOD_JB_WARMUP_TASK\"}]\n" + }, + "Err": "" +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_code.json b/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_code.json new file mode 100644 index 00000000000000..6a9897f315d495 --- /dev/null +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_code.json @@ -0,0 +1,6 @@ +{ + "type": 1, + "context": "{\"isFile\":false,\"path\":\"\",\"title\":\"gitpod-io/empty \",\"revision\":\"\",\"repository\":{\"cloneUrl\":\"https://github.com/gitpod-io/empty.git\",\"host\":\"github.com\",\"name\":\"empty\",\"owner\":\"gitpod-io\",\"private\":false},\"normalizedContextURL\":\"https://github.com/gitpod-io/empty\",\"checkoutLocation\":\"empty\"}", + "ide_settings": "{\"settingVersion\":\"2.0\",\"defaultIde\":\"code-desktop\",\"useLatestVersion\":false}", + "workspace_config": "{\"tasks\":[{\"init\":\"echo 'init script'\",\"command\":\"echo 'start script'\"}],\"jetbrains\":{\"intellij\":{\"prebuilds\":{\"version\":\"stable\"}},\"phpstorm\":{\"prebuilds\":{\"version\":\"latest\"}},\"goland\":{\"prebuilds\":{\"version\":\"both\"}}},\"_origin\":\"repo\",\"image\":\"docker.io/gitpod/workspace-full:latest\",\"vscode\":{\"extensions\":[]}}" +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_empty.golden similarity index 66% rename from components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild.golden rename to components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_empty.golden index 22e8d5a9e166fc..d4ab298f485431 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_empty.golden @@ -1,13 +1,7 @@ { "Resp": { - "envvars": [ - { - "name": "GITPOD_IDE_ALIAS", - "value": "code" - } - ], "supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139", "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9" }, "Err": "" -} \ No newline at end of file +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_empty.json b/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_empty.json new file mode 100644 index 00000000000000..f9840f5e08b653 --- /dev/null +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_empty.json @@ -0,0 +1,6 @@ +{ + "type": 1, + "context": "{\"isFile\":false,\"path\":\"\",\"title\":\"gitpod-io/empty \",\"revision\":\"\",\"repository\":{\"cloneUrl\":\"https://github.com/gitpod-io/empty.git\",\"host\":\"github.com\",\"name\":\"empty\",\"owner\":\"gitpod-io\",\"private\":false},\"normalizedContextURL\":\"https://github.com/gitpod-io/empty\",\"checkoutLocation\":\"empty\"}", + "ide_settings": "{\"settingVersion\":\"2.0\",\"defaultIde\":\"intellj\",\"useLatestVersion\":false}", + "workspace_config": "{\"tasks\":[{\"init\":\"echo 'init script'\",\"command\":\"echo 'start script'\"}],\"_origin\":\"repo\",\"image\":\"docker.io/gitpod/workspace-full:latest\",\"vscode\":{\"extensions\":[]}}" +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_intellij.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_intellij.golden index a215710cbccba0..fbdc123087a9be 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_intellij.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_intellij.golden @@ -1,18 +1,15 @@ { "Resp": { - "envvars": [ - { - "name": "GITPOD_IDE_ALIAS", - "value": "intellij" - } - ], "supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139", "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9", "ide_image_layers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", "eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", - "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a-latest", + "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest@sha256:e07524e52089829dc8d3b38f7d18fb51b24f07aed7d8e4e6e447899687978d43" ], - "tasks": "[{\"init\":\"echo 'warming up stable release of intellij...'\\necho 'downloading stable intellij backend...'\\nmkdir /tmp/backend\\ncurl -sSLo /tmp/backend/backend.tar.gz \\\"https://download.jetbrains.com/product?type=release\u0026distribution=linux\u0026code=IIU\\\"\\ntar -xf /tmp/backend/backend.tar.gz --strip-components=1 --directory /tmp/backend\\n\\necho 'configuring JB system config and caches aligned with runtime...'\\nprintf '\\\\nshared.indexes.download.auto.consent=true' \u003e\u003e \\\"/tmp/backend/bin/idea.properties\\\"\\nunset JAVA_TOOL_OPTIONS\\nexport IJ_HOST_CONFIG_BASE_DIR=/workspace/.config/JetBrains\\nexport IJ_HOST_SYSTEM_BASE_DIR=/workspace/.cache/JetBrains\\n\\necho 'running stable intellij backend in warmup mode...'\\n/tmp/backend/bin/remote-dev-server.sh warmup \\\"$GITPOD_REPO_ROOT\\\"\\n\\necho 'removing stable intellij backend...'\\nrm -rf /tmp/backend\\n\\necho 'warming up latest release of intellij...'\\necho 'downloading latest intellij backend...'\\nmkdir /tmp/backend-latest\\ncurl -sSLo /tmp/backend-latest/backend-latest.tar.gz \\\"https://download.jetbrains.com/product?type=release,eap,rc\u0026distribution=linux\u0026code=IIU\\\"\\ntar -xf /tmp/backend-latest/backend-latest.tar.gz --strip-components=1 --directory /tmp/backend-latest\\n\\necho 'configuring JB system config and caches aligned with runtime...'\\nprintf '\\\\nshared.indexes.download.auto.consent=true' \u003e\u003e \\\"/tmp/backend-latest/bin/idea.properties\\\"\\nunset JAVA_TOOL_OPTIONS\\nexport IJ_HOST_CONFIG_BASE_DIR=/workspace/.config/JetBrains-latest\\nexport IJ_HOST_SYSTEM_BASE_DIR=/workspace/.cache/JetBrains-latest\\n\\necho 'running intellij backend in warmup mode...'\\n/tmp/backend-latest/bin/remote-dev-server.sh warmup \\\"$GITPOD_REPO_ROOT\\\"\\n\\necho 'removing latest intellij backend...'\\nrm -rf /tmp/backend-latest\"}]\n" + "tasks": "[{\"init\":\"echo 'warming up stable release of intellij...'\\nJETBRAINS_BACKEND_QUALIFIER=stable /ide-desktop/jb-launcher warmup intellij\\n\\necho 'warming up latest release of intellij...'\\nJETBRAINS_BACKEND_QUALIFIER=latest /ide-desktop/jb-launcher warmup intellij\",\"name\":\"GITPOD_JB_WARMUP_TASK\"}]\n" }, "Err": "" } diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_multiple_ide.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_multiple_ide.golden index 462e7385c415fd..063f6ed09e9f3e 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_multiple_ide.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild_multiple_ide.golden @@ -1,18 +1,17 @@ { "Resp": { - "envvars": [ - { - "name": "GITPOD_IDE_ALIAS", - "value": "intellij" - } - ], "supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139", "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9", "ide_image_layers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", "eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", - "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + "eu.gcr.io/gitpod-core-dev/build/ide/goland:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a-latest", + "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest@sha256:e07524e52089829dc8d3b38f7d18fb51b24f07aed7d8e4e6e447899687978d43", + "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest@sha256:e07524e52089829dc8d3b38f7d18fb51b24f07aed7d8e4e6e447899687978d43" ], - "tasks": "[{\"init\":\"echo 'warming up stable release of intellij...'\\necho 'downloading stable intellij backend...'\\nmkdir /tmp/backend\\ncurl -sSLo /tmp/backend/backend.tar.gz \\\"https://download.jetbrains.com/product?type=release\u0026distribution=linux\u0026code=IIU\\\"\\ntar -xf /tmp/backend/backend.tar.gz --strip-components=1 --directory /tmp/backend\\n\\necho 'configuring JB system config and caches aligned with runtime...'\\nprintf '\\\\nshared.indexes.download.auto.consent=true' \u003e\u003e \\\"/tmp/backend/bin/idea.properties\\\"\\nunset JAVA_TOOL_OPTIONS\\nexport IJ_HOST_CONFIG_BASE_DIR=/workspace/.config/JetBrains\\nexport IJ_HOST_SYSTEM_BASE_DIR=/workspace/.cache/JetBrains\\n\\necho 'running stable intellij backend in warmup mode...'\\n/tmp/backend/bin/remote-dev-server.sh warmup \\\"$GITPOD_REPO_ROOT\\\"\\n\\necho 'removing stable intellij backend...'\\nrm -rf /tmp/backend\\n\\necho 'warming up stable release of goland...'\\necho 'downloading stable goland backend...'\\nmkdir /tmp/backend\\ncurl -sSLo /tmp/backend/backend.tar.gz \\\"https://download.jetbrains.com/product?type=release\u0026distribution=linux\u0026code=GO\\\"\\ntar -xf /tmp/backend/backend.tar.gz --strip-components=1 --directory /tmp/backend\\n\\necho 'configuring JB system config and caches aligned with runtime...'\\nprintf '\\\\nshared.indexes.download.auto.consent=true' \u003e\u003e \\\"/tmp/backend/bin/idea.properties\\\"\\nunset JAVA_TOOL_OPTIONS\\nexport IJ_HOST_CONFIG_BASE_DIR=/workspace/.config/JetBrains\\nexport IJ_HOST_SYSTEM_BASE_DIR=/workspace/.cache/JetBrains\\n\\necho 'running stable goland backend in warmup mode...'\\n/tmp/backend/bin/remote-dev-server.sh warmup \\\"$GITPOD_REPO_ROOT\\\"\\n\\necho 'removing stable goland backend...'\\nrm -rf /tmp/backend\\n\\necho 'warming up latest release of goland...'\\necho 'downloading latest goland backend...'\\nmkdir /tmp/backend-latest\\ncurl -sSLo /tmp/backend-latest/backend-latest.tar.gz \\\"https://download.jetbrains.com/product?type=release,eap,rc\u0026distribution=linux\u0026code=GO\\\"\\ntar -xf /tmp/backend-latest/backend-latest.tar.gz --strip-components=1 --directory /tmp/backend-latest\\n\\necho 'configuring JB system config and caches aligned with runtime...'\\nprintf '\\\\nshared.indexes.download.auto.consent=true' \u003e\u003e \\\"/tmp/backend-latest/bin/idea.properties\\\"\\nunset JAVA_TOOL_OPTIONS\\nexport IJ_HOST_CONFIG_BASE_DIR=/workspace/.config/JetBrains-latest\\nexport IJ_HOST_SYSTEM_BASE_DIR=/workspace/.cache/JetBrains-latest\\n\\necho 'running goland backend in warmup mode...'\\n/tmp/backend-latest/bin/remote-dev-server.sh warmup \\\"$GITPOD_REPO_ROOT\\\"\\n\\necho 'removing latest goland backend...'\\nrm -rf /tmp/backend-latest\\n\\necho 'warming up latest release of phpstorm...'\\necho 'downloading latest phpstorm backend...'\\nmkdir /tmp/backend-latest\\ncurl -sSLo /tmp/backend-latest/backend-latest.tar.gz \\\"https://download.jetbrains.com/product?type=release,eap,rc\u0026distribution=linux\u0026code=PS\\\"\\ntar -xf /tmp/backend-latest/backend-latest.tar.gz --strip-components=1 --directory /tmp/backend-latest\\n\\necho 'configuring JB system config and caches aligned with runtime...'\\nprintf '\\\\nshared.indexes.download.auto.consent=true' \u003e\u003e \\\"/tmp/backend-latest/bin/idea.properties\\\"\\nunset JAVA_TOOL_OPTIONS\\nexport IJ_HOST_CONFIG_BASE_DIR=/workspace/.config/JetBrains-latest\\nexport IJ_HOST_SYSTEM_BASE_DIR=/workspace/.cache/JetBrains-latest\\n\\necho 'running phpstorm backend in warmup mode...'\\n/tmp/backend-latest/bin/remote-dev-server.sh warmup \\\"$GITPOD_REPO_ROOT\\\"\\n\\necho 'removing latest phpstorm backend...'\\nrm -rf /tmp/backend-latest\"}]\n" + "tasks": "[{\"init\":\"echo 'warming up stable release of intellij...'\\nJETBRAINS_BACKEND_QUALIFIER=stable /ide-desktop/jb-launcher warmup intellij\\n\\necho 'warming up stable release of goland...'\\nJETBRAINS_BACKEND_QUALIFIER=stable /ide-desktop/jb-launcher warmup goland\\n\\necho 'warming up latest release of goland...'\\nJETBRAINS_BACKEND_QUALIFIER=latest /ide-desktop/jb-launcher warmup goland\\n\\necho 'warming up latest release of phpstorm...'\\nJETBRAINS_BACKEND_QUALIFIER=latest /ide-desktop/jb-launcher warmup phpstorm\",\"name\":\"GITPOD_JB_WARMUP_TASK\"}]\n" }, "Err": "" } diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw.golden index 9b39fcb18f697c..29dc0b9cd5e20f 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw.golden @@ -4,9 +4,10 @@ "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9", "ide_image_layers": [ "eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", - "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" ], "referer_ide": "intellij" }, "Err": "" -} \ No newline at end of file +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_goland.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_goland.golden index 7ab1d3f981fd06..aa5ec157504d9d 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_goland.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_goland.golden @@ -4,9 +4,10 @@ "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9", "ide_image_layers": [ "eu.gcr.io/gitpod-core-dev/build/ide/goland:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", - "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" ], "referer_ide": "goland" }, "Err": "" -} \ No newline at end of file +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid.golden index 9b39fcb18f697c..29dc0b9cd5e20f 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid.golden @@ -4,9 +4,10 @@ "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9", "ide_image_layers": [ "eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", - "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" ], "referer_ide": "intellij" }, "Err": "" -} \ No newline at end of file +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_code.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_code.golden index 940cc309d4649e..50ec1e941bee6b 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_code.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_code.golden @@ -10,9 +10,10 @@ "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9", "ide_image_layers": [ "eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", - "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" ], "referer_ide": "intellij" }, "Err": "" -} \ No newline at end of file +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_code_desktop.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_code_desktop.golden index 493a926657bfd9..8505fdfa23ae5f 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_code_desktop.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_code_desktop.golden @@ -10,9 +10,10 @@ "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9", "ide_image_layers": [ "eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", - "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" ], "referer_ide": "intellij" }, "Err": "" -} \ No newline at end of file +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_goland.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_goland.golden index b809688e334573..735c3e5cc0d007 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_goland.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_goland.golden @@ -10,9 +10,10 @@ "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9", "ide_image_layers": [ "eu.gcr.io/gitpod-core-dev/build/ide/goland:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", - "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" ], "referer_ide": "goland" }, "Err": "" -} \ No newline at end of file +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_invalid_with_intellij.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_invalid_with_intellij.golden index 52a13f0eb73692..c10683285c68bc 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_invalid_with_intellij.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_invalid_with_intellij.golden @@ -10,8 +10,9 @@ "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9", "ide_image_layers": [ "eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", - "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" ] }, "Err": "" -} \ No newline at end of file +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_regular_intellij.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_regular_intellij.golden index 52a13f0eb73692..c10683285c68bc 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_regular_intellij.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_regular_intellij.golden @@ -10,8 +10,9 @@ "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9", "ide_image_layers": [ "eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", - "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" ] }, "Err": "" -} \ No newline at end of file +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_regular_intellij_latest.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_regular_intellij_latest.golden index 67d56d4708b47e..2e26f39dcdca85 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_regular_intellij_latest.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_regular_intellij_latest.golden @@ -10,8 +10,9 @@ "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:nightly@sha256:8669f6ab8dceefde11138bf4bc0ee73b934b2cc47e6135426f05fb4343ec5ab1", "ide_image_layers": [ "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest@sha256:e07524e52089829dc8d3b38f7d18fb51b24f07aed7d8e4e6e447899687978d43", - "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a-latest" + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a-latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" ] }, "Err": "" -} \ No newline at end of file +} diff --git a/components/ide-service/pkg/server/testdata/resolve_ws_config_regular_with_intellij_config.golden b/components/ide-service/pkg/server/testdata/resolve_ws_config_regular_with_intellij_config.golden index 52a13f0eb73692..c10683285c68bc 100644 --- a/components/ide-service/pkg/server/testdata/resolve_ws_config_regular_with_intellij_config.golden +++ b/components/ide-service/pkg/server/testdata/resolve_ws_config_regular_with_intellij_config.golden @@ -10,8 +10,9 @@ "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9", "ide_image_layers": [ "eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df", - "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:commit-b38092639d1783a1957894ddd4f492b3cdc9794a" ] }, "Err": "" -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/BUILD.js b/components/ide/jetbrains/image/BUILD.js index b4d79653986e70..1c4e2270c596d1 100644 --- a/components/ide/jetbrains/image/BUILD.js +++ b/components/ide/jetbrains/image/BUILD.js @@ -55,7 +55,7 @@ const generateIDEBuildPackage = function (ideConfig, qualifier) { name, type: "docker", srcs: ["startup.sh", `supervisor-ide-config_${name}.json`], - deps: ["components/ide/jetbrains/image/status:app", `:download-${name}`, "components/ide/jetbrains/cli:app"], + deps: [`:download-${name}`, "components/ide/jetbrains/cli:app"], config: { dockerfile: "leeway.Dockerfile", metadata: { diff --git a/components/ide/jetbrains/image/create-supervisor-config.js b/components/ide/jetbrains/image/create-supervisor-config.js index 7c722bc653b9eb..f00835af45096b 100644 --- a/components/ide/jetbrains/image/create-supervisor-config.js +++ b/components/ide/jetbrains/image/create-supervisor-config.js @@ -44,7 +44,7 @@ const ideConfigs = [ ideConfigs.forEach((ideConfig) => { const name = ideConfig.name + (qualifier === "stable" ? "" : "-" + qualifier); const template = { - entrypoint: `/ide-desktop/${name}/status`, + entrypoint: `/ide-desktop/jb-launcher`, entrypointArgs: ["{DESKTOPIDEPORT}", ideConfig.name, `Open in ${ideConfig.displayName}`], readinessProbe: { type: "http", diff --git a/components/ide/jetbrains/image/leeway.Dockerfile b/components/ide/jetbrains/image/leeway.Dockerfile index dbd33f2bdd150e..1bc1503b9598ef 100644 --- a/components/ide/jetbrains/image/leeway.Dockerfile +++ b/components/ide/jetbrains/image/leeway.Dockerfile @@ -16,7 +16,6 @@ ARG SUPERVISOR_IDE_CONFIG COPY --from=base_builder --chown=33333:33333 /ide-desktop/ /ide-desktop/ COPY --chown=33333:33333 ${SUPERVISOR_IDE_CONFIG} /ide-desktop/supervisor-ide-config.json COPY --chown=33333:33333 components-ide-jetbrains-image--download-${JETBRAINS_DOWNLOAD_QUALIFIER}/backend /ide-desktop/${JETBRAINS_DOWNLOAD_QUALIFIER}/backend -COPY --chown=33333:33333 components-ide-jetbrains-image-status--app/status /ide-desktop/${JETBRAINS_DOWNLOAD_QUALIFIER} ARG JETBRAINS_BACKEND_QUALIFIER ENV GITPOD_ENV_SET_JETBRAINS_BACKEND_QUALIFIER ${JETBRAINS_BACKEND_QUALIFIER} diff --git a/components/ide/jetbrains/image/status/hot-swap.sh b/components/ide/jetbrains/image/status/hot-swap.sh deleted file mode 100755 index 774a4d43a8ae7c..00000000000000 --- a/components/ide/jetbrains/image/status/hot-swap.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# Copyright (c) 2022 Gitpod GmbH. All rights reserved. -# Licensed under the GNU Affero General Public License (AGPL). -# See License.AGPL.txt in the project root for license information. - -set -Eeuo pipefail - -# This script swaps the backend startup endpoint with a built one -# in a workspace and restarts the JB backend. - -component=${PWD##*/} -workspaceUrl=$(echo "${1}" |sed -e "s/\/$//") -echo "URL: $workspaceUrl" - -workspaceDesc=$(gpctl workspaces describe "$workspaceUrl" -o=json) - -podName=$(echo "$workspaceDesc" | jq .runtime.pod_name -r) -echo "Pod: $podName" - -workspaceId=$(echo "$workspaceDesc" | jq .metadata.meta_id -r) -echo "ID: $workspaceId" - -clusterHost=$(kubectl exec -it "$podName" -- printenv GITPOD_WORKSPACE_CLUSTER_HOST |sed -e "s/\s//g") -echo "Cluster Host: $clusterHost" - -# prepare ssh -ownerToken=$(kubectl get pod "$podName" -o=json | jq ".metadata.annotations.\"gitpod\/ownerToken\"" -r) -sshConfig="./ssh-config" -echo "Host $workspaceId" > "$sshConfig" -echo " Hostname \"$workspaceId.ssh.$clusterHost\"" >> "$sshConfig" -echo " User \"$workspaceId#$ownerToken\"" >> "$sshConfig" - -# upload -uploadDest="/ide-desktop/$component" -echo "Upload Dest: $uploadDest" -scp -F "$sshConfig" -r "./components-ide-jetbrains-image-status--app/status" "$workspaceId":"$uploadDest" - -#link -link="/ide-desktop/status" -ssh -F "$sshConfig" "$workspaceId" ln -sf "$uploadDest" "$link" -echo "Link: $link -> $uploadDest" - -# restart -ssh -F "$sshConfig" "$workspaceId" curl http://localhost:24000/restart && true -echo "Restarted: please reconenct to JB backend to try new changes." diff --git a/components/ide/jetbrains/image/supervisor-ide-config_clion-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_clion-latest.json index a3dbcb8cfe1e59..c36c25eeeef6a9 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_clion-latest.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_clion-latest.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/clion-latest/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "clion", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_clion.json b/components/ide/jetbrains/image/supervisor-ide-config_clion.json index 022f41f15f1c14..c36c25eeeef6a9 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_clion.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_clion.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/clion/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "clion", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_goland-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_goland-latest.json index 4eb9a5748cd9df..d1c4740a9600a9 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_goland-latest.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_goland-latest.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/goland-latest/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "goland", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_goland.json b/components/ide/jetbrains/image/supervisor-ide-config_goland.json index ab74397797d907..d1c4740a9600a9 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_goland.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_goland.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/goland/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "goland", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_intellij-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_intellij-latest.json index 1d36e775d97fa0..12ab2be6798f9c 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_intellij-latest.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_intellij-latest.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/intellij-latest/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "intellij", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_intellij.json b/components/ide/jetbrains/image/supervisor-ide-config_intellij.json index bf25922475fe46..12ab2be6798f9c 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_intellij.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_intellij.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/intellij/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "intellij", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_phpstorm-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_phpstorm-latest.json index bcd84ff879a152..4d958ad6fdc5ae 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_phpstorm-latest.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_phpstorm-latest.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/phpstorm-latest/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "phpstorm", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_phpstorm.json b/components/ide/jetbrains/image/supervisor-ide-config_phpstorm.json index eca86f54e55e75..4d958ad6fdc5ae 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_phpstorm.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_phpstorm.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/phpstorm/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "phpstorm", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_pycharm-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_pycharm-latest.json index 515cdefba663a7..14dd5eae60c3a3 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_pycharm-latest.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_pycharm-latest.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/pycharm-latest/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "pycharm", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_pycharm.json b/components/ide/jetbrains/image/supervisor-ide-config_pycharm.json index 46565be38b1ff3..14dd5eae60c3a3 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_pycharm.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_pycharm.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/pycharm/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "pycharm", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_rider-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_rider-latest.json index 419d9d2541e171..9451a150696938 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_rider-latest.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_rider-latest.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/rider-latest/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "rider", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_rider.json b/components/ide/jetbrains/image/supervisor-ide-config_rider.json index c9aae5d361fca9..9451a150696938 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_rider.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_rider.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/rider/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "rider", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_rubymine-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_rubymine-latest.json index 2a51f2225e1c7c..be603108a3f293 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_rubymine-latest.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_rubymine-latest.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/rubymine-latest/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "rubymine", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_rubymine.json b/components/ide/jetbrains/image/supervisor-ide-config_rubymine.json index 226921b3f48e4f..be603108a3f293 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_rubymine.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_rubymine.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/rubymine/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "rubymine", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_webstorm-latest.json b/components/ide/jetbrains/image/supervisor-ide-config_webstorm-latest.json index 40c62de031d8d6..44bffb68bb1941 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_webstorm-latest.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_webstorm-latest.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/webstorm-latest/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "webstorm", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/image/supervisor-ide-config_webstorm.json b/components/ide/jetbrains/image/supervisor-ide-config_webstorm.json index 91ccc5d0ee6434..44bffb68bb1941 100644 --- a/components/ide/jetbrains/image/supervisor-ide-config_webstorm.json +++ b/components/ide/jetbrains/image/supervisor-ide-config_webstorm.json @@ -1,5 +1,5 @@ { - "entrypoint": "/ide-desktop/webstorm/status", + "entrypoint": "/ide-desktop/jb-launcher", "entrypointArgs": [ "{DESKTOPIDEPORT}", "webstorm", @@ -11,4 +11,4 @@ "path": "/status" } } -} \ No newline at end of file +} diff --git a/components/ide/jetbrains/launcher/.gitignore b/components/ide/jetbrains/launcher/.gitignore new file mode 100644 index 00000000000000..ee092dc684cd79 --- /dev/null +++ b/components/ide/jetbrains/launcher/.gitignore @@ -0,0 +1 @@ +/launcher diff --git a/components/ide/jetbrains/image/status/BUILD.yaml b/components/ide/jetbrains/launcher/BUILD.yaml similarity index 56% rename from components/ide/jetbrains/image/status/BUILD.yaml rename to components/ide/jetbrains/launcher/BUILD.yaml index dd5b36b4c200c0..eb1aeedfa61f7e 100644 --- a/components/ide/jetbrains/image/status/BUILD.yaml +++ b/components/ide/jetbrains/launcher/BUILD.yaml @@ -1,4 +1,18 @@ packages: + - name: docker + type: docker + deps: + - :app + argdeps: + - imageRepoBase + config: + dockerfile: leeway.Dockerfile + metadata: + helm-component: workspace.desktopIdeImages.jbLauncher + buildArgs: + JETBRAINS_BACKEND_QUALIFIER: stable + image: + - ${imageRepoBase}/ide/jb-launcher:commit-${__git_commit} - name: app type: go srcs: @@ -15,7 +29,7 @@ packages: - components/common-go:lib config: packaging: app - buildCommand: ["go", "build", "-trimpath", "-ldflags", "-buildid= -w -s -X 'github.com/gitpod-io/gitpod/jetbrains/status.Version=commit-${__git_commit}'"] + buildCommand: ["go", "build", "-trimpath", "-ldflags", "-buildid= -w -s -X 'github.com/gitpod-io/gitpod/jetbrains/launcher.Version=commit-${__git_commit}'"] - name: hot-swap type: generic deps: diff --git a/components/ide/jetbrains/image/status/go.mod b/components/ide/jetbrains/launcher/go.mod similarity index 94% rename from components/ide/jetbrains/image/status/go.mod rename to components/ide/jetbrains/launcher/go.mod index a4bfb9989c9ae5..91918051807c15 100644 --- a/components/ide/jetbrains/image/status/go.mod +++ b/components/ide/jetbrains/launcher/go.mod @@ -1,4 +1,4 @@ -module github.com/gitpod-io/gitpod/jetbrains/status +module github.com/gitpod-io/gitpod/jetbrains/launcher go 1.19 @@ -37,11 +37,11 @@ require ( gopkg.in/yaml.v2 v2.4.0 ) -replace github.com/gitpod-io/gitpod/common-go => ../../../../common-go // leeway +replace github.com/gitpod-io/gitpod/common-go => ../../../common-go // leeway -replace github.com/gitpod-io/gitpod/gitpod-protocol => ../../../../gitpod-protocol/go // leeway +replace github.com/gitpod-io/gitpod/gitpod-protocol => ../../../gitpod-protocol/go // leeway -replace github.com/gitpod-io/gitpod/supervisor/api => ../../../../supervisor-api/go // leeway +replace github.com/gitpod-io/gitpod/supervisor/api => ../../../supervisor-api/go // leeway replace k8s.io/api => k8s.io/api v0.24.4 // leeway indirect from components/common-go:lib diff --git a/components/ide/jetbrains/image/status/go.sum b/components/ide/jetbrains/launcher/go.sum similarity index 100% rename from components/ide/jetbrains/image/status/go.sum rename to components/ide/jetbrains/launcher/go.sum diff --git a/components/ide/jetbrains/launcher/hot-deploy.sh b/components/ide/jetbrains/launcher/hot-deploy.sh new file mode 100755 index 00000000000000..41c0fd2f99a6b1 --- /dev/null +++ b/components/ide/jetbrains/launcher/hot-deploy.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# Copyright (c) 2022 Gitpod GmbH. All rights reserved. +# Licensed under the GNU Affero General Public License (AGPL). +# See License.AGPL.txt in the project root for license information. + +set -Eeuo pipefail + +# This script builds jb-launcher and updates the IDE config map. + +# TODO(AK) optimize to produce a new version only if launcher was rebuilt +version="dev-jb-launcher-$(date +%F_T"%H-%M-%S")" +echo "Image Version: $version" + +bldfn="/tmp/build-$version.tar.gz" + +docker ps &> /dev/null || (echo "You need a working Docker daemon. Maybe set DOCKER_HOST?"; exit 1) +leeway build -Dversion="$version" -DimageRepoBase=eu.gcr.io/gitpod-core-dev/build .:docker --save "$bldfn" +dev_image="$(tar xfO "$bldfn" ./imgnames.txt | head -n1)" +echo "Dev Image: $dev_image" + +cf_patch=$(kubectl get cm ide-config -o=json | jq '.data."config.json"' |jq -r) +# TODO: Findout how to update the ide config from .ideOptions.options.imageLayers and .ideOptions.options.latestImageLayers +# cf_patch=$(echo "$cf_patch" |jq ".ideOptions.options.intellij.$prop = \"$dev_image\"") +# cf_patch=$(echo "$cf_patch" |jq ".ideOptions.options.goland.$prop = \"$dev_image\"") +# cf_patch=$(echo "$cf_patch" |jq ".ideOptions.options.pycharm.$prop = \"$dev_image\"") +# cf_patch=$(echo "$cf_patch" |jq ".ideOptions.options.phpstorm.$prop = \"$dev_image\"") +# cf_patch=$(echo "$cf_patch" |jq ".ideOptions.options.rubymine.$prop = \"$dev_image\"") +# cf_patch=$(echo "$cf_patch" |jq ".ideOptions.options.webstorm.$prop = \"$dev_image\"") +cf_patch=$(echo "$cf_patch" |jq tostring) +cf_patch="{\"data\": {\"config.json\": $cf_patch}}" + +kubectl patch cm ide-config --type=merge -p "$cf_patch" + +kubectl rollout restart deployment ide-service diff --git a/components/ide/jetbrains/launcher/leeway.Dockerfile b/components/ide/jetbrains/launcher/leeway.Dockerfile new file mode 100644 index 00000000000000..c90875ef6db979 --- /dev/null +++ b/components/ide/jetbrains/launcher/leeway.Dockerfile @@ -0,0 +1,14 @@ +# Copyright (c) 2022 Gitpod GmbH. All rights reserved. +# Licensed under the GNU Affero General Public License (AGPL). +# See License-AGPL.txt in the project root for license information. + +FROM alpine:3.16 as base_builder +RUN mkdir /ide-desktop + +# for debugging +# FROM alpine:3.16 +FROM scratch +ARG JETBRAINS_BACKEND_VERSION +# ensures right permissions for /ide-desktop +COPY --from=base_builder --chown=33333:33333 /ide-desktop/ /ide-desktop/ +COPY --chown=33333:33333 components-ide-jetbrains-launcher--app/launcher /ide-desktop/jb-launcher diff --git a/components/ide/jetbrains/image/status/main.go b/components/ide/jetbrains/launcher/main.go similarity index 99% rename from components/ide/jetbrains/image/status/main.go rename to components/ide/jetbrains/launcher/main.go index eb8da6758016e3..f2d527088c5dce 100644 --- a/components/ide/jetbrains/image/status/main.go +++ b/components/ide/jetbrains/launcher/main.go @@ -42,7 +42,7 @@ const defaultBackendPort = "63342" var ( // ServiceName is the name we use for tracing/logging. - ServiceName = "jetbrains-startup" + ServiceName = "jetbrains-launcher" // Version of this service - set during build. Version = "" ) @@ -487,7 +487,7 @@ func resolveUserEnvs(launchCtx *LaunchContext) (userEnvs []string, err error) { if err != nil { return } - envCmd := exec.Command(shell, []string{"-ilc", launchCtx.productDir + "/status env " + mark.String()}...) + envCmd := exec.Command(shell, []string{"-ilc", "/ide-desktop/jb-launcher env " + mark.String()}...) envCmd.Stderr = os.Stderr output, err := envCmd.Output() if err != nil { diff --git a/components/ide/jetbrains/image/status/main_test.go b/components/ide/jetbrains/launcher/main_test.go similarity index 98% rename from components/ide/jetbrains/image/status/main_test.go rename to components/ide/jetbrains/launcher/main_test.go index 5dd8634ee067f0..7b090beeea0618 100644 --- a/components/ide/jetbrains/image/status/main_test.go +++ b/components/ide/jetbrains/launcher/main_test.go @@ -1,6 +1,6 @@ // Copyright (c) 2022 Gitpod GmbH. All rights reserved. // Licensed under the GNU Affero General Public License (AGPL). -// See License.AGPL.txt in the project root for license information. +// See License-AGPL.txt in the project root for license information. package main diff --git a/components/ide/jetbrains/image/status/testdata/.gitpod.yml b/components/ide/jetbrains/launcher/testdata/.gitpod.yml similarity index 91% rename from components/ide/jetbrains/image/status/testdata/.gitpod.yml rename to components/ide/jetbrains/launcher/testdata/.gitpod.yml index be9a400e3a4fac..d9a38521efa494 100644 --- a/components/ide/jetbrains/image/status/testdata/.gitpod.yml +++ b/components/ide/jetbrains/launcher/testdata/.gitpod.yml @@ -1,6 +1,6 @@ # Copyright (c) 2022 Gitpod GmbH. All rights reserved. # Licensed under the GNU Affero General Public License (AGPL). -# See License.AGPL.txt in the project root for license information. +# See License-AGPL.txt in the project root for license information. # see https://github.com/gitpod-io/spring-petclinic/blob/master/.gitpod.yml tasks: diff --git a/install/installer/cmd/testdata/render/aws-setup/output.golden b/install/installer/cmd/testdata/render/aws-setup/output.golden index a66bea8b112d33..4e92cbbe492a61 100644 --- a/install/installer/cmd/testdata/render/aws-setup/output.golden +++ b/install/installer/cmd/testdata/render/aws-setup/output.golden @@ -1602,6 +1602,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -3525,7 +3528,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -3552,7 +3563,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -3562,7 +3581,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -3572,7 +3599,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -3582,7 +3617,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -3592,7 +3635,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -3602,7 +3653,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -3612,7 +3671,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -5127,7 +5194,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -5154,7 +5229,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -5164,7 +5247,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -5174,7 +5265,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -5184,7 +5283,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -5194,7 +5301,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -5204,7 +5319,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -5214,7 +5337,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/cmd/testdata/render/azure-setup/output.golden b/install/installer/cmd/testdata/render/azure-setup/output.golden index 60150b27abdc5d..907a7de498c548 100644 --- a/install/installer/cmd/testdata/render/azure-setup/output.golden +++ b/install/installer/cmd/testdata/render/azure-setup/output.golden @@ -1557,6 +1557,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -3440,7 +3443,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -3467,7 +3478,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -3477,7 +3496,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -3487,7 +3514,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -3497,7 +3532,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -3507,7 +3550,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -3517,7 +3568,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -3527,7 +3586,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -4988,7 +5055,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -5015,7 +5090,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -5025,7 +5108,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -5035,7 +5126,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -5045,7 +5144,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -5055,7 +5162,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -5065,7 +5180,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -5075,7 +5198,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/cmd/testdata/render/customization/output.golden b/install/installer/cmd/testdata/render/customization/output.golden index f6aba9384be4b5..c91c8182856495 100644 --- a/install/installer/cmd/testdata/render/customization/output.golden +++ b/install/installer/cmd/testdata/render/customization/output.golden @@ -1824,6 +1824,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -4305,7 +4308,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -4332,7 +4343,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -4342,7 +4361,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -4352,7 +4379,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -4362,7 +4397,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -4372,7 +4415,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -4382,7 +4433,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -4392,7 +4451,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -5998,7 +6065,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -6025,7 +6100,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -6035,7 +6118,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -6045,7 +6136,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -6055,7 +6154,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -6065,7 +6172,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -6075,7 +6190,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -6085,7 +6208,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/cmd/testdata/render/external-registry/output.golden b/install/installer/cmd/testdata/render/external-registry/output.golden index 8f9ebb72bc9748..81f4d5ef609d83 100644 --- a/install/installer/cmd/testdata/render/external-registry/output.golden +++ b/install/installer/cmd/testdata/render/external-registry/output.golden @@ -1604,6 +1604,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -3581,7 +3584,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -3608,7 +3619,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -3618,7 +3637,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -3628,7 +3655,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -3638,7 +3673,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -3648,7 +3691,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -3658,7 +3709,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -3668,7 +3727,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -5175,7 +5242,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -5202,7 +5277,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -5212,7 +5295,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -5222,7 +5313,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -5232,7 +5331,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -5242,7 +5349,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -5252,7 +5367,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -5262,7 +5385,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/cmd/testdata/render/gcp-setup/output.golden b/install/installer/cmd/testdata/render/gcp-setup/output.golden index 622620ef44bf4d..882dc3e1d9376d 100644 --- a/install/installer/cmd/testdata/render/gcp-setup/output.golden +++ b/install/installer/cmd/testdata/render/gcp-setup/output.golden @@ -1535,6 +1535,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -3411,7 +3414,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -3438,7 +3449,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -3448,7 +3467,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -3458,7 +3485,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -3468,7 +3503,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -3478,7 +3521,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -3488,7 +3539,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -3498,7 +3557,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -4949,7 +5016,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -4976,7 +5051,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -4986,7 +5069,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -4996,7 +5087,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -5006,7 +5105,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -5016,7 +5123,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -5026,7 +5141,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -5036,7 +5159,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/cmd/testdata/render/http-proxy/output.golden b/install/installer/cmd/testdata/render/http-proxy/output.golden index be500068446207..e113915ef05494 100644 --- a/install/installer/cmd/testdata/render/http-proxy/output.golden +++ b/install/installer/cmd/testdata/render/http-proxy/output.golden @@ -1673,6 +1673,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -3750,7 +3753,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -3777,7 +3788,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -3787,7 +3806,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -3797,7 +3824,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -3807,7 +3842,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -3817,7 +3860,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -3827,7 +3878,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -3837,7 +3896,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -5398,7 +5465,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -5425,7 +5500,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -5435,7 +5518,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -5445,7 +5536,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -5455,7 +5554,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -5465,7 +5572,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -5475,7 +5590,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -5485,7 +5608,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/cmd/testdata/render/kind-ide/output.golden b/install/installer/cmd/testdata/render/kind-ide/output.golden index 3b692271cd948b..c5a812f77005c8 100644 --- a/install/installer/cmd/testdata/render/kind-ide/output.golden +++ b/install/installer/cmd/testdata/render/kind-ide/output.golden @@ -635,6 +635,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -1268,7 +1271,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -1295,7 +1306,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -1305,7 +1324,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -1315,7 +1342,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -1325,7 +1360,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -1335,7 +1378,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -1345,7 +1396,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -1355,7 +1414,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -2523,7 +2590,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -2550,7 +2625,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -2560,7 +2643,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -2570,7 +2661,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -2580,7 +2679,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -2590,7 +2697,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -2600,7 +2715,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -2610,7 +2733,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/cmd/testdata/render/kind-meta/output.golden b/install/installer/cmd/testdata/render/kind-meta/output.golden index 881ab9276bc943..0c85c252aa0268 100644 --- a/install/installer/cmd/testdata/render/kind-meta/output.golden +++ b/install/installer/cmd/testdata/render/kind-meta/output.golden @@ -1218,6 +1218,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -2719,7 +2722,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -2746,7 +2757,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -2756,7 +2775,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -2766,7 +2793,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -2776,7 +2811,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -2786,7 +2829,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -2796,7 +2847,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -2806,7 +2865,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -4272,7 +4339,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -4299,7 +4374,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -4309,7 +4392,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -4319,7 +4410,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -4329,7 +4428,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -4339,7 +4446,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -4349,7 +4464,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -4359,7 +4482,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/cmd/testdata/render/kind-webapp/output.golden b/install/installer/cmd/testdata/render/kind-webapp/output.golden index 317b823427afb6..b8034bf20aeb47 100644 --- a/install/installer/cmd/testdata/render/kind-webapp/output.golden +++ b/install/installer/cmd/testdata/render/kind-webapp/output.golden @@ -956,6 +956,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, diff --git a/install/installer/cmd/testdata/render/kind-workspace/output.golden b/install/installer/cmd/testdata/render/kind-workspace/output.golden index 65be9cbf8c662d..a7fcb1091404bc 100644 --- a/install/installer/cmd/testdata/render/kind-workspace/output.golden +++ b/install/installer/cmd/testdata/render/kind-workspace/output.golden @@ -825,6 +825,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, diff --git a/install/installer/cmd/testdata/render/minimal/output.golden b/install/installer/cmd/testdata/render/minimal/output.golden index 1739e985a15ca3..bda477ac9e411e 100644 --- a/install/installer/cmd/testdata/render/minimal/output.golden +++ b/install/installer/cmd/testdata/render/minimal/output.golden @@ -1670,6 +1670,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -3747,7 +3750,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -3774,7 +3785,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -3784,7 +3803,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -3794,7 +3821,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -3804,7 +3839,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -3814,7 +3857,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -3824,7 +3875,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -3834,7 +3893,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -5395,7 +5462,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -5422,7 +5497,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -5432,7 +5515,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -5442,7 +5533,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -5452,7 +5551,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -5462,7 +5569,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -5472,7 +5587,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -5482,7 +5605,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/cmd/testdata/render/shortname/output.golden b/install/installer/cmd/testdata/render/shortname/output.golden index faba81f57e5169..7597f4482e6e91 100644 --- a/install/installer/cmd/testdata/render/shortname/output.golden +++ b/install/installer/cmd/testdata/render/shortname/output.golden @@ -1670,6 +1670,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -3747,7 +3750,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -3774,7 +3785,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -3784,7 +3803,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -3794,7 +3821,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -3804,7 +3839,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -3814,7 +3857,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -3824,7 +3875,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -3834,7 +3893,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -5395,7 +5462,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -5422,7 +5497,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -5432,7 +5515,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -5442,7 +5533,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -5452,7 +5551,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -5462,7 +5569,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -5472,7 +5587,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -5482,7 +5605,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/cmd/testdata/render/statefulset-customization/output.golden b/install/installer/cmd/testdata/render/statefulset-customization/output.golden index ca16bd9b0dc43c..50720b376f8378 100644 --- a/install/installer/cmd/testdata/render/statefulset-customization/output.golden +++ b/install/installer/cmd/testdata/render/statefulset-customization/output.golden @@ -1682,6 +1682,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -3759,7 +3762,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -3786,7 +3797,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -3796,7 +3815,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -3806,7 +3833,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -3816,7 +3851,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -3826,7 +3869,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -3836,7 +3887,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -3846,7 +3905,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -5407,7 +5474,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -5434,7 +5509,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -5444,7 +5527,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -5454,7 +5545,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -5464,7 +5563,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -5474,7 +5581,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -5484,7 +5599,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -5494,7 +5617,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden index a6b3c694ac90f2..8a03dfe3c07059 100644 --- a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden +++ b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden @@ -1892,6 +1892,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -4080,7 +4083,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -4107,7 +4118,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -4117,7 +4136,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -4127,7 +4154,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -4137,7 +4172,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -4147,7 +4190,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -4157,7 +4208,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -4167,7 +4226,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -5728,7 +5795,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -5755,7 +5830,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -5765,7 +5848,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -5775,7 +5866,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -5785,7 +5884,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -5795,7 +5902,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -5805,7 +5920,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -5815,7 +5938,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/cmd/testdata/render/versions.yaml b/install/installer/cmd/testdata/render/versions.yaml index 50e1f223d9b881..66e877660f9a1c 100644 --- a/install/installer/cmd/testdata/render/versions.yaml +++ b/install/installer/cmd/testdata/render/versions.yaml @@ -105,6 +105,8 @@ components: version: test jbBackendPluginLatest: version: test + jbLauncher: + version: test version: test dockerUp: version: test diff --git a/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden b/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden index a20c452c1fd8db..15836b83e930b3 100644 --- a/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden +++ b/install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden @@ -1672,6 +1672,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -3749,7 +3752,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -3776,7 +3787,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -3786,7 +3805,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -3796,7 +3823,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -3806,7 +3841,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -3816,7 +3859,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -3826,7 +3877,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -3836,7 +3895,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -5397,7 +5464,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -5424,7 +5499,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -5434,7 +5517,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -5444,7 +5535,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -5454,7 +5553,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -5464,7 +5571,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -5474,7 +5589,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -5484,7 +5607,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden index b9762b6d3cde94..26990e931c412b 100644 --- a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden +++ b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden @@ -1673,6 +1673,9 @@ data: }, "jbBackendPluginLatest": { "version": "test" + }, + "jbLauncher": { + "version": "test" } } }, @@ -3750,7 +3753,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -3777,7 +3788,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -3787,7 +3806,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -3797,7 +3824,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -3807,7 +3842,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -3817,7 +3860,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -3827,7 +3878,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -3837,7 +3896,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", @@ -5398,7 +5465,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/clion:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/clion:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "code": { "orderKey": "00", @@ -5425,7 +5500,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/goland:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/goland:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "intellij": { "orderKey": "04", @@ -5435,7 +5518,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/intellij:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "phpstorm": { "orderKey": "07", @@ -5445,7 +5536,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/phpstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "pycharm": { "orderKey": "06", @@ -5455,7 +5554,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/pycharm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rider": { "orderKey": "10", @@ -5465,7 +5572,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rider:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rider:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "rubymine": { "orderKey": "08", @@ -5475,7 +5590,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/rubymine:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] }, "webstorm": { "orderKey": "09", @@ -5485,7 +5608,15 @@ data: "image": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:test", "latestImage": "eu.gcr.io/gitpod-core-dev/build/ide/webstorm:latest", "pluginImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", - "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest" + "pluginLatestImage": "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "imageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:test", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ], + "latestImageLayers": [ + "eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:latest", + "eu.gcr.io/gitpod-core-dev/build/ide/jb-launcher:test" + ] } }, "defaultIde": "code", diff --git a/install/installer/pkg/components/ide-service/ide_config_configmap.go b/install/installer/pkg/components/ide-service/ide_config_configmap.go index 4973c827010bf1..61262b6454efab 100644 --- a/install/installer/pkg/components/ide-service/ide_config_configmap.go +++ b/install/installer/pkg/components/ide-service/ide_config_configmap.go @@ -52,6 +52,7 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) { jbPluginImage := ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginImage.Version) jbPluginLatestImage := resolveLatestImage(ide.JetBrainsBackendPluginImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginLatestImage) + jbLauncherImage := ctx.ImageName(ctx.Config.Repository, ide.JetBrainsLauncherImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsLauncherImage.Version) idecfg := ide_config.IDEConfig{ SupervisorImage: ctx.ImageName(ctx.Config.Repository, workspace.SupervisorImage, ctx.VersionManifest.Components.Workspace.Supervisor.Version), IdeOptions: ide_config.IDEOptions{ @@ -105,6 +106,8 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) { LatestImage: ctx.ImageName(ctx.Config.Repository, ide.IntelliJDesktopIDEImage, "latest"), PluginImage: jbPluginImage, PluginLatestImage: jbPluginLatestImage, + ImageLayers: []string{jbPluginImage, jbLauncherImage}, + LatestImageLayers: []string{jbPluginLatestImage, jbLauncherImage}, }, goland: { OrderKey: "05", @@ -115,6 +118,8 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) { LatestImage: ctx.ImageName(ctx.Config.Repository, ide.GoLandDesktopIdeImage, "latest"), PluginImage: jbPluginImage, PluginLatestImage: jbPluginLatestImage, + ImageLayers: []string{jbPluginImage, jbLauncherImage}, + LatestImageLayers: []string{jbPluginLatestImage, jbLauncherImage}, }, pycharm: { OrderKey: "06", @@ -125,6 +130,8 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) { LatestImage: ctx.ImageName(ctx.Config.Repository, ide.PyCharmDesktopIdeImage, "latest"), PluginImage: jbPluginImage, PluginLatestImage: jbPluginLatestImage, + ImageLayers: []string{jbPluginImage, jbLauncherImage}, + LatestImageLayers: []string{jbPluginLatestImage, jbLauncherImage}, }, phpstorm: { OrderKey: "07", @@ -135,6 +142,8 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) { LatestImage: ctx.ImageName(ctx.Config.Repository, ide.PhpStormDesktopIdeImage, "latest"), PluginImage: jbPluginImage, PluginLatestImage: jbPluginLatestImage, + ImageLayers: []string{jbPluginImage, jbLauncherImage}, + LatestImageLayers: []string{jbPluginLatestImage, jbLauncherImage}, }, rubymine: { OrderKey: "08", @@ -145,6 +154,8 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) { LatestImage: ctx.ImageName(ctx.Config.Repository, ide.RubyMineDesktopIdeImage, "latest"), PluginImage: jbPluginImage, PluginLatestImage: jbPluginLatestImage, + ImageLayers: []string{jbPluginImage, jbLauncherImage}, + LatestImageLayers: []string{jbPluginLatestImage, jbLauncherImage}, }, webstorm: { OrderKey: "09", @@ -155,6 +166,8 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) { LatestImage: ctx.ImageName(ctx.Config.Repository, ide.WebStormDesktopIdeImage, "latest"), PluginImage: jbPluginImage, PluginLatestImage: jbPluginLatestImage, + ImageLayers: []string{jbPluginImage, jbLauncherImage}, + LatestImageLayers: []string{jbPluginLatestImage, jbLauncherImage}, }, rider: { OrderKey: "10", @@ -165,6 +178,8 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) { LatestImage: ctx.ImageName(ctx.Config.Repository, ide.RiderDesktopIdeImage, "latest"), PluginImage: jbPluginImage, PluginLatestImage: jbPluginLatestImage, + ImageLayers: []string{jbPluginImage, jbLauncherImage}, + LatestImageLayers: []string{jbPluginLatestImage, jbLauncherImage}, }, clion: { OrderKey: "11", @@ -175,6 +190,8 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) { LatestImage: ctx.ImageName(ctx.Config.Repository, ide.CLionDesktopIdeImage, "latest"), PluginImage: jbPluginImage, PluginLatestImage: jbPluginLatestImage, + ImageLayers: []string{jbPluginImage, jbLauncherImage}, + LatestImageLayers: []string{jbPluginLatestImage, jbLauncherImage}, }, }, DefaultIde: "code", diff --git a/install/installer/pkg/components/workspace/ide/constants.go b/install/installer/pkg/components/workspace/ide/constants.go index db35a9f3b810e8..8fdae2996098a9 100644 --- a/install/installer/pkg/components/workspace/ide/constants.go +++ b/install/installer/pkg/components/workspace/ide/constants.go @@ -18,4 +18,5 @@ const ( RiderDesktopIdeImage = "ide/rider" CLionDesktopIdeImage = "ide/clion" JetBrainsBackendPluginImage = "ide/jb-backend-plugin" + JetBrainsLauncherImage = "ide/jb-launcher" ) diff --git a/install/installer/pkg/config/versions/versions.go b/install/installer/pkg/config/versions/versions.go index 6cba2dd1af6458..83c177d6b6b483 100644 --- a/install/installer/pkg/config/versions/versions.go +++ b/install/installer/pkg/config/versions/versions.go @@ -67,6 +67,7 @@ type Components struct { CLionLatestImage Versioned `json:"clionLatest"` JetBrainsBackendPluginImage Versioned `json:"jbBackendPlugin"` JetBrainsBackendPluginLatestImage Versioned `json:"jbBackendPluginLatest"` + JetBrainsLauncherImage Versioned `json:"jbLauncher"` } `json:"desktopIdeImages"` } `json:"workspace"` WSDaemon struct {