Develop 3.0 -> 3.1 merge #6
Open
Conversation
This file contains 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
New solr version, updated lager.
Testing all dependcies no works. The riak-level eunit tests don't run as part of the test dependency run (as they fail due to dependancy issues - but pass as rebar3 eunit). Lager does not run eunit tests (lager fails on OTP22 on the latest release - and as an external dependancy we have to live with that for now). bahso_bench doesn't either (it has no eunit tests and is ony pulled in to handle problems with yokozuna testing). The make rel now copies the release into rel/riak as per Riak 2.9 - for consistency.
make test now passes (needs to be runt wice, as test-deps don't get picke dup on first run).
Develop 3.0 292
Make profile for debian. Issues exist when compared to 2.9 with permissions: To help with an expectation that configuration will be written to usr/lib/riak - a system of links is used instead - with the links configured through the riakpre script. Care needs to be taken with the merging of extended_start_script_hooks across profiles - this may not yield the expected results. Hence each profile has a dedicated configurtaion and a single profile is used for make rel-deb. The pid_dir is defined in multiple places (debian/vars.config, rebar.config, riak.riak.service). These need to align.
Want make package to work, but not at the expense of make rel and make devrel
Additional vars required due to rel vars.config not being merged in
Revert rebar3_cuttlefish - PR basho/rebar3_cuttlefish#2
Mas 3.0 debianmake
* Bring RPM build inline with DEB and include init script. * Changed rel target to build deps from rebar.lock - was previously calling rebar3 upgrade and ignoring lock. * Cleaned up some of the old packaging targets that are no longer used.
* script name is passed through from riak-admin to clique. It is currently set to the base script, which is now `riak`. We changed some calls so that they worked by suffixing the call with `-admin` to work around it. There was an issue with running `riak admin handoff *`, which slipped through the net. Looking at this again, seemed better to change the $SCRIPT var rather than suffix the call, just in case there's anything else that we haven't caught, it should account for it. * add pre start hooks to dev profile in rebar.config and fix make devrel to use dev rebar profile.
Hopefully then avoid issue with /usr/sbin not being in path on debina machines
Mas 3.0 riakrunpath
Change commented yokozuna branch, as this basho/yokozuna#767 is now merged into develop-3.0, and new updates are being PR'd into 3.0 (e.g. basho/yokozuna#768)
Update rebar.config
Add notes from lates releases, and update comment on build support
Merge release notes with 2.9
* rpm was installing bin to /usr/bin - changed to sbin.
…asho#1030) * stop copying init.d dir into /etc/riak - remove wildcard copy in rpm specfile. * don't need recursive copy either - cleanup.
* Wrong run path for pid - worked on centos 7, but not rhel 6. /var/run is symlinked -> /run/. /var/run is across all rhel based distros.
Update default erlang.log max log size
Updated rebar for release
develop-3.0 merge from upstream
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.