From 8819a6bdea11fc9a18c53aeed8c35f9e28458451 Mon Sep 17 00:00:00 2001 From: Mykhailo Kuznietsov Date: Thu, 13 Mar 2025 13:49:23 +0000 Subject: [PATCH 1/2] chore: Bump to 7.101.0-next in main Signed-off-by: Mykhailo Kuznietsov --- .github/ISSUE_TEMPLATE/bug_report.yml | 3 +- VERSION | 2 +- tests/e2e/CODE_STYLE.md | 4 +- tests/e2e/README.md | 74 +++++++++++++-------------- tests/e2e/package-lock.json | 4 +- tests/e2e/package.json | 2 +- 6 files changed, 45 insertions(+), 44 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 1187bb99017..54371661401 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.99@latest" + - "7.10@latest" - "next (development version)" + - "7.99" - "7.98" - "7.97" - "7.96" diff --git a/VERSION b/VERSION index dbf6886595b..6a388983e2f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.100.0-next +7.101.0-next diff --git a/tests/e2e/CODE_STYLE.md b/tests/e2e/CODE_STYLE.md index 04d6f48f2d9..8508cbfd3be 100644 --- a/tests/e2e/CODE_STYLE.md +++ b/tests/e2e/CODE_STYLE.md @@ -33,8 +33,8 @@ Automated lint checking and code format performs with ESLint and Prettier tools pre-commit hook. Full set of rules can be found: -- [.eslintrc](.eslintrc.js) -- [.prettierrc](.prettierrc.json) +- [.eslintrc](.eslintrc.js) +- [.prettierrc](.prettierrc.json) ### Preferable code style diff --git a/tests/e2e/README.md b/tests/e2e/README.md index 754798e0639..2d8679b1df8 100644 --- a/tests/e2e/README.md +++ b/tests/e2e/README.md @@ -2,33 +2,33 @@ ## Requirements -- node 16.x -- "Chrome" browser 114.x or later -- deployed Che 7 with accessible URL +- node 16.x +- "Chrome" browser 114.x or later +- deployed Che 7 with accessible URL ## Before launch **Perform commands:** -- `export TS_SELENIUM_BASE_URL=` -- `npm ci` +- `export TS_SELENIUM_BASE_URL=` +- `npm ci` Note: If there is any modifications in package.json, manually execute the `npm install` to update the package-lock.json. So that errors can be avoided while executing npm ci ## Default launch -- Provide connection credentials: - - `export TS_SELENIUM_OCP_USERNAME=` - - `export TS_SELENIUM_OCP_PASSWORD=` - - `npm run test` +- Provide connection credentials: + - `export TS_SELENIUM_OCP_USERNAME=` + - `export TS_SELENIUM_OCP_PASSWORD=` + - `npm run test` ## Custom launch -- Use environment variables which described in the "constants" folder -- Use environment variables for setting timeouts if needed. You can see the list in **`'TimeoutConstants.ts'`**. You can see the list of those variables and their value if you set the `'TS_SELENIUM_PRINT_TIMEOUT_VARIABLES = true'` -- To test one specification export file name as `export USERSTORY= && npm run test` (example: `-e USERSTORY=Quarkus`) -- To run test without Selenium WebDriver (API tests etc.) use `export USERSTORY= && npm run driver-less-test` (example: `-e USERSTORY=CloneGitRepoAPI`) -- This project support application testing deployed on Kubernetes or Openshift platform. Openshift is default value. To switch into Kubernetes, please, use `TS_PLATFORM=kubernetes` environmental variable and `TS_SELENIUM_K8S_PASSWORD`, `TS_SELENIUM_K8S_USERNAME` to provide credentials. The sample of test command in this case: +- Use environment variables which described in the "constants" folder +- Use environment variables for setting timeouts if needed. You can see the list in **`'TimeoutConstants.ts'`**. You can see the list of those variables and their value if you set the `'TS_SELENIUM_PRINT_TIMEOUT_VARIABLES = true'` +- To test one specification export file name as `export USERSTORY= && npm run test` (example: `-e USERSTORY=Quarkus`) +- To run test without Selenium WebDriver (API tests etc.) use `export USERSTORY= && npm run driver-less-test` (example: `-e USERSTORY=CloneGitRepoAPI`) +- This project support application testing deployed on Kubernetes or Openshift platform. Openshift is default value. To switch into Kubernetes, please, use `TS_PLATFORM=kubernetes` environmental variable and `TS_SELENIUM_K8S_PASSWORD`, `TS_SELENIUM_K8S_USERNAME` to provide credentials. The sample of test command in this case: ``` export TS_PLATFORM=kubernetes && \ export TS_SELENIUM_K8S_USERNAME= && \ @@ -37,21 +37,21 @@ Note: If there is any modifications in package.json, manually execute the `npm i npm run test ``` Also, environmental variables can be set in files in "constants" folder. -- Local test results can be represented with Allure reporter `npm run open-allure-dasboard` +- Local test results can be represented with Allure reporter `npm run open-allure-dasboard` ## Docker launch -- open terminal and go to the "e2e" directory -- export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url -- run command `"npm run test-docker"` +- open terminal and go to the "e2e" directory +- export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url +- run command `"npm run test-docker"` ## Docker launch with changed tests **For launching tests with local changes perform next steps:** -- open terminal and go to the "e2e" directory -- export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url -- run command `"npm run test-docker-mount-e2e"` +- open terminal and go to the "e2e" directory +- export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url +- run command `"npm run test-docker-mount-e2e"` ## Debug docker launch @@ -62,27 +62,27 @@ The `'eclipse/che-e2e'` docker image has VNC server installed inside. For connec **The easiest way to do that is to perform steps which are described in the "Docker launch" paragraph. For running tests without docker, please perform next steps:** -- Deploy Che on Kubernetes infrastructure by using 'Minikube' and 'Chectl' -- Create workspace by using 'Chectl' and devfile - - link to 'Chectl' manual - - link to devfile ( **`For successfull test passing, exactly provided devfile should be used`** ) - -- Provide the **`'TS_SELENIUM_BASE_URL'`** environment variable as described above -- export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts) -- perform command **`export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles`** +- Deploy Che on Kubernetes infrastructure by using 'Minikube' and 'Chectl' +- Create workspace by using 'Chectl' and devfile + - link to 'Chectl' manual + - link to devfile ( **`For successfull test passing, exactly provided devfile should be used`** ) + +- Provide the **`'TS_SELENIUM_BASE_URL'`** environment variable as described above +- export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts) +- perform command **`export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles`** ## Launching the DevWorkspaceHappyPath spec file using Che with oauth authentication **Setup next environment variables:** -- export TS_SELENIUM_BASE_URL=\ -- export TS_SELENIUM_OCP_USERNAME=\ -- export TS_SELENIUM_OCP_PASSWORD=\ -- export TS_SELENIUM_VALUE_OPENSHIFT_OAUTH="true" -- export TS_OCP_LOGIN_PAGE_PROVIDER_TITLE=\ -- export TS_SELENIUM_DEVWORKSPACE_URL=\ -- export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts) +- export TS_SELENIUM_BASE_URL=\ +- export TS_SELENIUM_OCP_USERNAME=\ +- export TS_SELENIUM_OCP_PASSWORD=\ +- export TS_SELENIUM_VALUE_OPENSHIFT_OAUTH="true" +- export TS_OCP_LOGIN_PAGE_PROVIDER_TITLE=\ +- export TS_SELENIUM_DEVWORKSPACE_URL=\ +- export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts) **Execute the npm command:** -- perform command `export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles` +- perform command `export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles` diff --git a/tests/e2e/package-lock.json b/tests/e2e/package-lock.json index af682816c3d..03838f7490a 100644 --- a/tests/e2e/package-lock.json +++ b/tests/e2e/package-lock.json @@ -1,12 +1,12 @@ { "name": "@eclipse-che/che-e2e", - "version": "7.100.0-next", + "version": "7.101.0-next", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@eclipse-che/che-e2e", - "version": "7.100.0-next", + "version": "7.101.0-next", "license": "ISC", "dependencies": { "@eclipse-che/api": "latest", diff --git a/tests/e2e/package.json b/tests/e2e/package.json index 4f1eeb6f702..25283af02d9 100644 --- a/tests/e2e/package.json +++ b/tests/e2e/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-che/che-e2e", - "version": "7.100.0-next", + "version": "7.101.0-next", "description": "", "main": "dist/index.js", "scripts": { From 1e54ff1234624ea94d611e713aa0dc2e94cc14e3 Mon Sep 17 00:00:00 2001 From: Mykhailo Kuznietsov Date: Mon, 17 Mar 2025 15:11:10 +0200 Subject: [PATCH 2/2] fix MD formatting Signed-off-by: Mykhailo Kuznietsov --- tests/e2e/CODE_STYLE.md | 4 +-- tests/e2e/README.md | 74 ++++++++++++++++++++--------------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/tests/e2e/CODE_STYLE.md b/tests/e2e/CODE_STYLE.md index 8508cbfd3be..04d6f48f2d9 100644 --- a/tests/e2e/CODE_STYLE.md +++ b/tests/e2e/CODE_STYLE.md @@ -33,8 +33,8 @@ Automated lint checking and code format performs with ESLint and Prettier tools pre-commit hook. Full set of rules can be found: -- [.eslintrc](.eslintrc.js) -- [.prettierrc](.prettierrc.json) +- [.eslintrc](.eslintrc.js) +- [.prettierrc](.prettierrc.json) ### Preferable code style diff --git a/tests/e2e/README.md b/tests/e2e/README.md index 2d8679b1df8..754798e0639 100644 --- a/tests/e2e/README.md +++ b/tests/e2e/README.md @@ -2,33 +2,33 @@ ## Requirements -- node 16.x -- "Chrome" browser 114.x or later -- deployed Che 7 with accessible URL +- node 16.x +- "Chrome" browser 114.x or later +- deployed Che 7 with accessible URL ## Before launch **Perform commands:** -- `export TS_SELENIUM_BASE_URL=` -- `npm ci` +- `export TS_SELENIUM_BASE_URL=` +- `npm ci` Note: If there is any modifications in package.json, manually execute the `npm install` to update the package-lock.json. So that errors can be avoided while executing npm ci ## Default launch -- Provide connection credentials: - - `export TS_SELENIUM_OCP_USERNAME=` - - `export TS_SELENIUM_OCP_PASSWORD=` - - `npm run test` +- Provide connection credentials: + - `export TS_SELENIUM_OCP_USERNAME=` + - `export TS_SELENIUM_OCP_PASSWORD=` + - `npm run test` ## Custom launch -- Use environment variables which described in the "constants" folder -- Use environment variables for setting timeouts if needed. You can see the list in **`'TimeoutConstants.ts'`**. You can see the list of those variables and their value if you set the `'TS_SELENIUM_PRINT_TIMEOUT_VARIABLES = true'` -- To test one specification export file name as `export USERSTORY= && npm run test` (example: `-e USERSTORY=Quarkus`) -- To run test without Selenium WebDriver (API tests etc.) use `export USERSTORY= && npm run driver-less-test` (example: `-e USERSTORY=CloneGitRepoAPI`) -- This project support application testing deployed on Kubernetes or Openshift platform. Openshift is default value. To switch into Kubernetes, please, use `TS_PLATFORM=kubernetes` environmental variable and `TS_SELENIUM_K8S_PASSWORD`, `TS_SELENIUM_K8S_USERNAME` to provide credentials. The sample of test command in this case: +- Use environment variables which described in the "constants" folder +- Use environment variables for setting timeouts if needed. You can see the list in **`'TimeoutConstants.ts'`**. You can see the list of those variables and their value if you set the `'TS_SELENIUM_PRINT_TIMEOUT_VARIABLES = true'` +- To test one specification export file name as `export USERSTORY= && npm run test` (example: `-e USERSTORY=Quarkus`) +- To run test without Selenium WebDriver (API tests etc.) use `export USERSTORY= && npm run driver-less-test` (example: `-e USERSTORY=CloneGitRepoAPI`) +- This project support application testing deployed on Kubernetes or Openshift platform. Openshift is default value. To switch into Kubernetes, please, use `TS_PLATFORM=kubernetes` environmental variable and `TS_SELENIUM_K8S_PASSWORD`, `TS_SELENIUM_K8S_USERNAME` to provide credentials. The sample of test command in this case: ``` export TS_PLATFORM=kubernetes && \ export TS_SELENIUM_K8S_USERNAME= && \ @@ -37,21 +37,21 @@ Note: If there is any modifications in package.json, manually execute the `npm i npm run test ``` Also, environmental variables can be set in files in "constants" folder. -- Local test results can be represented with Allure reporter `npm run open-allure-dasboard` +- Local test results can be represented with Allure reporter `npm run open-allure-dasboard` ## Docker launch -- open terminal and go to the "e2e" directory -- export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url -- run command `"npm run test-docker"` +- open terminal and go to the "e2e" directory +- export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url +- run command `"npm run test-docker"` ## Docker launch with changed tests **For launching tests with local changes perform next steps:** -- open terminal and go to the "e2e" directory -- export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url -- run command `"npm run test-docker-mount-e2e"` +- open terminal and go to the "e2e" directory +- export the `"TS_SELENIUM_BASE_URL"` variable with "Che" url +- run command `"npm run test-docker-mount-e2e"` ## Debug docker launch @@ -62,27 +62,27 @@ The `'eclipse/che-e2e'` docker image has VNC server installed inside. For connec **The easiest way to do that is to perform steps which are described in the "Docker launch" paragraph. For running tests without docker, please perform next steps:** -- Deploy Che on Kubernetes infrastructure by using 'Minikube' and 'Chectl' -- Create workspace by using 'Chectl' and devfile - - link to 'Chectl' manual - - link to devfile ( **`For successfull test passing, exactly provided devfile should be used`** ) - -- Provide the **`'TS_SELENIUM_BASE_URL'`** environment variable as described above -- export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts) -- perform command **`export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles`** +- Deploy Che on Kubernetes infrastructure by using 'Minikube' and 'Chectl' +- Create workspace by using 'Chectl' and devfile + - link to 'Chectl' manual + - link to devfile ( **`For successfull test passing, exactly provided devfile should be used`** ) + +- Provide the **`'TS_SELENIUM_BASE_URL'`** environment variable as described above +- export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts) +- perform command **`export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles`** ## Launching the DevWorkspaceHappyPath spec file using Che with oauth authentication **Setup next environment variables:** -- export TS_SELENIUM_BASE_URL=\ -- export TS_SELENIUM_OCP_USERNAME=\ -- export TS_SELENIUM_OCP_PASSWORD=\ -- export TS_SELENIUM_VALUE_OPENSHIFT_OAUTH="true" -- export TS_OCP_LOGIN_PAGE_PROVIDER_TITLE=\ -- export TS_SELENIUM_DEVWORKSPACE_URL=\ -- export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts) +- export TS_SELENIUM_BASE_URL=\ +- export TS_SELENIUM_OCP_USERNAME=\ +- export TS_SELENIUM_OCP_PASSWORD=\ +- export TS_SELENIUM_VALUE_OPENSHIFT_OAUTH="true" +- export TS_OCP_LOGIN_PAGE_PROVIDER_TITLE=\ +- export TS_SELENIUM_DEVWORKSPACE_URL=\ +- export TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME=EmptyWorkspace (default value, see BASE_TEST_CONSTANTS.ts) **Execute the npm command:** -- perform command `export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles` +- perform command `export USERSTORY=$TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME && npm run test-all-devfiles`