@eclipse-che/che-e2e 7.116.0 → 7.117.0-next-5531154

package/.claude/skills/e2e-test-developer/SKILL.md

@@ -152,6 +152,7 @@ Classes must follow this order:
 ### Test File Conventions
 
 1. **Naming**
+
     - UI tests: `*.spec.ts` (e.g., `Factory.spec.ts`)
     - API-only tests: `*API.spec.ts` (e.g., `EmptyWorkspaceAPI.spec.ts`)
 
@@ -216,10 +217,12 @@ async function doSomething(param, timeout) {
 ```
 
 2. **Naming Conventions**
+
     - Variables: camelCase or UPPER_CASE
     - No leading/trailing underscores
 
 3. **String Quotes**
+
     - Use single quotes for strings
 
 4. **Comments**

package/CODE_STYLE.md

@@ -28,6 +28,7 @@ Automated lint checking and code format performs with ESLint and Prettier tools
 ### Preferable code style
 
 1. Page-object and util classes
+
     1. ✔ Class declaration using dependency injection (inversify library)
 
         ```
@@ -37,6 +38,7 @@ Automated lint checking and code format performs with ESLint and Prettier tools
         ```
 
     2. Public methods
+
         - ✔ Declare public methods without "public "keyword
         - ✔ Add Logger.debug() inside method to log its name (with optional message)
 
@@ -49,6 +51,7 @@ Automated lint checking and code format performs with ESLint and Prettier tools
         ```
 
     3. Locators
+
         - ✔ For static locators - private static readonly fields type of By
 
         ```
@@ -102,6 +105,7 @@ Automated lint checking and code format performs with ESLint and Prettier tools
         ```
 
 2. Mocha framework
+
     - ✔ TDD framework (`suite()`, `test()`)
     - ✔ Inject class instances, declare all test data inside test `suit()` function to avoid unnecessary code execution if test suit will not be run
 
@@ -118,6 +122,7 @@ Automated lint checking and code format performs with ESLint and Prettier tools
     - ✔ Use test [./constants](constants) to make test flexible
 
 3. Packages
+
     1. Add packages as dev dependencies
     2. If any changes re-create package-lock.json before push
 

package/dist/pageobjects/dashboard/TrustAuthorPopup.js

@@ -37,12 +37,18 @@ let TrustAuthorPopup = TrustAuthorPopup_1 = class TrustAuthorPopup {
     async clickContinue(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM) {
         Logger_1.Logger.debug();
         await this.waitPopupIsOpened();
+        await this.driverHelper.wait(TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM);
         await this.driverHelper.waitAndClick(TrustAuthorPopup_1.CONTINUE_BUTTON, timeout);
+        await this.waitPopupIsClosed();
     }
     async waitPopupIsOpened(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM) {
         Logger_1.Logger.debug();
         await this.driverHelper.waitVisibility(TrustAuthorPopup_1.TRUST_AUTHOR_POPUP_PAGE, timeout);
     }
+    async waitPopupIsClosed(timeout = TIMEOUT_CONSTANTS_1.TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM) {
+        Logger_1.Logger.debug();
+        await this.driverHelper.waitDisappearance(TrustAuthorPopup_1.TRUST_AUTHOR_POPUP_PAGE, timeout);
+    }
 };
 TrustAuthorPopup.CONTINUE_BUTTON = selenium_webdriver_1.By.xpath('//span[text()="Continue"]');
 TrustAuthorPopup.TRUST_AUTHOR_POPUP_PAGE = selenium_webdriver_1.By.xpath('//span[contains(text(), "Do you trust the authors of this repository?")]');

package/dist/pageobjects/dashboard/TrustAuthorPopup.js.map

@@ -1 +1 @@
-{"version":3,"file":"TrustAuthorPopup.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/TrustAuthorPopup.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,4BAA0B;AAC1B,mEAAwD;AACxD,2DAAwC;AACxC,2DAAwD;AACxD,+CAA4C;AAC5C,yEAAsE;AAG/D,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAM5B,YAEU,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACjC,CAAC;IAEJ,KAAK,CAAC,aAAa,CAAC,UAAkB,qCAAiB,CAAC,iCAAiC;QACxF,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,kBAAgB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,UAAkB,qCAAiB,CAAC,iCAAiC;QAC5F,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,kBAAgB,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAC3F,CAAC;;AArBuB,gCAAe,GAAO,uBAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAC5D,wCAAuB,GAAO,uBAAE,CAAC,KAAK,CAC7D,0EAA0E,CAC1E,CAAC;AAJU,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;IAQV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACN,2BAAY;GARxB,gBAAgB,CAuB5B;AAvBY,4CAAgB"}
+{"version":3,"file":"TrustAuthorPopup.js","sourceRoot":"","sources":["../../../pageobjects/dashboard/TrustAuthorPopup.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,yCAA+C;AAC/C,4BAA0B;AAC1B,mEAAwD;AACxD,2DAAwC;AACxC,2DAAwD;AACxD,+CAA4C;AAC5C,yEAAsE;AAG/D,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAM5B,YAEU,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IACjC,CAAC;IAEJ,KAAK,CAAC,aAAa,CAAC,UAAkB,qCAAiB,CAAC,iCAAiC;QACxF,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,qCAAiB,CAAC,iCAAiC,CAAC,CAAC;QAClF,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,kBAAgB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAChF,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,UAAkB,qCAAiB,CAAC,iCAAiC;QAC5F,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,kBAAgB,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAC3F,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,UAAkB,qCAAiB,CAAC,iCAAiC;QAC5F,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,kBAAgB,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAC9F,CAAC;;AA7BuB,gCAAe,GAAO,uBAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAC5D,wCAAuB,GAAO,uBAAE,CAAC,KAAK,CAC7D,0EAA0E,CAC1E,CAAC;AAJU,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;IAQV,WAAA,IAAA,kBAAM,EAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCACN,2BAAY;GARxB,gBAAgB,CA+B5B;AA/BY,4CAAgB"}

package/dist/specs/miscellaneous/KubedockPodmanPersistUserHomeTest.spec.js

@@ -0,0 +1,120 @@
+"use strict";
+/** *******************************************************************
+ * copyright (c) 2020-2026 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+const inversify_types_1 = require("../../configs/inversify.types");
+const inversify_config_1 = require("../../configs/inversify.config");
+const WorkspaceHandlingTests_1 = require("../../tests-library/WorkspaceHandlingTests");
+const MochaHooks_1 = require("../MochaHooks");
+const chai_1 = require("chai");
+const BASE_TEST_CONSTANTS_1 = require("../../constants/BASE_TEST_CONSTANTS");
+const FACTORY_TEST_CONSTANTS_1 = require("../../constants/FACTORY_TEST_CONSTANTS");
+suite(`Test image build with persistUserHome enabled (kubedock and podman) ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function () {
+    const projectAndFileTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ProjectAndFileTests);
+    const workspaceHandlingTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.WorkspaceHandlingTests);
+    const loginTests = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.LoginTests);
+    const browserTabsUtil = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.BrowserTabsUtil);
+    const testWorkspaceUtil = inversify_config_1.e2eContainer.get(inversify_types_1.TYPES.WorkspaceUtil);
+    const dashboard = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.Dashboard);
+    const shellExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.ShellExecutor);
+    const kubernetesCommandLineToolsExecutor = inversify_config_1.e2eContainer.get(inversify_types_1.CLASSES.KubernetesCommandLineToolsExecutor);
+    let workspaceName = '';
+    let defaultPersistentHomeValue = false;
+    const cheClusterName = 'devspaces';
+    const testScript = '# Enable Kubedock\n' +
+        'export KUBEDOCK_ENABLED=true\n' +
+        'echo KUBEDOCK_ENABLED\n' +
+        '/entrypoint.sh\n' +
+        'cd $PROJECT_SOURCE\n' +
+        'export ARCH=$(uname -m)\n' +
+        'export DATE=$(date +"%m%d%y")\n' +
+        'export USER=$(oc whoami)\n' +
+        'export TKN=$(oc whoami -t)\n' +
+        'export REG="image-registry.openshift-image-registry.svc:5000"\n' +
+        'export PROJECT=$(oc project -q)\n' +
+        'export IMG="${REG}/${PROJECT}/hello:${DATE}"\n' +
+        'podman login --tls-verify=false --username ${USER} --password ${TKN} ${REG}\n' +
+        'podman build -t ${IMG} -f Dockerfile.${ARCH}\n' +
+        'podman push --tls-verify=false ${IMG}\n';
+    const runTestScript = '# Enable Kubedock\n' +
+        'export KUBEDOCK_ENABLED=true\n' +
+        'echo KUBEDOCK_ENABLED\n' +
+        '/entrypoint.sh\n' +
+        'export DATE=$(date +"%m%d%y")\n' +
+        'export USER=$(oc whoami)\n' +
+        'export TKN=$(oc whoami -t)\n' +
+        'export REG="image-registry.openshift-image-registry.svc:5000"\n' +
+        'export PROJECT=$(oc project -q)\n' +
+        'export IMG="${REG}/${PROJECT}/hello:${DATE}"\n' +
+        'podman login --tls-verify=false --username ${USER} --password ${TKN} ${REG}\n' +
+        'podman run --rm ${IMG}';
+    const factoryUrl = BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.IS_CLUSTER_DISCONNECTED()
+        ? FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_AIRGAP_FACTORY_GIT_REPO_URL ||
+            'https://gh.crw-qe.com/test-automation-only/dockerfile-hello-world'
+        : FACTORY_TEST_CONSTANTS_1.FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL || 'https://github.com/crw-qe/dockerfile-hello-world';
+    suiteSetup(function () {
+        kubernetesCommandLineToolsExecutor.loginToOcp();
+        shellExecutor.executeCommand('oc project openshift-devspaces');
+        // get current value of spec.devEnvironments.persistUserHome.enabled
+        const currentValue = shellExecutor
+            .executeCommand(`oc get checluster/${cheClusterName} -o "jsonpath={.spec.devEnvironments.persistUserHome.enabled}"`)
+            .stdout.trim();
+        defaultPersistentHomeValue = currentValue === 'true';
+        // set spec.devEnvironments.persistUserHome.enabled to true
+        const patchResult = shellExecutor.executeCommand(`oc patch checluster ${cheClusterName} --type=merge ` +
+            '-p \'{"spec":{"devEnvironments":{"persistUserHome":{"enabled": true}}}}\'');
+        (0, chai_1.expect)(patchResult.code).to.equal(0, 'Failed to patch CheCluster to enable persistUserHome');
+    });
+    suiteSetup('Login', async function () {
+        await loginTests.loginIntoChe();
+    });
+    test(`Create and open new workspace from factory:${factoryUrl}`, async function () {
+        await workspaceHandlingTests.createAndOpenWorkspaceFromGitRepository(factoryUrl);
+    });
+    test('Obtain workspace name from workspace loader page', async function () {
+        await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+        workspaceName = WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName();
+        (0, chai_1.expect)(workspaceName, 'Workspace name was not fetched from the loading page').not.undefined;
+    });
+    test('Register running workspace', function () {
+        (0, MochaHooks_1.registerRunningWorkspace)(workspaceName);
+    });
+    test('Wait workspace readiness', async function () {
+        await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
+    });
+    test('Check the project files were imported', async function () {
+        const projectSection = await projectAndFileTests.getProjectViewSession();
+        (0, chai_1.expect)(await projectAndFileTests.getProjectTreeItem(projectSection, 'Dockerfile.ppc64le'), 'Files not imported').not.undefined;
+    });
+    test('Create and check container runs using kubedock and podman with persistUserHome', function () {
+        kubernetesCommandLineToolsExecutor.workspaceName = workspaceName;
+        kubernetesCommandLineToolsExecutor.loginToOcp();
+        kubernetesCommandLineToolsExecutor.getPodAndContainerNames();
+        const output = kubernetesCommandLineToolsExecutor.execInContainerCommand(testScript);
+        (0, chai_1.expect)(output, 'Podman test script failed').contains('Successfully tagged');
+        const runOutput = kubernetesCommandLineToolsExecutor.execInContainerCommand(runTestScript);
+        (0, chai_1.expect)(runOutput, 'Podman test script failed').contains('Hello from Kubedock!');
+    });
+    suiteTeardown(function () {
+        // restore spec.devEnvironments.persistUserHome.enabled to original value
+        const restoreResult = shellExecutor.executeCommand(`oc patch checluster ${cheClusterName} --type=merge ` +
+            `-p '{"spec":{"devEnvironments":{"persistUserHome":{"enabled": ${defaultPersistentHomeValue}}}}}'`);
+        (0, chai_1.expect)(restoreResult.code).to.equal(0, 'Failed to restore CheCluster persistUserHome setting');
+    });
+    suiteTeardown('Stop and delete the workspace by API', async function () {
+        await dashboard.openDashboard();
+        await browserTabsUtil.closeAllTabsExceptCurrent();
+        await testWorkspaceUtil.stopAndDeleteWorkspaceByName(WorkspaceHandlingTests_1.WorkspaceHandlingTests.getWorkspaceName());
+    });
+    suiteTeardown('Unregister running workspace', function () {
+        (0, MochaHooks_1.registerRunningWorkspace)('');
+    });
+});
+//# sourceMappingURL=KubedockPodmanPersistUserHomeTest.spec.js.map

package/dist/specs/miscellaneous/KubedockPodmanPersistUserHomeTest.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"KubedockPodmanPersistUserHomeTest.spec.js","sourceRoot":"","sources":["../../../specs/miscellaneous/KubedockPodmanPersistUserHomeTest.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@eclipse-che/che-e2e",
-	"version": "7.116.0",
+	"version": "7.117.0-next-5531154",
 	"description": "",
 	"main": "dist/index.js",
 	"scripts": {
@@ -66,8 +66,7 @@
 	"dependencies": {
 		"@eclipse-che/api": "latest",
 		"inversify": "6.0.1",
-		"reflect-metadata": "0.1.13",
-		"@eclipse-che/che-devworkspace-generator": "7.116.0"
+		"reflect-metadata": "0.1.13"
 	},
 	"resolutions": {
 		"minimist": "^1.2.5"

package/pageobjects/dashboard/TrustAuthorPopup.ts

@@ -31,7 +31,9 @@ export class TrustAuthorPopup {
 		Logger.debug();
 
 		await this.waitPopupIsOpened();
+		await this.driverHelper.wait(TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM);
 		await this.driverHelper.waitAndClick(TrustAuthorPopup.CONTINUE_BUTTON, timeout);
+		await this.waitPopupIsClosed();
 	}
 
 	async waitPopupIsOpened(timeout: number = TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM): Promise<void> {
@@ -39,4 +41,10 @@ export class TrustAuthorPopup {
 
 		await this.driverHelper.waitVisibility(TrustAuthorPopup.TRUST_AUTHOR_POPUP_PAGE, timeout);
 	}
+
+	async waitPopupIsClosed(timeout: number = TIMEOUT_CONSTANTS.TS_SELENIUM_CLICK_ON_VISIBLE_ITEM): Promise<void> {
+		Logger.debug();
+
+		await this.driverHelper.waitDisappearance(TrustAuthorPopup.TRUST_AUTHOR_POPUP_PAGE, timeout);
+	}
 }

package/specs/miscellaneous/KubedockPodmanPersistUserHomeTest.spec.ts

@@ -0,0 +1,154 @@
+/** *******************************************************************
+ * copyright (c) 2020-2026 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+
+import { ViewSection } from 'monaco-page-objects';
+import { ProjectAndFileTests } from '../../tests-library/ProjectAndFileTests';
+import { CLASSES, TYPES } from '../../configs/inversify.types';
+import { e2eContainer } from '../../configs/inversify.config';
+import { WorkspaceHandlingTests } from '../../tests-library/WorkspaceHandlingTests';
+import { registerRunningWorkspace } from '../MochaHooks';
+import { LoginTests } from '../../tests-library/LoginTests';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { expect } from 'chai';
+import { KubernetesCommandLineToolsExecutor } from '../../utils/KubernetesCommandLineToolsExecutor';
+import { ShellString } from 'shelljs';
+import { BASE_TEST_CONSTANTS } from '../../constants/BASE_TEST_CONSTANTS';
+import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
+import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
+import { FACTORY_TEST_CONSTANTS } from '../../constants/FACTORY_TEST_CONSTANTS';
+import { ShellExecutor } from '../../utils/ShellExecutor';
+
+suite(`Test image build with persistUserHome enabled (kubedock and podman) ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function (): void {
+	const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+	const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+	const loginTests: LoginTests = e2eContainer.get(CLASSES.LoginTests);
+	const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+	const testWorkspaceUtil: ITestWorkspaceUtil = e2eContainer.get(TYPES.WorkspaceUtil);
+	const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
+	const shellExecutor: ShellExecutor = e2eContainer.get(CLASSES.ShellExecutor);
+	const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = e2eContainer.get(
+		CLASSES.KubernetesCommandLineToolsExecutor
+	);
+
+	let workspaceName: string = '';
+	let defaultPersistentHomeValue: boolean = false;
+	const cheClusterName: string = 'devspaces';
+
+	const testScript: string =
+		'# Enable Kubedock\n' +
+		'export KUBEDOCK_ENABLED=true\n' +
+		'echo KUBEDOCK_ENABLED\n' +
+		'/entrypoint.sh\n' +
+		'cd $PROJECT_SOURCE\n' +
+		'export ARCH=$(uname -m)\n' +
+		'export DATE=$(date +"%m%d%y")\n' +
+		'export USER=$(oc whoami)\n' +
+		'export TKN=$(oc whoami -t)\n' +
+		'export REG="image-registry.openshift-image-registry.svc:5000"\n' +
+		'export PROJECT=$(oc project -q)\n' +
+		'export IMG="${REG}/${PROJECT}/hello:${DATE}"\n' +
+		'podman login --tls-verify=false --username ${USER} --password ${TKN} ${REG}\n' +
+		'podman build -t ${IMG} -f Dockerfile.${ARCH}\n' +
+		'podman push --tls-verify=false ${IMG}\n';
+
+	const runTestScript: string =
+		'# Enable Kubedock\n' +
+		'export KUBEDOCK_ENABLED=true\n' +
+		'echo KUBEDOCK_ENABLED\n' +
+		'/entrypoint.sh\n' +
+		'export DATE=$(date +"%m%d%y")\n' +
+		'export USER=$(oc whoami)\n' +
+		'export TKN=$(oc whoami -t)\n' +
+		'export REG="image-registry.openshift-image-registry.svc:5000"\n' +
+		'export PROJECT=$(oc project -q)\n' +
+		'export IMG="${REG}/${PROJECT}/hello:${DATE}"\n' +
+		'podman login --tls-verify=false --username ${USER} --password ${TKN} ${REG}\n' +
+		'podman run --rm ${IMG}';
+
+	const factoryUrl: string = BASE_TEST_CONSTANTS.IS_CLUSTER_DISCONNECTED()
+		? FACTORY_TEST_CONSTANTS.TS_SELENIUM_AIRGAP_FACTORY_GIT_REPO_URL ||
+			'https://gh.crw-qe.com/test-automation-only/dockerfile-hello-world'
+		: FACTORY_TEST_CONSTANTS.TS_SELENIUM_FACTORY_GIT_REPO_URL || 'https://github.com/crw-qe/dockerfile-hello-world';
+
+	suiteSetup(function (): void {
+		kubernetesCommandLineToolsExecutor.loginToOcp();
+		shellExecutor.executeCommand('oc project openshift-devspaces');
+
+		// get current value of spec.devEnvironments.persistUserHome.enabled
+		const currentValue: string = shellExecutor
+			.executeCommand(`oc get checluster/${cheClusterName} -o "jsonpath={.spec.devEnvironments.persistUserHome.enabled}"`)
+			.stdout.trim();
+		defaultPersistentHomeValue = currentValue === 'true';
+
+		// set spec.devEnvironments.persistUserHome.enabled to true
+		const patchResult: ShellString = shellExecutor.executeCommand(
+			`oc patch checluster ${cheClusterName} --type=merge ` +
+				'-p \'{"spec":{"devEnvironments":{"persistUserHome":{"enabled": true}}}}\''
+		);
+		expect(patchResult.code).to.equal(0, 'Failed to patch CheCluster to enable persistUserHome');
+	});
+
+	suiteSetup('Login', async function (): Promise<void> {
+		await loginTests.loginIntoChe();
+	});
+
+	test(`Create and open new workspace from factory:${factoryUrl}`, async function (): Promise<void> {
+		await workspaceHandlingTests.createAndOpenWorkspaceFromGitRepository(factoryUrl);
+	});
+
+	test('Obtain workspace name from workspace loader page', async function (): Promise<void> {
+		await workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+		workspaceName = WorkspaceHandlingTests.getWorkspaceName();
+		expect(workspaceName, 'Workspace name was not fetched from the loading page').not.undefined;
+	});
+
+	test('Register running workspace', function (): void {
+		registerRunningWorkspace(workspaceName);
+	});
+
+	test('Wait workspace readiness', async function (): Promise<void> {
+		await projectAndFileTests.waitWorkspaceReadinessForCheCodeEditor();
+	});
+
+	test('Check the project files were imported', async function (): Promise<void> {
+		const projectSection: ViewSection = await projectAndFileTests.getProjectViewSession();
+		expect(await projectAndFileTests.getProjectTreeItem(projectSection, 'Dockerfile.ppc64le'), 'Files not imported').not.undefined;
+	});
+
+	test('Create and check container runs using kubedock and podman with persistUserHome', function (): void {
+		kubernetesCommandLineToolsExecutor.workspaceName = workspaceName;
+		kubernetesCommandLineToolsExecutor.loginToOcp();
+		kubernetesCommandLineToolsExecutor.getPodAndContainerNames();
+		const output: ShellString = kubernetesCommandLineToolsExecutor.execInContainerCommand(testScript);
+		expect(output, 'Podman test script failed').contains('Successfully tagged');
+		const runOutput: ShellString = kubernetesCommandLineToolsExecutor.execInContainerCommand(runTestScript);
+		expect(runOutput, 'Podman test script failed').contains('Hello from Kubedock!');
+	});
+
+	suiteTeardown(function (): void {
+		// restore spec.devEnvironments.persistUserHome.enabled to original value
+		const restoreResult: ShellString = shellExecutor.executeCommand(
+			`oc patch checluster ${cheClusterName} --type=merge ` +
+				`-p '{"spec":{"devEnvironments":{"persistUserHome":{"enabled": ${defaultPersistentHomeValue}}}}}'`
+		);
+
+		expect(restoreResult.code).to.equal(0, 'Failed to restore CheCluster persistUserHome setting');
+	});
+
+	suiteTeardown('Stop and delete the workspace by API', async function (): Promise<void> {
+		await dashboard.openDashboard();
+		await browserTabsUtil.closeAllTabsExceptCurrent();
+		await testWorkspaceUtil.stopAndDeleteWorkspaceByName(WorkspaceHandlingTests.getWorkspaceName());
+	});
+
+	suiteTeardown('Unregister running workspace', function (): void {
+		registerRunningWorkspace('');
+	});
+});