Use main branch of Elasticsearch for source builds#1532
Use main branch of Elasticsearch for source builds#1532pquentin merged 3 commits intoelastic:masterfrom
Conversation
pquentin
added
enhancement
dliappis
left a comment
dliappis
left a comment
There was a problem hiding this comment.
Left a question.
Side question: I've noticed the following unit test warning, I don't remember spotting it before, but it must be unrelated to this PR:
tests/driver/runner_test.py: 31 warnings
/home/dl/source/elastic/rally/.venv/lib/python3.8/site-packages/ijson/compat.py:48: DeprecationWarning:
ijson works by reading bytes, but a string reader has been given instead. This
probably, but not necessarily, means a file-like object has been opened in text
mode ('t') rather than binary mode ('b').
An automatic conversion is being performed on the fly to continue, but on the
other hand this creates unnecessary encoding/decoding operations that decrease
the efficiency of the system. In the future this automatic conversion will be
removed, and users will receive errors instead of this warning. To avoid this
problem make sure file-like objects are opened in binary mode instead of text
mode.
warnings.warn(_str_vs_bytes_warning, DeprecationWarning)
-- Docs: https://docs.pytest.org/en/stable/warnings.html
happy to raise an issue for it.
| # optional (but then source code is assumed to be available locally) | ||
| plugin_remote_url = self.src_config.get("plugin.%s.remote.repo.url" % self.plugin.name) | ||
| return SourceRepository(self.plugin.name, plugin_remote_url, self.plugin_src_dir).fetch(self.revision) | ||
| return SourceRepository(self.plugin.name, plugin_remote_url, self.plugin_src_dir, branch="master").fetch(self.revision) |
There was a problem hiding this comment.
While reading this it occurred to me that probably we want to document the general change from master -> main for Elasticsearch in the migration docs and probably clarify that master remains for plugins?
|
I've always seen the ijson warning locally, I don't know why it's not occurring in CI. An issue would be nice, thanks. And yes I will update the migration docs in addition to the changelog, thanks. |
|
See here for my attempted migration wording: https://esrally--1532.org.readthedocs.build/en/1532/migrate.html#migrating-to-rally-2-5-1 |
Looks good. We could even include the ES link: elastic/elasticsearch#76950 |
2 participants
Closes #1528
I did not need explicit code to migrate
~/.rally/benchmarks/src/elasticsearch/to the main branch since the first thing we do is callgit.pull("origin", "main")which runsgit fetch origin && git checkout main && git rebase origin/main.