@eclipse-che/che-e2e 7.105.0-next-0bffc5e → 7.105.0-next-9a5c6e1
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.
- package/constants/API_TEST_CONSTANTS.ts +4 -1
- package/dist/constants/API_TEST_CONSTANTS.js +2 -1
- package/dist/constants/API_TEST_CONSTANTS.js.map +1 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js +12 -1
- package/dist/utils/DevWorkspaceConfigurationHelper.js.map +1 -1
- package/dist/utils/DevfilesHelper.js +1 -1
- package/dist/utils/DevfilesHelper.js.map +1 -1
- package/package.json +1 -1
- package/utils/DevWorkspaceConfigurationHelper.ts +19 -1
- package/utils/DevfilesHelper.ts +1 -1
|
@@ -35,6 +35,7 @@ export const API_TEST_CONSTANTS: {
|
|
|
35
35
|
TS_API_TEST_UDI_IMAGE: string | undefined;
|
|
36
36
|
TS_API_TEST_NAMESPACE: string | undefined;
|
|
37
37
|
TS_API_ACCEPTANCE_TEST_REGISTRY_URL(): string;
|
|
38
|
+
TS_API_TEST_STORAGE_TYPE: string;
|
|
38
39
|
} = {
|
|
39
40
|
/**
|
|
40
41
|
* possible values "oc" or "kubectl"
|
|
@@ -71,5 +72,7 @@ export const API_TEST_CONSTANTS: {
|
|
|
71
72
|
return process.env.TS_API_ACCEPTANCE_TEST_REGISTRY_URL || '';
|
|
72
73
|
},
|
|
73
74
|
|
|
74
|
-
TS_API_TEST_DEV_WORKSPACE_LIST: process.env.TS_API_TEST_DEV_WORKSPACE_LIST || undefined
|
|
75
|
+
TS_API_TEST_DEV_WORKSPACE_LIST: process.env.TS_API_TEST_DEV_WORKSPACE_LIST || undefined,
|
|
76
|
+
|
|
77
|
+
TS_API_TEST_STORAGE_TYPE: process.env.TS_API_TEST_STORAGE_TYPE || 'per-user'
|
|
75
78
|
};
|
|
@@ -54,6 +54,7 @@ exports.API_TEST_CONSTANTS = {
|
|
|
54
54
|
TS_API_ACCEPTANCE_TEST_REGISTRY_URL() {
|
|
55
55
|
return process.env.TS_API_ACCEPTANCE_TEST_REGISTRY_URL || '';
|
|
56
56
|
},
|
|
57
|
-
TS_API_TEST_DEV_WORKSPACE_LIST: process.env.TS_API_TEST_DEV_WORKSPACE_LIST || undefined
|
|
57
|
+
TS_API_TEST_DEV_WORKSPACE_LIST: process.env.TS_API_TEST_DEV_WORKSPACE_LIST || undefined,
|
|
58
|
+
TS_API_TEST_STORAGE_TYPE: process.env.TS_API_TEST_STORAGE_TYPE || 'per-user'
|
|
58
59
|
};
|
|
59
60
|
//# sourceMappingURL=API_TEST_CONSTANTS.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"API_TEST_CONSTANTS.js","sourceRoot":"","sources":["../../constants/API_TEST_CONSTANTS.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;AAExE,+DAA4D;AAE5D,IAAY,yBAGX;AAHD,WAAY,yBAAyB;IACpC,sCAAS,CAAA;IACT,gDAAmB,CAAA;AACpB,CAAC,EAHW,yBAAyB,GAAzB,iCAAyB,KAAzB,iCAAyB,QAGpC;AAEY,QAAA,4BAA4B,GAIrC;IACH,wCAAwC,EAAE,GAAW,EAAE,CAAC,GAAG,yCAAmB,CAAC,oBAAoB,6BAA6B;IAChI,gCAAgC,EAAE,kFAAkF;IACpH;;OAEG;IACH,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE;CAC9D,CAAC;AACW,QAAA,kBAAkB,
|
|
1
|
+
{"version":3,"file":"API_TEST_CONSTANTS.js","sourceRoot":"","sources":["../../constants/API_TEST_CONSTANTS.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;AAExE,+DAA4D;AAE5D,IAAY,yBAGX;AAHD,WAAY,yBAAyB;IACpC,sCAAS,CAAA;IACT,gDAAmB,CAAA;AACpB,CAAC,EAHW,yBAAyB,GAAzB,iCAAyB,KAAzB,iCAAyB,QAGpC;AAEY,QAAA,4BAA4B,GAIrC;IACH,wCAAwC,EAAE,GAAW,EAAE,CAAC,GAAG,yCAAmB,CAAC,oBAAoB,6BAA6B;IAChI,gCAAgC,EAAE,kFAAkF;IACpH;;OAEG;IACH,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE;CAC9D,CAAC;AACW,QAAA,kBAAkB,GAS3B;IACH;;OAEG;IACH,wCAAwC,EAAE,OAAO,CAAC,GAAG,CAAC,wCAAwC,IAAI,yBAAyB,CAAC,EAAE;IAE9H;;;OAGG;IACH,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,SAAS;IAErE;;;OAGG;IACH,uCAAuC,EAAE,OAAO,CAAC,GAAG,CAAC,uCAAuC,IAAI,SAAS;IAEzG;;;OAGG;IACH,+BAA+B,EAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,IAAI,SAAS;IAEzF;;OAEG;IACH,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,SAAS;IAErE;;OAEG;IACH,mCAAmC;QAClC,OAAO,OAAO,CAAC,GAAG,CAAC,mCAAmC,IAAI,EAAE,CAAC;IAC9D,CAAC;IAED,8BAA8B,EAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,SAAS;IAEvF,wBAAwB,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,UAAU;CAC5E,CAAC"}
|
|
@@ -84,10 +84,12 @@ let DevWorkspaceConfigurationHelper = class DevWorkspaceConfigurationHelper {
|
|
|
84
84
|
if (!this.params.projects) {
|
|
85
85
|
this.params.projects = [];
|
|
86
86
|
}
|
|
87
|
-
|
|
87
|
+
const devfileContext = await this.generator.generateDevfileContext({
|
|
88
88
|
...this.params,
|
|
89
89
|
projects: this.params.projects
|
|
90
90
|
}, axios.default);
|
|
91
|
+
this.patchDevWorkspaceConfigWithStorageTypeAttribute(devfileContext);
|
|
92
|
+
return devfileContext;
|
|
91
93
|
}
|
|
92
94
|
// write templates and then DevWorkspace in a single file
|
|
93
95
|
getDevWorkspaceConfigurationYamlAsString(context) {
|
|
@@ -119,6 +121,15 @@ let DevWorkspaceConfigurationHelper = class DevWorkspaceConfigurationHelper {
|
|
|
119
121
|
controller.devfile.io/scc: container-build
|
|
120
122
|
controller.devfile.io/storage-type: per-user`);
|
|
121
123
|
}
|
|
124
|
+
/**
|
|
125
|
+
* add storage type attribute to fix issue CRW-8922.
|
|
126
|
+
*/
|
|
127
|
+
patchDevWorkspaceConfigWithStorageTypeAttribute(devfileContextDevWorkspace, storageType = API_TEST_CONSTANTS_1.API_TEST_CONSTANTS.TS_API_TEST_STORAGE_TYPE) {
|
|
128
|
+
Logger_1.Logger.debug();
|
|
129
|
+
devfileContextDevWorkspace.devWorkspace?.spec?.template &&
|
|
130
|
+
(devfileContextDevWorkspace.devWorkspace.spec.template.attributes = yaml_1.default.parse(`
|
|
131
|
+
controller.devfile.io/storage-type: ${storageType}`));
|
|
132
|
+
}
|
|
122
133
|
};
|
|
123
134
|
__decorate([
|
|
124
135
|
lazyInject(inversify_types_1.EXTERNAL_CLASSES.Generator),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevWorkspaceConfigurationHelper.js","sourceRoot":"","sources":["../../utils/DevWorkspaceConfigurationHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;wEAQwE;AACxE,2EAAqF;AAGrF,gDAAwB;AACxB,6CAA+B;AAC/B,qCAAkC;AAClC,mDAAgD;AAChD,wEAAqE;AACrE,yCAAuC;AAEvC,kEAA2D;AAC3D,gEAAuE;AACvE,8FAAwD;AAExD,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,qCAAa,EAAC,+BAAY,CAAC,CAAC;AAG5C,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAO3C,YAAY,MAAsB;QACjC,yBAAyB;QACzB,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE;YACvE,MAAM,CAAC,WAAW,GAAG,+BAA+B,CAAC;SACrD;QACD,iCAAiC;QACjC,IAAI,uCAAkB,CAAC,qBAAqB,IAAI,MAAM,CAAC,qBAAqB,EAAE;YAC7E,MAAM,CAAC,sBAAsB,GAAG,MAAM,CAAC;YACvC,sEAAsE;YACtE,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE;gBAClC,MAAM,CAAC,qBAAqB,GAAG,uCAAkB,CAAC,qBAAqB,CAAC;aACxE;SACD;QACD,2DAA2D;QAC3D,IAAI,uCAAkB,CAAC,+BAA+B,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;YACpF,MAAM,CAAC,iBAAiB,GAAG,uCAAkB,CAAC,+BAA+B,CAAC;SAC9E;QACD,IAAI,uCAAkB,CAAC,uCAAuC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACxF,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,uCAAkB,CAAC,uCAAuC,CAAC,CAAC,MAAM,CAAC;SAClH;QACD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC3B,eAAM,CAAC,KAAK,EAAE,CAAC;QAEf,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC;SAC1B;
|
|
1
|
+
{"version":3,"file":"DevWorkspaceConfigurationHelper.js","sourceRoot":"","sources":["../../utils/DevWorkspaceConfigurationHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,7 +60,7 @@ let DevfilesHelper = class DevfilesHelper {
|
|
|
60
60
|
const command = `oc get pods -n ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()}`;
|
|
61
61
|
console.log(`command: ${command}`);
|
|
62
62
|
const podName = this.getShellExecutor()
|
|
63
|
-
.executeArbitraryShellScript(`oc get pods -n ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()} | grep dashboard | awk \'{print $1}\'`)
|
|
63
|
+
.executeArbitraryShellScript(`oc get pods -n ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()} --field-selector status.phase=Running | grep dashboard | awk \'{print $1}\'`)
|
|
64
64
|
.trim();
|
|
65
65
|
const containerName = this.getShellExecutor().executeArbitraryShellScript(`oc get pod -n ${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS_1.BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()} ${podName} -o jsonpath=\'{.spec.containers[*].name}\'`);
|
|
66
66
|
const devfileContent = this.obtainDevFileContentUsingPod(podName, containerName, devSample);
|
|
@@ -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;QAEzG,OAAO,0DAA0D,sBAAsB,EAAE,CAAC;IAC3F,CAAC;IAED;;;;;OAKG;IACI,4BAA4B,CAAC,OAAe,EAAE,aAAqB,EAAE,WAAmB;QAC9F,MAAM,UAAU,GAAW,IAAI,CAAC,8BAA8B,CAAC,WAAW,CAAC,CAAC;QAC5E,IAAI,CAAC,gBAAgB,EAAE,CAAC,cAAc,CACrC,cAAc,OAAO,QAAQ,yCAAmB,CAAC,WAAW,IAAI,yCAAmB,CAAC,wBAAwB,EAAE,OAAO,aAAa,2BAA2B,WAAW,iBAAiB,UAAU,GAAG,CACtM,CAAC;QACF,OAAO,IAAI,CAAC,gBAAgB,EAAE;aAC5B,2BAA2B,CAC3B,cAAc,OAAO,QAAQ,yCAAmB,CAAC,WAAW,IAAI,yCAAmB,CAAC,wBAAwB,EAAE,OAAO,aAAa,gBAAgB,WAAW,eAAe,CAC5K;aACA,QAAQ,EAAE,CAAC;IACd,CAAC;IAED;;;OAGG;IACI,sCAAsC,CAAC,aAAqB;QAClE,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,cAAc,CAC5C,oBAAoB,aAAa,6CAA6C,yCAAmB,CAAC,WAAW,IAAI,yCAAmB,CAAC,wBAAwB,EAAE,EAAE,CACjK,CAAC;IACH,CAAC;IAED;;;OAGG;IACI,iBAAiB,CAAC,SAAiB;QACzC,MAAM,OAAO,GAAW,kBAAkB,yCAAmB,CAAC,WAAW,IAAI,yCAAmB,CAAC,wBAAwB,EAAE,EAAE,CAAC;QAC9H,OAAO,CAAC,GAAG,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC;QACnC,MAAM,OAAO,GAAW,IAAI,CAAC,gBAAgB,EAAE;aAC7C,2BAA2B,CAC3B,kBAAkB,yCAAmB,CAAC,WAAW,IAAI,yCAAmB,CAAC,wBAAwB,EAAE,
|
|
1
|
+
{"version":3,"file":"DevfilesHelper.js","sourceRoot":"","sources":["../../utils/DevfilesHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -60,13 +60,18 @@ export class DevWorkspaceConfigurationHelper {
|
|
|
60
60
|
if (!this.params.projects) {
|
|
61
61
|
this.params.projects = [];
|
|
62
62
|
}
|
|
63
|
-
|
|
63
|
+
|
|
64
|
+
const devfileContext: DevfileContext = await this.generator.generateDevfileContext(
|
|
64
65
|
{
|
|
65
66
|
...this.params,
|
|
66
67
|
projects: this.params.projects
|
|
67
68
|
},
|
|
68
69
|
axios.default as any
|
|
69
70
|
);
|
|
71
|
+
|
|
72
|
+
this.patchDevWorkspaceConfigWithStorageTypeAttribute(devfileContext);
|
|
73
|
+
|
|
74
|
+
return devfileContext;
|
|
70
75
|
}
|
|
71
76
|
|
|
72
77
|
// write templates and then DevWorkspace in a single file
|
|
@@ -108,4 +113,17 @@ export class DevWorkspaceConfigurationHelper {
|
|
|
108
113
|
controller.devfile.io/scc: container-build
|
|
109
114
|
controller.devfile.io/storage-type: per-user`);
|
|
110
115
|
}
|
|
116
|
+
|
|
117
|
+
/**
|
|
118
|
+
* add storage type attribute to fix issue CRW-8922.
|
|
119
|
+
*/
|
|
120
|
+
patchDevWorkspaceConfigWithStorageTypeAttribute(
|
|
121
|
+
devfileContextDevWorkspace: DevfileContext,
|
|
122
|
+
storageType: string = API_TEST_CONSTANTS.TS_API_TEST_STORAGE_TYPE
|
|
123
|
+
): void {
|
|
124
|
+
Logger.debug();
|
|
125
|
+
devfileContextDevWorkspace.devWorkspace?.spec?.template &&
|
|
126
|
+
(devfileContextDevWorkspace.devWorkspace.spec.template.attributes = YAML.parse(`
|
|
127
|
+
controller.devfile.io/storage-type: ${storageType}`));
|
|
128
|
+
}
|
|
111
129
|
}
|
package/utils/DevfilesHelper.ts
CHANGED
|
@@ -62,7 +62,7 @@ export class DevfilesHelper {
|
|
|
62
62
|
console.log(`command: ${command}`);
|
|
63
63
|
const podName: string = this.getShellExecutor()
|
|
64
64
|
.executeArbitraryShellScript(
|
|
65
|
-
`oc get pods -n ${BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()} | grep dashboard | awk \'{print $1}\'`
|
|
65
|
+
`oc get pods -n ${BASE_TEST_CONSTANTS.TS_PLATFORM}-${BASE_TEST_CONSTANTS.TESTING_APPLICATION_NAME()} --field-selector status.phase=Running | grep dashboard | awk \'{print $1}\'`
|
|
66
66
|
)
|
|
67
67
|
.trim();
|
|
68
68
|
const containerName: string = this.getShellExecutor().executeArbitraryShellScript(
|