Stabilize import from git test step in DevConsoleIntegration test (#23815)

Author: SkorikSergey

tests/e2e/pageobjects/openshift/OcpMainPage.ts

@@ -72,7 +72,7 @@ export class OcpMainPage {
 	async selectImportFromGitMethod(): Promise<OcpImportFromGitPage> {
 		Logger.debug();
 
-		await this.driverHelper.waitAndClick(OcpMainPage.IMPORT_FROM_GIT_ITEM, TIMEOUT_CONSTANTS.TS_SELENIUM_LOAD_PAGE_TIMEOUT);
+		await this.driverHelper.waitAndClick(OcpMainPage.IMPORT_FROM_GIT_ITEM, TIMEOUT_CONSTANTS.TS_SELENIUM_WAIT_FOR_URL);
 		return e2eContainer.get(CLASSES.OcpImportFromGitPage);
 	}
 
@@ -83,6 +83,21 @@ export class OcpMainPage {
 		return await this.selectImportFromGitMethod();
 	}
 
+	/**
+	 * prefer Dev Console Add → Import from Git; if that fails , open the import route directly.
+	 */
+	async openImportFromGitPageWithFallback(importProjectUrl: string): Promise<OcpImportFromGitPage> {
+		Logger.debug();
+
+		try {
+			return await this.openImportFromGitPage();
+		} catch (err) {
+			Logger.warn(`Import from git via UI failed, navigating to ${importProjectUrl}: ${err}`);
+			await this.browserTabsUtil.navigateTo(importProjectUrl);
+			return e2eContainer.get(CLASSES.OcpImportFromGitPage);
+		}
+	}
+
 	async selectProject(projectName: string): Promise<void> {
 		Logger.debug();
 

tests/e2e/specs/devconsole-intergration/DevConsoleIntegration.spec.ts

@@ -53,6 +53,11 @@ suite(`DevConsole Integration ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function
 	const gitImportReference: string = 'pipeline';
 	const projectLabel: string = 'app.openshift.io/runtime=spring';
 	const projectName: string = 'devconsole-integration-test';
+	const openshiftConsoleUrl: string = BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace(
+		BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME(),
+		'console-openshift-console'
+	);
+	const importProjectUrl: string = `${openshiftConsoleUrl}/import/ns/${projectName}`;
 
 	suiteSetup('Create new empty project using ocp', function (): void {
 		kubernetesCommandLineToolsExecutor.loginToOcp();
@@ -101,7 +106,7 @@ suite(`DevConsole Integration ${BASE_TEST_CONSTANTS.TEST_ENVIRONMENT}`, function
 	});
 
 	test('Open import from git project page', async function (): Promise<void> {
-		ocpImportPage = await ocpMainPage.openImportFromGitPage();
+		ocpImportPage = await ocpMainPage.openImportFromGitPageWithFallback(importProjectUrl);
 	});
 
 	test('Fill and submit import data', async function (): Promise<void> {