From 78f5bf3b85bbfb1754f7ceb55892639c77546c17 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 25 Aug 2019 16:12:02 +0200 Subject: [PATCH 1/2] Add .gitreview file For folks used to using the git-review tool for interacting with gerrit servers, it's necessary to have a .gitreview file in the repo in question pointing to where the gerrit is. Add one, pointing at gerrit-review.googlesource.com and listing that https should be used. This will still require that someone add their http authentication to the .gitcookies file, but otherwise should work as expected. Set defaultbranch to stable-2.15 so that patches will be submitted to refs/for/stable-2.15. Bug: Issue 9450 Change-Id: Iace9ed4f94441d2fd5cbb1f95eb69f135981836f --- .gitreview | 5 +++++ Documentation/dev-contributing.txt | 5 +++++ Documentation/dev-release.txt | 3 +++ 3 files changed, 13 insertions(+) create mode 100644 .gitreview diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000000..934440189d --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit-review.googlesource.com +scheme=https +project=gerrit.git +defaultbranch=stable-2.15 diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt index 8684d2d71f..a820fc8e1d 100644 --- a/Documentation/dev-contributing.txt +++ b/Documentation/dev-contributing.txt @@ -144,6 +144,11 @@ by clicking the 'Obtain Password' link on the link:https://gerrit-review.googlesource.com/#/settings/http-password[HTTP Password tab of the user settings page]. +Alternately, you may use the +link:https://pypi.org/project/git-review/[git-review] tool to submit changes +to Gerrit. If you do, it will set up the Change-Id hook and `gerrit` remote +for you. You will still need to do the HTTP access step. + [[style]] === Style diff --git a/Documentation/dev-release.txt b/Documentation/dev-release.txt index 41013493ea..522371943f 100644 --- a/Documentation/dev-release.txt +++ b/Documentation/dev-release.txt @@ -261,6 +261,9 @@ gerrit-releases bucket in the Google cloud storage console] link:https://gerrit-review.googlesource.com/admin/repos/gerrit,branches[ Gerrit Web UI] or by push. +* Create a change updating the `defaultbranch` field in the `.gitreview` +to match the branch name created. + * Push the commits done on `stable-2.5` to `refs/for/stable-2.5` and get them merged From 8e8bd2b6693e5455bfd4ee4c702cab516b2b8b8d Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 26 Aug 2019 08:15:06 +0900 Subject: [PATCH 2/2] Upgrade elasticsearch-rest-client to 7.3.1 Also update the test container to use this version for V7_3 tests. Change-Id: I2b1913f355101c10649477222beed84fccbc3961 --- WORKSPACE | 4 ++-- .../com/google/gerrit/elasticsearch/ElasticContainer.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 43b0f3aa4b..26e5909621 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -925,8 +925,8 @@ maven_jar( # and httpasyncclient as necessary. maven_jar( name = "elasticsearch-rest-client", - artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.3.0", - sha1 = "3cdc211c8efb72c202107b40dee356f4f2f0f9bd", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.3.1", + sha1 = "f5793c89b50a159cbb3e15e17bb981ff854cbe51", ) maven_jar( diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java index 9c0079693b..7739125d54 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -59,7 +59,7 @@ public class ElasticContainer extends ElasticsearchContainer { case V7_2: return "blacktop/elasticsearch:7.2.1"; case V7_3: - return "blacktop/elasticsearch:7.3.0"; + return "blacktop/elasticsearch:7.3.1"; } throw new IllegalStateException("No tests for version: " + version.name()); }