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

Sets CHE_WORKSPACE_ID and CHE_MACHINE_NAME in all machines started by Che #4649

Merged
merged 4 commits into from
Apr 3, 2017

Conversation

benoitf
Copy link
Contributor

@benoitf benoitf commented Mar 30, 2017

it is required for single port /reverse proxy strategy
linked PR : #4440

What does this PR do?

Sets CHE_WORKSPACE_ID and CHE_MACHINE_NAME env var in all machines started by Che

What issues does this PR fix or reference?

#4440
#4361

Changelog

Sets CHE_WORKSPACE_ID and CHE_MACHINE_NAME env variables in all machines started by Che

Release Notes

Sets CHE_WORKSPACE_ID and CHE_MACHINE_NAME env variables in all machines started by Che

Docs PR

N/A

Change-Id: Ib2cb987e594929151de4c26b614b91d788d19869
Signed-off-by: Florent BENOIT fbenoit@codenvy.com

…ough CHE

it is required for single port /reverse proxy strategy

Change-Id: Ib2cb987e594929151de4c26b614b91d788d19869
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
@benoitf benoitf added kind/enhancement A feature request - must adhere to the feature request template. status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. labels Mar 30, 2017
@benoitf benoitf added this to the 5.7.0 milestone Mar 30, 2017
@benoitf benoitf self-assigned this Mar 30, 2017
volumes = commonMachineSystemVolumes;
}
// register workspace ID and Machine Name
env.put(DockerInstanceRuntimeInfo.CHE_WORKSPACE_ID, workspaceId);

Choose a reason for hiding this comment

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

Looks like it is not covered by tests. Some tests check WORKSPACE_ID variable setting. Behavior has changed so, please, change tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah sure, I forgot to submit the test class

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@garagatyi is it ok ? when I commented I added the test class

Choose a reason for hiding this comment

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

Can you add shouldAddMachineNameEnvVariableOnNonDevInstanceCreationFromRecipe

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@garagatyi yes, added

…ted through CHE it is required for single port /reverse proxy strategy

Change-Id: Iccaf6508ac0421363e90eeb00d0a387ce74352ef
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
@codenvy-ci
Copy link

…ted through CHE it is required for single port /reverse proxy strategy

Change-Id: Ia7c93d3bddaaa721f2290739a8d0133e867e2565
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
@benoitf
Copy link
Contributor Author

benoitf commented Mar 31, 2017

@skabashnyuk ?

@codenvy-ci
Copy link

* Environment variable that will contain Name of the machine
*/
public static final String CHE_MACHINE_NAME = "CHE_MACHINE_NAME";

Copy link
Contributor

Choose a reason for hiding this comment

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

Review without grumble is not a review.
I complain about one extra line.

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

…ted through CHE it is required for single port /reverse proxy strategy

Change-Id: I48cfa63b9ef9c2cff015428838afcecae1f9fd1e
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
@codenvy-ci
Copy link

@benoitf benoitf merged commit 45da3d9 into master Apr 3, 2017
@benoitf benoitf removed the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Apr 3, 2017
@JamesDrummond JamesDrummond mentioned this pull request Apr 9, 2017
9 tasks
@benoitf benoitf deleted the env-variables-workspace branch May 24, 2017 09:03
JPinkney pushed a commit to JPinkney/che that referenced this pull request Aug 17, 2017
… Che (eclipse-che#4649)

* Set CHE_WORKSPACE_ID and CHE_MACHINE_NAME in all machines started through CHE
it is required for single port /reverse proxy strategy

Change-Id: Ib2cb987e594929151de4c26b614b91d788d19869
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement A feature request - must adhere to the feature request template.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants