@eclipse-che/che-e2e 7.100.0-next-740ef2d → 7.100.0-next-43d3fdd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -30,11 +30,7 @@ const inversify_types_1 = require("../configs/inversify.types");
|
|
|
30
30
|
let DevfilesHelper = class DevfilesHelper {
|
|
31
31
|
getInternalClusterURLToDevFile(devFileName) {
|
|
32
32
|
const devfileSampleURIPrefix = `/dashboard/api/airgap-sample/devfile/download?id=${devFileName}`;
|
|
33
|
-
|
|
34
|
-
let servicePort = '';
|
|
35
|
-
serviceClusterIp = this.getShellExecutor().executeArbitraryShellScript(`oc get svc devspaces-dashboard -n ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()} -o=jsonpath='{.spec.clusterIP}'`);
|
|
36
|
-
servicePort = this.getShellExecutor().executeArbitraryShellScript(`oc get svc devspaces-dashboard -n ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()} -o=jsonpath='{.spec.ports[*].port}'`);
|
|
37
|
-
return `http://${serviceClusterIp}:${servicePort}${devfileSampleURIPrefix}`;
|
|
33
|
+
return `http://devspaces-dashboard.openshift-devspaces.svc:8080${devfileSampleURIPrefix}`;
|
|
38
34
|
}
|
|
39
35
|
/**
|
|
40
36
|
* grab devfile content from the Dashboard pod (currently, in the image of dashboard builds with devfile content and we use it for getting devfile description)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevfilesHelper.js","sourceRoot":"","sources":["../../utils/DevfilesHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,kDAA6C;AAC7C,qCAAkC;AAClC,gDAAwB;AACxB,wEAAmG;AACnG,yCAAuC;AACvC,0EAAiF;AAEjF,kEAA2D;AAC3D,gEAAqD;AAG9C,IAAM,cAAc,GAApB,MAAM,cAAc;IACnB,8BAA8B,CAAC,WAAmB;QACxD,MAAM,sBAAsB,GAAW,oDAAoD,WAAW,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"DevfilesHelper.js","sourceRoot":"","sources":["../../utils/DevfilesHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/utils/DevfilesHelper.ts
CHANGED
|
@@ -21,15 +21,8 @@ import { CLASSES } from '../configs/inversify.types';
|
|
|
21
21
|
export class DevfilesHelper {
|
|
22
22
|
public getInternalClusterURLToDevFile(devFileName: string): string {
|
|
23
23
|
const devfileSampleURIPrefix: string = `/dashboard/api/airgap-sample/devfile/download?id=${devFileName}`;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
serviceClusterIp = this.getShellExecutor().executeArbitraryShellScript(
|
|
27
|
-
`oc get svc devspaces-dashboard -n ${BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()} -o=jsonpath='{.spec.clusterIP}'`
|
|
28
|
-
);
|
|
29
|
-
servicePort = this.getShellExecutor().executeArbitraryShellScript(
|
|
30
|
-
`oc get svc devspaces-dashboard -n ${BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()} -o=jsonpath='{.spec.ports[*].port}'`
|
|
31
|
-
);
|
|
32
|
-
return `http://${serviceClusterIp}:${servicePort}${devfileSampleURIPrefix}`;
|
|
24
|
+
|
|
25
|
+
return `http://devspaces-dashboard.openshift-devspaces.svc:8080${devfileSampleURIPrefix}`;
|
|
33
26
|
}
|
|
34
27
|
|
|
35
28
|
/**
|