From d2aa3d6ff34dc86d7a9e9305747edb56c6b71ee8 Mon Sep 17 00:00:00 2001 From: Aleksandr Shmaraiev Date: Tue, 24 Dec 2024 10:34:38 +0200 Subject: [PATCH] Update to overload 'deleteDevWorkspace' method --- tests/e2e/specs/api/GoDevFileAPI.spec.ts | 6 +++-- tests/e2e/specs/api/PhpDevFileAPI.spec.ts | 6 +++-- tests/e2e/specs/api/PythonDevFileAPI.spec.ts | 6 +++-- .../KubernetesCommandLineToolsExecutor.ts | 27 +++++++++++++++---- 4 files changed, 34 insertions(+), 11 deletions(-) diff --git a/tests/e2e/specs/api/GoDevFileAPI.spec.ts b/tests/e2e/specs/api/GoDevFileAPI.spec.ts index 8683ea10875..3e9d8c7a8c8 100644 --- a/tests/e2e/specs/api/GoDevFileAPI.spec.ts +++ b/tests/e2e/specs/api/GoDevFileAPI.spec.ts @@ -32,6 +32,7 @@ suite('Go devfile API test', function (): void { let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper; let devfileContext: DevfileContext; let devfileContent: string = ''; + let dwtName: string = ''; suiteSetup(`Prepare login ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void { kubernetesCommandLineToolsExecutor.loginToOcp(); @@ -42,6 +43,7 @@ suite('Go devfile API test', function (): void { kubernetesCommandLineToolsExecutor.namespace = API_TEST_CONSTANTS.TS_API_TEST_NAMESPACE || 'admin-devspaces'; devfileContent = devfilesRegistryHelper.getDevfileContent(devfileID); const editorDevfileContent: string = devfilesRegistryHelper.obtainCheDevFileEditorFromCheConfigMap('editors-definitions'); + dwtName = YAML.parse(devfileContent).metadata.name; const uniqName: string = YAML.parse(devfileContent).metadata.name + randomPref; kubernetesCommandLineToolsExecutor.workspaceName = uniqName; @@ -84,7 +86,7 @@ suite('Go devfile API test', function (): void { expect(logOutput.stdout.trim()).contains('Web server running on port 8080'); }); - suiteTeardown('Delete workspace', function (): void { - kubernetesCommandLineToolsExecutor.deleteDevWorkspace(); + suiteTeardown('Delete DevWorkspace', function (): void { + kubernetesCommandLineToolsExecutor.deleteDevWorkspace(dwtName); }); }); diff --git a/tests/e2e/specs/api/PhpDevFileAPI.spec.ts b/tests/e2e/specs/api/PhpDevFileAPI.spec.ts index 86d3b5b5e05..c5208db22c3 100644 --- a/tests/e2e/specs/api/PhpDevFileAPI.spec.ts +++ b/tests/e2e/specs/api/PhpDevFileAPI.spec.ts @@ -31,6 +31,7 @@ suite('PHP devfile API test', function (): void { let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper; let devfileContext: DevfileContext; let devfileContent: string = ''; + let dwtName: string = ''; suiteSetup(`Prepare login ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void { kubernetesCommandLineToolsExecutor.loginToOcp(); @@ -41,6 +42,7 @@ suite('PHP devfile API test', function (): void { kubernetesCommandLineToolsExecutor.namespace = API_TEST_CONSTANTS.TS_API_TEST_NAMESPACE || 'admin-devspaces'; devfileContent = devfilesRegistryHelper.getDevfileContent(devfileID); const editorDevfileContent: string = devfilesRegistryHelper.obtainCheDevFileEditorFromCheConfigMap('editors-definitions'); + dwtName = YAML.parse(devfileContent).metadata.name; const uniqName: string = YAML.parse(devfileContent).metadata.name + randomPref; kubernetesCommandLineToolsExecutor.workspaceName = uniqName; @@ -70,7 +72,7 @@ suite('PHP devfile API test', function (): void { expect(output.stdout.trim()).contains('Hello, world!'); }); - suiteTeardown('Delete workspace', function (): void { - kubernetesCommandLineToolsExecutor.deleteDevWorkspace(); + suiteTeardown('Delete DevWorkspace', function (): void { + kubernetesCommandLineToolsExecutor.deleteDevWorkspace(dwtName); }); }); diff --git a/tests/e2e/specs/api/PythonDevFileAPI.spec.ts b/tests/e2e/specs/api/PythonDevFileAPI.spec.ts index 7d15c1c1be9..30adf871d83 100644 --- a/tests/e2e/specs/api/PythonDevFileAPI.spec.ts +++ b/tests/e2e/specs/api/PythonDevFileAPI.spec.ts @@ -32,6 +32,7 @@ suite('Python devfile API test', function (): void { let devWorkspaceConfigurationHelper: DevWorkspaceConfigurationHelper; let devfileContext: DevfileContext; let devfileContent: string = ''; + let dwtName: string = ''; suiteSetup(`Prepare login ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void { kubernetesCommandLineToolsExecutor.loginToOcp(); @@ -42,6 +43,7 @@ suite('Python devfile API test', function (): void { kubernetesCommandLineToolsExecutor.namespace = API_TEST_CONSTANTS.TS_API_TEST_NAMESPACE || 'admin-devspaces'; devfileContent = devfilesRegistryHelper.getDevfileContent(devfileID); const editorDevfileContent: string = devfilesRegistryHelper.obtainCheDevFileEditorFromCheConfigMap('editors-definitions'); + dwtName = YAML.parse(devfileContent).metadata.name; const uniqName: string = YAML.parse(devfileContent).metadata.name + randomPref; kubernetesCommandLineToolsExecutor.workspaceName = uniqName; @@ -71,7 +73,7 @@ suite('Python devfile API test', function (): void { expect(output.stdout.trim()).contains('Hello, world!'); }); - suiteTeardown('Delete workspace', function (): void { - kubernetesCommandLineToolsExecutor.deleteDevWorkspace(); + suiteTeardown('Delete DevWorkspace', function (): void { + kubernetesCommandLineToolsExecutor.deleteDevWorkspace(dwtName); }); }); diff --git a/tests/e2e/utils/KubernetesCommandLineToolsExecutor.ts b/tests/e2e/utils/KubernetesCommandLineToolsExecutor.ts index ae55ebddb75..5e1fbec0c59 100644 --- a/tests/e2e/utils/KubernetesCommandLineToolsExecutor.ts +++ b/tests/e2e/utils/KubernetesCommandLineToolsExecutor.ts @@ -94,16 +94,33 @@ export class KubernetesCommandLineToolsExecutor implements IKubernetesCommandLin return output.stderr ? output.stderr : output.stdout.replace('\n', ''); } - deleteDevWorkspace(): void { - Logger.debug(`${this.kubernetesCommandLineTool} - delete '${this.workspaceName}' workspace`); + // used to delete when devWorkspace and devWorkspaceTemplate have the same names + deleteDevWorkspace(): void; + + // used to delete when devWorkspace and devWorkspaceTemplate have different names + deleteDevWorkspace(dwTemplateName: string): void; + + deleteDevWorkspace(dwTemplateName?: string): void { + Logger.debug(`${this.kubernetesCommandLineTool} - delete '${this.workspaceName}' devWorkspace`); this.shellExecutor.executeCommand( `${this.kubernetesCommandLineTool} patch dw ${this.workspaceName} -n ${this.namespace} -p '{ "metadata": { "finalizers": null }}' --type merge || true` ); this.shellExecutor.executeCommand(`${this.kubernetesCommandLineTool} delete dw ${this.workspaceName} -n ${this.namespace} || true`); - this.shellExecutor.executeCommand( - `${this.kubernetesCommandLineTool} delete dwt ${BASE_TEST_CONSTANTS.TS_SELENIUM_EDITOR}-${this.workspaceName} -n ${this.namespace} || true` - ); + + if (dwTemplateName === undefined) { + Logger.debug(`${this.kubernetesCommandLineTool} - delete '${this.workspaceName}' devWorkspaceTemplate`); + + this.shellExecutor.executeCommand( + `${this.kubernetesCommandLineTool} delete dwt ${BASE_TEST_CONSTANTS.TS_SELENIUM_EDITOR}-${this.workspaceName} -n ${this.namespace} || true` + ); + } else { + Logger.debug(`${this.kubernetesCommandLineTool} - delete '${dwTemplateName}' devWorkspaceTemplate`); + + this.shellExecutor.executeCommand( + `${this.kubernetesCommandLineTool} delete dwt ${BASE_TEST_CONSTANTS.TS_SELENIUM_EDITOR}-${dwTemplateName} -n ${this.namespace} || true` + ); + } } applyAndWaitDevWorkspace(yamlConfiguration: string): ShellString {