Skip to content
This repository has been archived by the owner on Mar 17, 2021. It is now read-only.

Merge openshift-connector stacks.json with the one that is on master #114

Merged

Conversation

davidfestal
Copy link
Collaborator

This fixes CHE-269

Signed-off-by: David Festal dfestal@redhat.com

@davidfestal davidfestal self-assigned this Jun 21, 2017
@davidfestal
Copy link
Collaborator Author

I merged the master and openshift-connector branch (while making the required changes: removing the exec and ssh agents mainly), and add the content of the file to the new stacks.json on rh-che.

But I assume some still won't work correctly (such as the android stack I tested) since they eclipse docker requires a user with sudo rights.

@l0rd should we remove all the stacks that aren't supported in openshift.io (=> all the stacks that involve an eclipse/xxx docker image I assume) ?

@l0rd
Copy link
Contributor

l0rd commented Jun 21, 2017

@davidfestal https://issues.jboss.org/browse/CHE-269 was more about fixing stacks.json in eclipse/che (and if necessary in redhat-developer/rh-che too):

Currently file stacks.json on branch openshift-connector-rebased is identical (or pretty close) to master. But in openshift-connector branch stacks.json there are some differences that still need to be merged to the rebased branch. For example the stack "CentOS nodejs" only exist in openshift-connector and should be ported to openshift-connector-rebased.

@l0rd
Copy link
Contributor

l0rd commented Jun 21, 2017

And yes stacks.json in rh-che should have:

  • only supported stacks (java-centos, vertx, spring boot, nodejs-centos, wildfly, java-myslq-centos)
  • the addition of the bayesian agent for every stack
  • the removal of ssh agent for every stack

@davidfestal
Copy link
Collaborator Author

let me remove the additional non-rhche stacks and this should be OK then. right @l0rd ?

@davidfestal
Copy link
Collaborator Author

@l0rd

But in openshift-connector branch stacks.json there are some differences (apart from rhche and agents) that still need to be merged to the rebased branch. For example the stack "CentOS nodejs" only exist in openshift-connector and should be ported to openshift-connector-rebased.

I reviewed the differences, and no significant difference exists now between the openshift-connector new RH-supported stacks in rh-che in the corresponding stacks in master (commit eclipse-che/che@c8a8381, just before PR eclipse-che/che#5234). The reason is that some of our last changes in stacks were made as PR against master. And none is missing since @dharmit recently added the Centos NodeJs stack to master also.

@davidfestal
Copy link
Collaborator Author

@l0rd, @gorkem is it OK for you also ?

@davidfestal davidfestal force-pushed the JBOSS-CHE-269 branch 2 times, most recently from abf038c to 7ada082 Compare June 23, 2017 12:13
This fixes CHE-269

Signed-off-by: David Festal <dfestal@redhat.com>
@sunix sunix merged commit 8813313 into redhat-developer:openshift-connector-rebased Jun 28, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants