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.

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

CODENVY-1829 Add ability to use ws-agent from main assembly #1835

Merged
merged 2 commits into from
Feb 27, 2017

Conversation

mkuznyetsov
Copy link
Contributor

@mkuznyetsov mkuznyetsov commented Feb 24, 2017

What does this PR do?

If Codenvy has been started with /assembly mount, it may contain ws-agent in assembly main (by default location lib/ws-agent.tar.gz). If CLI detects one, it will use this ws-agent.

What issues does this PR fix or reference?

#1829

Changelog

The CLI can now use the ws-agent from a mounted assembly.

Release Notes

n/a

Docs PR

n/a

@@ -73,6 +73,11 @@ generate_configuration_with_puppet() {
WRITE_PARAMETERS=" -e \"PATH_TO_CHE_ASSEMBLY=${CHE_ASSEMBLY}\""
fi

if [[ local_assembly && -f $(echo ${CHE_CONTAINER_ASSEMBLY_FULL_PATH}/lib/${WS_AGENT_ASSEMBLY}) ]]; then
info "Using ws-agent from main assembly"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

info "config" "Using ws-agent from assembly"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@skabashnyuk
Copy link
Contributor

@codenvy/pm please approve

@bmicklea bmicklea requested review from bmicklea and removed request for JamesDrummond February 24, 2017 14:24
@bmicklea
Copy link
Contributor

Will this need to be part of documentation for doing custom assemblies?

@mkuznyetsov
Copy link
Contributor Author

don't think so, it is our internal mechanism for testing these custom assemblies

@skabashnyuk skabashnyuk added this to the 5.4.0 milestone Feb 27, 2017
@mkuznyetsov mkuznyetsov merged commit 316fe42 into master Feb 27, 2017
@mkuznyetsov mkuznyetsov deleted the codenvy-1829 branch February 27, 2017 08:07
@JamesDrummond JamesDrummond mentioned this pull request Mar 8, 2017
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants