diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 00bca863376..84a33b3075b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -33,8 +33,9 @@ body: label: Che version description: if workspace is running, version can be obtained with help/about menu options: - - "7.77@latest" + - "7.78@latest" - "next (development version)" + - "7.77" - "7.75" - "7.74" - "7.73" diff --git a/VERSION b/VERSION index efbf25b670f..12aebec0966 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.78.0-next +7.79.0-next diff --git a/tests/e2e/package-lock.json b/tests/e2e/package-lock.json index 37e34ff689a..30ae8be0df7 100644 --- a/tests/e2e/package-lock.json +++ b/tests/e2e/package-lock.json @@ -1,12 +1,12 @@ { "name": "@eclipse-che/che-e2e", - "version": "7.78.0-next", + "version": "7.79.0-next", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@eclipse-che/che-e2e", - "version": "7.78.0-next", + "version": "7.79.0-next", "license": "ISC", "dependencies": { "@eclipse-che/api": "latest", diff --git a/tests/e2e/package.json b/tests/e2e/package.json index 4d2d793ebf7..fe2944e1f59 100644 --- a/tests/e2e/package.json +++ b/tests/e2e/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-che/che-e2e", - "version": "7.78.0-next", + "version": "7.79.0-next", "description": "", "main": "dist/index.js", "scripts": { diff --git a/tests/e2e/pageobjects/openshift/OcpMainPage.ts b/tests/e2e/pageobjects/openshift/OcpMainPage.ts index a4c92179f05..5534f9155d5 100644 --- a/tests/e2e/pageobjects/openshift/OcpMainPage.ts +++ b/tests/e2e/pageobjects/openshift/OcpMainPage.ts @@ -28,6 +28,7 @@ export class OcpMainPage { private static readonly SKIP_TOUR_BUTTON: By = By.xpath('//*[text()="Skip tour"]'); private static readonly WEB_TERMINAL_BUTTON: By = By.xpath('//button[@data-quickstart-id="qs-masthead-cloudshell"]'); private static readonly WEB_TERMINAL_PAGE: By = By.xpath('//*[@class="xterm-helper-textarea"]'); + private static readonly START_WT_COMMAND_LINE_TERMINAL_BUTTON: By = By.xpath('//*[@data-test-id="submit-button"]'); constructor( @inject(CLASSES.DriverHelper) @@ -89,6 +90,7 @@ export class OcpMainPage { await this.waitOpenMainPage(); await this.driverHelper.waitAndClick(OcpMainPage.WEB_TERMINAL_BUTTON); + await this.driverHelper.waitAndClick(OcpMainPage.START_WT_COMMAND_LINE_TERMINAL_BUTTON); await this.driverHelper.waitPresence(OcpMainPage.WEB_TERMINAL_PAGE, TIMEOUT_CONSTANTS.TS_WAIT_LOADER_ABSENCE_TIMEOUT); } diff --git a/tests/e2e/specs/miscellaneous/WorkspaceWithParent.spec.ts b/tests/e2e/specs/miscellaneous/WorkspaceWithParent.spec.ts index d5012a5c625..14efe97b5dc 100644 --- a/tests/e2e/specs/miscellaneous/WorkspaceWithParent.spec.ts +++ b/tests/e2e/specs/miscellaneous/WorkspaceWithParent.spec.ts @@ -34,7 +34,6 @@ suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS.TEST_ENVIRONMEN const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get( CLASSES.KubernetesCommandLineToolsExecutor ); - let podName: string = ''; suiteSetup(function (): void { @@ -58,7 +57,6 @@ suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS.TEST_ENVIRONMEN test('Check cloning of the test project', async function (): Promise { const expectedProjectItems: string[] = ['.devfile.yaml', 'parent.yaml', 'README.md', 'parentdevfile']; const visibleContent: ViewSection = await projectAndFileTests.getProjectViewSession(); - for (const expectedProjectItem of expectedProjectItems) { const visibleItem: ViewItem | undefined = await projectAndFileTests.getProjectTreeItem(visibleContent, expectedProjectItem); expect(visibleItem).not.undefined; @@ -79,23 +77,23 @@ suite(`Workspace using a parent test suite ${BASE_TEST_CONSTANTS.TEST_ENVIRONMEN }); test('Check expected containers in the parent POD', function (): void { - const getPodNameCommand: string = `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pods --selector=controller.devfile.io/devworkspace_name=sample-using-parent --output jsonpath=\'{.items[0].metadata.name}\'`; + const getPodNameCommand: string = `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pods -n ${BASE_TEST_CONSTANTS.TEST_NAMESPACE} --selector=controller.devfile.io/devworkspace_name=sample-using-parent --output jsonpath=\'{.items[0].metadata.name}\'`; podName = shellExecutor.executeArbitraryShellScript(getPodNameCommand); const containerNames: string = shellExecutor.executeArbitraryShellScript( - `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.containers[*].name}\'` + `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} -n ${BASE_TEST_CONSTANTS.TEST_NAMESPACE} --output jsonpath=\'{.spec.containers[*].name}\'` ); expect(containerNames).contains('tools').and.contains('che-gateway'); const initContainerName: string = shellExecutor.executeArbitraryShellScript( - `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} --output jsonpath=\'{.spec.initContainers[].name}\'` + `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} get pod ${podName} -n ${BASE_TEST_CONSTANTS.TEST_NAMESPACE} --output jsonpath=\'{.spec.initContainers[].name}\'` ); expect(initContainerName).contains('che-code-injector'); }); test('Check expected environment variables', function (): void { const envList: string = shellExecutor.executeArbitraryShellScript( - `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} exec -i ${podName} -c tools -- sh -c env` + `${API_TEST_CONSTANTS.TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL} -n admin-devspaces exec -i ${podName} -c tools -- sh -c env` ); expect(envList).contains('DEVFILE_ENV_VAR=true').and.contains('PARENT_ENV_VAR=true'); });