From 16e853f741dbf49d5e63eb9a17b90e5f132b25a9 Mon Sep 17 00:00:00 2001 From: Serhii Date: Fri, 30 Jan 2026 11:34:05 +0200 Subject: [PATCH 1/2] PredefinedNamespace test should use the latest Dev Spaces VS Code Editor image --- .../specs/miscellaneous/PredefinedNamespace.spec.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/e2e/specs/miscellaneous/PredefinedNamespace.spec.ts b/tests/e2e/specs/miscellaneous/PredefinedNamespace.spec.ts index bccb16dad7c..de215202e39 100644 --- a/tests/e2e/specs/miscellaneous/PredefinedNamespace.spec.ts +++ b/tests/e2e/specs/miscellaneous/PredefinedNamespace.spec.ts @@ -54,11 +54,22 @@ suite(`Create predefined workspace and check it ${BASE_TEST_CONSTANTS.TEST_ENVIR // generate empty workspace DevFile and create it through oc client under a regular user suiteSetup('Login', async function (): Promise { const devfileContent: string = 'schemaVersion: 2.2.0\n' + 'metadata:\n' + ` name: ${workspaceName}\n`; + const devSpacesEditorImage: string = 'quay.io/redhat-user-workloads/devspaces-tenant/devspaces/code-rhel9:latest'; kubernetesCommandLineToolsExecutor.loginToOcp(userName); devWorkspaceConfigurationHelper = new DevWorkspaceConfigurationHelper({ devfileContent }); devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext(); + + // update che-code-injector image to use Dev Spaces VS Code Editor + devfileContext.devWorkspaceTemplates.forEach((template): void => { + template.spec?.components?.forEach((component): void => { + if (component.name === 'che-code-injector' && component.container?.image) { + component.container.image = devSpacesEditorImage; + } + }); + }); + const devWorkspaceConfigurationYamlString: string = devWorkspaceConfigurationHelper.getDevWorkspaceConfigurationYamlAsString(devfileContext); kubernetesCommandLineToolsExecutor.applyWithoutNamespace(devWorkspaceConfigurationYamlString); From 28f9c2fa3052a46b70cab7d939c7ee36b3d9f072 Mon Sep 17 00:00:00 2001 From: Serhii Date: Fri, 30 Jan 2026 13:32:46 +0200 Subject: [PATCH 2/2] update image url only if test starts on DevSpaces --- .../miscellaneous/PredefinedNamespace.spec.ts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/e2e/specs/miscellaneous/PredefinedNamespace.spec.ts b/tests/e2e/specs/miscellaneous/PredefinedNamespace.spec.ts index de215202e39..f926ceea773 100644 --- a/tests/e2e/specs/miscellaneous/PredefinedNamespace.spec.ts +++ b/tests/e2e/specs/miscellaneous/PredefinedNamespace.spec.ts @@ -54,21 +54,24 @@ suite(`Create predefined workspace and check it ${BASE_TEST_CONSTANTS.TEST_ENVIR // generate empty workspace DevFile and create it through oc client under a regular user suiteSetup('Login', async function (): Promise { const devfileContent: string = 'schemaVersion: 2.2.0\n' + 'metadata:\n' + ` name: ${workspaceName}\n`; - const devSpacesEditorImage: string = 'quay.io/redhat-user-workloads/devspaces-tenant/devspaces/code-rhel9:latest'; + const majorMinorVersion: string = BASE_TEST_CONSTANTS.TESTING_APPLICATION_VERSION.split('.').slice(0, 2).join('.'); + const devSpacesEditorImage: string = `quay.io/redhat-user-workloads/devspaces-tenant/devspaces/code-rhel9:${majorMinorVersion}`; kubernetesCommandLineToolsExecutor.loginToOcp(userName); devWorkspaceConfigurationHelper = new DevWorkspaceConfigurationHelper({ devfileContent }); devfileContext = await devWorkspaceConfigurationHelper.generateDevfileContext(); - // update che-code-injector image to use Dev Spaces VS Code Editor - devfileContext.devWorkspaceTemplates.forEach((template): void => { - template.spec?.components?.forEach((component): void => { - if (component.name === 'che-code-injector' && component.container?.image) { - component.container.image = devSpacesEditorImage; - } + // update che-code-injector image to use Dev Spaces VS Code Editor (Dev Spaces only) + if (BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME() === 'devspaces') { + devfileContext.devWorkspaceTemplates.forEach((template): void => { + template.spec?.components?.forEach((component): void => { + if (component.name === 'che-code-injector' && component.container?.image) { + component.container.image = devSpacesEditorImage; + } + }); }); - }); + } const devWorkspaceConfigurationYamlString: string = devWorkspaceConfigurationHelper.getDevWorkspaceConfigurationYamlAsString(devfileContext);