Flatten/Merge VTTOP and VTROOT variables#5527
Merged
morgo merged 6 commits intovitessio:masterfrom Dec 10, 2019
Merged
Conversation
Disable prepared_statement test Add a check to examples to make sure etcd is not running Signed-off-by: Morgan Tocker <tocker@gmail.com>
Signed-off-by: Morgan Tocker <tocker@gmail.com>
This was referenced Dec 7, 2019
morgo
changed the title
Signed-off-by: Morgan Tocker <tocker@gmail.com>
Signed-off-by: Morgan Tocker <tocker@gmail.com>
Signed-off-by: Morgan Tocker <tocker@gmail.com>
Signed-off-by: Morgan Tocker <tocker@gmail.com>
Member
|
This doesn't appear to impact any of the |
derekperkins
approved these changes
Dec 9, 2019
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #5378 + includes a workaround for #5533
The motivation for this patch is that it allows one to checkout the source code, and run
make buildand thenmake testwith no configuration required.VTROOTis unfortunately still required for runtime, since configuration files and webfiles need to be located. We can fix this in #5502The Dockerfiles use the historical layout still, with a symlink from the new 'bin' location back to
/vt/bin.The Docker test runner has been modified so that it will work without waiting for new docker images to be published. After this PR merges and we push new images, there is code in
docker/test/run.shwhich can be removed.Note: This also disables the prepared statement test. See: #5524
Backwards Compatibility
This PR is intended to be mostly backwards compatible, however users will need to update their environment variables to point
$VTROOTto the correct location (what wasVTTOP).This is not a problem in build or test, since build.env always overwrites
$VTROOTand sets it to$PWD. But it is a problem in the examples/ since there are scripts which will attempt to include$VTROOT/web/vtctld. My hope is that we can fix this in #5502 before release, so that$VTROOTis not a run-time requirement at all.Documentation
The changes to the build guides will be documented in vitessio/website#372