Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adapt chectl to new plugin notation #89

Merged
merged 2 commits into from
May 3, 2019
Merged

Adapt chectl to new plugin notation #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c79b29b
Adapt chectl to new plugin notation
Apr 28, 2019
1e44463
fixup! Adapt chectl to new plugin notation
May 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions devfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ projects:
components:
- alias: theia-ide
type: cheEditor
id: org.eclipse.che.editor.theia:1.0.0
id: eclipse/che-theia/1.0.0
- type: chePlugin
id: che-machine-exec-plugin:0.0.1
id: eclipse/che-machine-exec-plugin/0.0.1
commands:
- name: build
actions:
Expand Down
2 changes: 1 addition & 1 deletion templates/che-operator/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ data:
CHE_OPENSHIFT_OAUTH: ""
# OpenShift API endpoint URL. Required only when OPENSHIFT_OAUTH is true. Auto detected
CHE_OPENSHIFT_API_URL: ""
# Plugin registry URL. Defaults to https://che-plugin-registry.openshift.io
# Plugin registry URL. Defaults to https://che-plugin-registry.openshift.io/v2
CHE_WORKSPACE_PLUGIN__REGISTRY__URL: ""
# Ask for password update at first login as Che admin user. Defaults to true, i.e. you will be asked to update password
CHE_UPDATE_CHE_ADMIN_PASSWORD: ""
Expand Down
10 changes: 5 additions & 5 deletions test/api/replies/create-workspace-from-valid-devfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
],
"name": "chectl",
"attributes": {
"editor": "org.eclipse.che.editor.theia:1.0.0",
"plugins": "che-machine-exec-plugin:0.0.1",
"toolsAliases": "org.eclipse.che.editor.theia:1.0.0=theia-ide,che-machine-exec-plugin:0.0.1=exec-plugin"
"editor": "eclipse/che-theia/1.0.0",
"plugins": "eclipse/che-machine-exec-plugin/0.0.1",
"toolsAliases": "eclipse/che-theia/1.0.0=theia-ide,eclipse/che-machine-exec-plugin/0.0.1=exec-plugin"
},
"commands": [
{
"commandLine": "yarn",
"name": "build:theia-ide",
"attributes": {
"pluginId": "org.eclipse.che.editor.theia:1.0.0",
"pluginId": "eclipse/che-theia/1.0.0",
"workingDir": "/projects/chectl"
},
"type": "exec"
Expand All @@ -47,7 +47,7 @@
"commandLine": "yarn test",
"name": "test:theia-ide",
"attributes": {
"pluginId": "org.eclipse.che.editor.theia:1.0.0",
"pluginId": "eclipse/che-theia/1.0.0",
"workingDir": "/projects/chectl"
},
"type": "exec"
Expand Down
6 changes: 3 additions & 3 deletions test/api/replies/create-workspace-from-valid-workspaceconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
],
"name": "inner-loop-buildah",
"attributes": {
"editor": "org.eclipse.che.editor.theia:1.0.0",
"sidecar.theia-ide.memory_limit": "512Mi",
"plugins": "che-machine-exec-plugin:0.0.1"
"editor": "eclipse/che-theia/1.0.0",
"sidecar.eclipse/che-theia.memory_limit": "512Mi",
"plugins": "eclipse/che-machine-exec-plugin/0.0.1"
},
"commands": [
{
Expand Down
8 changes: 4 additions & 4 deletions test/api/requests/devfile.invalid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ projects:
type: git
location: 'git@github.com:che-incubator/chectl.git'
tools:
- name: theia-ide
- alias: theia-ide
type: cheEditor
id: org.eclipse.che.editor.theia:1.0.0
- name: exec-plugin
id: eclipse/che-theia/1.0.0
- alias: exec-plugin
type: chePlugin
id: che-machine-exec-plugin:0.0.1
id: eclipse/che-machine-exec-plugin/0.0.1
commands:
- name: build
actions:
Expand Down
8 changes: 4 additions & 4 deletions test/api/requests/devfile.valid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ projects:
type: git
location: 'git@github.com:che-incubator/chectl.git'
tools:
- name: theia-ide
- alias: theia-ide
type: cheEditor
id: org.eclipse.che.editor.theia:1.0.0
- name: exec-plugin
id: eclipse/che-theia/1.0.0
- alias: exec-plugin
type: chePlugin
id: che-machine-exec-plugin:0.0.1
id: eclipse/che-machine-exec-plugin/0.0.1
commands:
- name: build
actions:
Expand Down
6 changes: 3 additions & 3 deletions test/api/requests/workspaceconfig.valid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@
"defaultEnv": "default",
"name": "inner-loop-buildah",
"attributes": {
"editor": "org.eclipse.che.editor.theia:1.0.0",
"plugins": "che-machine-exec-plugin:0.0.1",
"sidecar.theia-ide.memory_limit": "512Mi"
"editor": "eclipse/che-theia/1.0.0",
"plugins": "eclipse/che-machine-exec-plugin/0.0.1",
"sidecar.eclipse/che-theia.memory_limit": "512Mi"
},
"links": []
}
4 changes: 2 additions & 2 deletions test/api/requests/workspaceconfig.valid2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
],
"name": "docker-hands-on",
"attributes": {
"editor": "org.eclipse.che.editor.theia:1.0.0",
"plugins": "che-machine-exec-plugin:0.0.1"
"editor": "eclipse/che-theia/1.0.0",
"plugins": "eclipse/che-machine-exec-plugin/0.0.1"
},
"commands": [],
"links": []
Expand Down