@eclipse-che/che-e2e 7.73.0-dev-62c0c9d → 7.73.0-dev-ed57855

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.
Files changed (8) hide show
  1. package/constants/BaseTestConstants.ts +2 -0
  2. package/dist/constants/BaseTestConstants.js +1 -0
  3. package/dist/constants/BaseTestConstants.js.map +1 -1
  4. package/dist/specs/api/PodOverridesAPI.spec.js +2 -1
  5. package/dist/specs/api/PodOverridesAPI.spec.js.map +1 -1
  6. package/package.json +1 -1
  7. package/resources/pod-overrides-airgap.yaml +37 -0
  8. package/specs/api/PodOverridesAPI.spec.ts +2 -1
package/constants/BaseTestConstants.ts CHANGED
@@ -18,6 +18,8 @@ export const BaseTestConstants: any = {
18
18
  */
19
19
  TS_SELENIUM_BASE_URL: !process.env.TS_SELENIUM_BASE_URL ? 'http://sample-url' : process.env.TS_SELENIUM_BASE_URL.replace(/\/$/, ''),
20
20
 
21
+ IS_CLUSTER_DISCONNECTED: () => BaseTestConstants.TS_SELENIUM_BASE_URL.includes('airgap'),
22
+
21
23
  /**
22
24
  * Choose the platform where "che" application deployed, "openshift" by default.
23
25
  */
package/dist/constants/BaseTestConstants.js CHANGED
@@ -20,6 +20,7 @@ exports.BaseTestConstants = {
20
20
  * Base URL of the application which should be checked
21
21
  */
22
22
  TS_SELENIUM_BASE_URL: !process.env.TS_SELENIUM_BASE_URL ? 'http://sample-url' : process.env.TS_SELENIUM_BASE_URL.replace(/\/$/, ''),
23
+ IS_CLUSTER_DISCONNECTED: () => exports.BaseTestConstants.TS_SELENIUM_BASE_URL.includes('airgap'),
23
24
  /**
24
25
  * Choose the platform where "che" application deployed, "openshift" by default.
25
26
  */
package/dist/constants/BaseTestConstants.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseTestConstants.js","sourceRoot":"","sources":["../../constants/BaseTestConstants.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AACxE,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,mCAAuB,CAAA;IACvB,qCAAyB,CAAA;AAC3B,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB;AAEY,QAAA,iBAAiB,GAAQ;IACpC;;OAEG;IACH,oBAAoB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;IAEnI;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,QAAQ,CAAC,SAAS;IAE1D;;;OAGG;IACH,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,UAAU;IAEhE;;OAEG;IACH,kCAAkC,EAAE,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,cAAc;IAEpG;;OAEG;IACH,qCAAqC,EAAE,OAAO,CAAC,GAAG,CAAC,qCAAqC,IAAI,gBAAgB;IAE5G;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,OAAO;IAEnD;;OAEG;IACH,+BAA+B,EAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,KAAK,MAAM;IAEvF;;OAEG;IACH,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,KAAK,MAAM;IAEzF;;OAEG;IACH,+BAA+B,EAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,KAAK,MAAM;IAEvF;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM;CACpD,CAAC"}
1
+ {"version":3,"file":"BaseTestConstants.js","sourceRoot":"","sources":["../../constants/BaseTestConstants.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;wEAQwE;AACxE,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,mCAAuB,CAAA;IACvB,qCAAyB,CAAA;AAC3B,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB;AAEY,QAAA,iBAAiB,GAAQ;IACpC;;OAEG;IACH,oBAAoB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;IAEnI,uBAAuB,EAAE,GAAG,EAAE,CAAC,yBAAiB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAExF;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,QAAQ,CAAC,SAAS;IAE1D;;;OAGG;IACH,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,UAAU;IAEhE;;OAEG;IACH,kCAAkC,EAAE,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,cAAc;IAEpG;;OAEG;IACH,qCAAqC,EAAE,OAAO,CAAC,GAAG,CAAC,qCAAqC,IAAI,gBAAgB;IAE5G;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,OAAO;IAEnD;;OAEG;IACH,+BAA+B,EAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,KAAK,MAAM;IAEvF;;OAEG;IACH,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,KAAK,MAAM;IAEzF;;OAEG;IACH,+BAA+B,EAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B,KAAK,MAAM;IAEvF;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM;CACpD,CAAC"}
package/dist/specs/api/PodOverridesAPI.spec.js CHANGED
@@ -9,8 +9,9 @@ const path_1 = __importDefault(require("path"));
9
9
  const yaml_1 = __importDefault(require("yaml"));
10
10
  const chai_1 = require("chai");
11
11
  const ShellExecutor_1 = require("../../utils/ShellExecutor");
12
+ const BaseTestConstants_1 = require("../../constants/BaseTestConstants");
12
13
  suite(`Test defining pod overrides via attribute.`, async function () {
13
- const pathToSampleFile = path_1.default.resolve('resources/pod-overrides.yaml');
14
+ const pathToSampleFile = path_1.default.resolve(`resources/pod-overrides${BaseTestConstants_1.BaseTestConstants.IS_CLUSTER_DISCONNECTED() ? '-airgap' : ''}.yaml`);
14
15
  const workspaceName = yaml_1.default.parse(fs_1.default.readFileSync(pathToSampleFile, 'utf8')).metadata.name;
15
16
  const kubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor_1.KubernetesCommandLineToolsExecutor(workspaceName);
16
17
  suiteSetup('Login into OC client', function () {
package/dist/specs/api/PodOverridesAPI.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PodOverridesAPI.spec.js","sourceRoot":"","sources":["../../../specs/api/PodOverridesAPI.spec.ts"],"names":[],"mappings":";;;;;AAAA,uGAAoG;AACpG,4CAAoB;AACpB,gDAAwB;AACxB,gDAAwB;AACxB,+BAA8B;AAC9B,6DAA0D;AAE1D,KAAK,CAAC,4CAA4C,EAAE,KAAK;IACvD,MAAM,gBAAgB,GAAW,cAAI,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAC9E,MAAM,aAAa,GAAW,cAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IAClG,MAAM,kCAAkC,GAAuC,IAAI,uEAAkC,CAAC,aAAa,CAAC,CAAC;IAErI,UAAU,CAAC,sBAAsB,EAAE;QACjC,kCAAkC,CAAC,UAAU,EAAE,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,qBAAqB,EAAE;QACnC,kCAAkC,CAAC,kBAAkB,EAAE,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2DAA2D,EAAE;QAChE,kCAAkC,CAAC,4BAA4B,CAAC,gBAAgB,CAAC,CAAC;QAClF,6BAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,qEAAqE,EAAE;QAC1E,MAAM,0BAA0B,GAAQ,cAAI,CAAC,KAAK,CAAC,kCAAkC,CAAC,gCAAgC,EAAE,CAAC,CAAC;QAC1H,aAAM,CAAC,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC;YAChF,QAAQ,EAAE;gBACR,WAAW,EAAE;oBACX,iCAAiC,EAAE,kCAAkC;oBACrE,qBAAqB,EAAE,MAAM;oBAC7B,kBAAkB,EAAE,iBAAiB;iBACtC;aACF;YACD,IAAI,EAAE;gBACJ,gBAAgB,EAAE,MAAM;gBACxB,aAAa,EAAE,OAAO;aACvB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"PodOverridesAPI.spec.js","sourceRoot":"","sources":["../../../specs/api/PodOverridesAPI.spec.ts"],"names":[],"mappings":";;;;;AAAA,uGAAoG;AACpG,4CAAoB;AACpB,gDAAwB;AACxB,gDAAwB;AACxB,+BAA8B;AAC9B,6DAA0D;AAC1D,yEAAsE;AAEtE,KAAK,CAAC,4CAA4C,EAAE,KAAK;IACvD,MAAM,gBAAgB,GAAW,cAAI,CAAC,OAAO,CAAC,0BAA0B,qCAAiB,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAC7I,MAAM,aAAa,GAAW,cAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IAClG,MAAM,kCAAkC,GAAuC,IAAI,uEAAkC,CAAC,aAAa,CAAC,CAAC;IAErI,UAAU,CAAC,sBAAsB,EAAE;QACjC,kCAAkC,CAAC,UAAU,EAAE,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,qBAAqB,EAAE;QACnC,kCAAkC,CAAC,kBAAkB,EAAE,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2DAA2D,EAAE;QAChE,kCAAkC,CAAC,4BAA4B,CAAC,gBAAgB,CAAC,CAAC;QAClF,6BAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,qEAAqE,EAAE;QAC1E,MAAM,0BAA0B,GAAQ,cAAI,CAAC,KAAK,CAAC,kCAAkC,CAAC,gCAAgC,EAAE,CAAC,CAAC;QAC1H,aAAM,CAAC,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC;YAChF,QAAQ,EAAE;gBACR,WAAW,EAAE;oBACX,iCAAiC,EAAE,kCAAkC;oBACrE,qBAAqB,EAAE,MAAM;oBAC7B,kBAAkB,EAAE,iBAAiB;iBACtC;aACF;YACD,IAAI,EAAE;gBACJ,gBAAgB,EAAE,MAAM;gBACxB,aAAa,EAAE,OAAO;aACvB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eclipse-che/che-e2e",
3
- "version": "7.73.0-dev-62c0c9d",
3
+ "version": "7.73.0-dev-ed57855",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
package/resources/pod-overrides-airgap.yaml ADDED
@@ -0,0 +1,37 @@
1
+ kind: DevWorkspace
2
+ apiVersion: workspace.devfile.io/v1alpha2
3
+ metadata:
4
+ name: code-latest-pod-overrides
5
+ spec:
6
+ started: true
7
+ template:
8
+ attributes:
9
+ pod-overrides:
10
+ metadata:
11
+ annotations:
12
+ io.openshift.userns: "true"
13
+ io.kubernetes.cri-o.userns-mode: "auto:size=65536;map-to-root=true" # <-- user namespace
14
+ openshift.io/scc: container-build
15
+ spec:
16
+ runtimeClassName: kata
17
+ schedulerName: stork
18
+ projects:
19
+ - name: web-nodejs-sample
20
+ git:
21
+ remotes:
22
+ origin: "https://github.com/che-samples/web-nodejs-sample.git"
23
+ commands:
24
+ - id: say-hello
25
+ exec:
26
+ component: che-code-runtime-description
27
+ commandLine: echo "Hello from $(pwd)"
28
+ workingDir: ${PROJECT_SOURCE}/app
29
+ contributions:
30
+ - name: che-code
31
+ uri: http://plugin-registry.openshift-devspaces.svc.cluster.local:8080/v3/plugins/che-incubator/che-code/latest/devfile.yaml
32
+ components:
33
+ - name: che-code-runtime-description
34
+ container:
35
+ env:
36
+ - name: CODE_HOST
37
+ value: 0.0.0.0
package/specs/api/PodOverridesAPI.spec.ts CHANGED
@@ -4,9 +4,10 @@ import path from 'path';
4
4
  import YAML from 'yaml';
5
5
  import { expect } from 'chai';
6
6
  import { ShellExecutor } from '../../utils/ShellExecutor';
7
+ import { BaseTestConstants } from '../../constants/BaseTestConstants';
7
8
 
8
9
  suite(`Test defining pod overrides via attribute.`, async function(): Promise<void> {
9
- const pathToSampleFile: string = path.resolve('resources/pod-overrides.yaml');
10
+ const pathToSampleFile: string = path.resolve(`resources/pod-overrides${BaseTestConstants.IS_CLUSTER_DISCONNECTED() ? '-airgap' : ''}.yaml`);
10
11
  const workspaceName: string = YAML.parse(fs.readFileSync(pathToSampleFile, 'utf8')).metadata.name;
11
12
  const kubernetesCommandLineToolsExecutor: KubernetesCommandLineToolsExecutor = new KubernetesCommandLineToolsExecutor(workspaceName);
12
13