@eclipse-che/che-e2e 7.76.0-next-a90153c → 7.76.0-next-f98fe6d

package/utils/DevfilesRegistryHelper.ts

@@ -28,54 +28,56 @@ export class DevfilesRegistryHelper {
 	async getGitHubCheDevfileRegistryContent(): Promise<AxiosResponse> {
 		Logger.trace();
 
-		return await this.getContent(SUPPORTED_DEVFILE_REGISTRIES.GIT_HUB_CHE_DEVFILE_REGISTRY_URL);
+		const url: string =
+			API_TEST_CONSTANTS.TS_API_ACCEPTANCE_TEST_REGISTRY_URL() === ''
+				? SUPPORTED_DEVFILE_REGISTRIES.GIT_HUB_CHE_DEVFILE_REGISTRY_URL
+				: API_TEST_CONSTANTS.TS_API_ACCEPTANCE_TEST_REGISTRY_URL();
+		return await this.getContent(url);
 	}
 
-	async collectPathsToDevfilesFromRegistry(isInbuilt: boolean = true, sampleNamePatterns?: string[]): Promise<object[]> {
+	async collectPathsToDevfilesFromRegistry(isInbuilt: boolean, sampleNamePatterns?: string[]): Promise<object[]> {
 		Logger.debug();
 
 		const devfileSamples: object[] = [];
 		const sampleNames: string[] = [];
-		switch (isInbuilt) {
-			case false:
-				{
-					const content: any[any] = await this.getGitHubCheDevfileRegistryContent();
-					content.forEach((e: any): void => {
-						if (e.name[0] !== '.') {
-							sampleNames.push(e.name);
-						}
-					});
-
-					for (const sample of sampleNames) {
-						const sampleEndpoint: string = `${SUPPORTED_DEVFILE_REGISTRIES.GIT_HUB_CHE_DEVFILE_REGISTRY_URL}${sample}/meta.yaml`;
-						const sampleEndpointContent: AxiosResponse = await this.getContent(sampleEndpoint);
-						const decodedFileContent: string = Buffer.from((sampleEndpointContent as any).content, 'base64').toString();
-						const metaYamlContent: any = YAML.parse(decodedFileContent);
-						devfileSamples.push({
-							name: sample,
-							link: metaYamlContent.links.v2
-						});
+		if (!isInbuilt) {
+			{
+				const content: any[any] = await this.getGitHubCheDevfileRegistryContent();
+				content.forEach((e: any): void => {
+					if (e.name[0] !== '.') {
+						sampleNames.push(e.name);
 					}
-					Logger.debug(`samples list: ${JSON.stringify(devfileSamples)}`);
+				});
+
+				for (const sample of sampleNames) {
+					const sampleEndpoint: string = `${SUPPORTED_DEVFILE_REGISTRIES.GIT_HUB_CHE_DEVFILE_REGISTRY_URL}${sample}/meta.yaml`;
+					const sampleEndpointContent: AxiosResponse = await this.getContent(sampleEndpoint);
+					const decodedFileContent: string = Buffer.from((sampleEndpointContent as any).content, 'base64').toString();
+					const metaYamlContent: any = YAML.parse(decodedFileContent);
+					devfileSamples.push({
+						name: sample,
+						link: metaYamlContent.links.v2
+					});
 				}
-				break;
-			case true:
-				{
-					const content: any[any] = await this.getInbuiltDevfilesRegistryContent(sampleNamePatterns);
-					for (const sample of content) {
-						const linkToDevWorkspaceYaml: any =
-							BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL +
-							'/devfile-registry' +
-							sample.links.devWorkspaces['che-incubator/che-code/latest'];
-						devfileSamples.push({
-							name: sample.displayName,
-							devWorkspaceConfigurationString: await this.getContent(linkToDevWorkspaceYaml)
-						});
-					}
-					Logger.debug(`samples list: ${JSON.stringify(devfileSamples)}`);
+				Logger.debug(`samples list: ${JSON.stringify(devfileSamples)}`);
+			}
+		} else if (isInbuilt) {
+			{
+				const content: any[any] = await this.getInbuiltDevfilesRegistryContent(sampleNamePatterns);
+				for (const sample of content) {
+					const linkToDevWorkspaceYaml: any =
+						BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL +
+						'/devfile-registry' +
+						sample.links.devWorkspaces['che-incubator/che-code/latest'];
+					devfileSamples.push({
+						name: sample.displayName,
+						devWorkspaceConfigurationString: await this.getContent(linkToDevWorkspaceYaml)
+					});
 				}
-				break;
-			default: {
+				Logger.debug(`samples list: ${JSON.stringify(devfileSamples)}`);
+			}
+		} else {
+			{
 				Logger.error(`unsupported registry url - ${API_TEST_CONSTANTS.TS_API_ACCEPTANCE_TEST_REGISTRY_URL()}\n
                 supported registries: ${JSON.stringify(SUPPORTED_DEVFILE_REGISTRIES)}`);
 			}

package/utils/KubernetesCommandLineToolsExecutor.ts

@@ -46,14 +46,14 @@ export class KubernetesCommandLineToolsExecutor implements IKubernetesCommandLin
 	}
 
 	get namespace(): string | undefined {
-		this._namespace =
-			this._namespace !== undefined
-				? this._namespace
-				: BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.includes('devspaces')
-				? OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME + '-devspaces'
-				: BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.includes('che')
-				? OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME + '-che'
-				: 'default';
+		if (!this._namespace) {
+			const applicationName: string = BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME();
+			if (applicationName === 'default') {
+				this._namespace = applicationName;
+			} else {
+				this._namespace = OAUTH_CONSTANTS.TS_SELENIUM_OCP_USERNAME + '-' + applicationName;
+			}
+		}
 		return this._namespace;
 	}
 

package/configs/reporters-config.json

@@ -1,6 +0,0 @@
-{
-	"reporterEnabled": "allure-mocha,dist/utils/CheReporter.js",
-	"allureMochaReporterOptions": {
-		"resultsDir": ".allure-results"
-	}
-}