From a008f3eb038b389732e0332e74665c07a852af87 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Wed, 21 Oct 2020 10:19:40 -0600 Subject: Update git submodules * Update plugins/replication from branch 'stable-2.16' to 64617a846c9fa06215031b2ad34a30d58003a732 - ReplicationQueue: Remove unused method And drop the misleading @VisibleForTesting annotation from the method the removed method was wrapping. scheduleFullSync() is public so that PushAll can call it. Change-Id: I0139e653654fcaf20de68dddfb5ea85560a323d0 --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index 84d96eb953..64617a846c 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 84d96eb953d51c97b2093d06597bc69812b812e7 +Subproject commit 64617a846c9fa06215031b2ad34a30d58003a732 -- cgit v1.2.3 From 586d6e330825fbaa03c61eeca356d75d2fdc8c93 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Fri, 23 Oct 2020 00:32:48 +0100 Subject: Fetch JGit JavaDoc from archive.eclipse.org Change-Id: I363ad0df632fdb25236b3d0a0c06fb15dbf8acf2 --- lib/jgit/jgit.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jgit/jgit.bzl b/lib/jgit/jgit.bzl index ed82c56269..997879edf1 100644 --- a/lib/jgit/jgit.bzl +++ b/lib/jgit/jgit.bzl @@ -4,7 +4,7 @@ _JGIT_VERS = "5.1.13.202002110435-r" _DOC_VERS = _JGIT_VERS # Set to _JGIT_VERS unless using a snapshot -JGIT_DOC_URL = "https://download.eclipse.org/jgit/site/" + _DOC_VERS + "/apidocs" +JGIT_DOC_URL = "https://archive.eclipse.org/jgit/site/" + _DOC_VERS + "/apidocs" _JGIT_REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL. -- cgit v1.2.3 From 54ce3d384d3553af286d63120f1b98bfdb838f65 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Fri, 23 Oct 2020 00:52:21 +0100 Subject: Remove generation for c.g.gwtexpui.* JavaDoc The JavaDoc for com.google.gwtexpui.* cannot be generated because the source files are not accessible anymore. Failing to generate the JavaDocs caused the Gerrit build to fail with 'No source files for package com.google.gwtexpui...'. Change-Id: Ie36e650962636813d8f9f615e495a980b7280420 --- gerrit-plugin-gwtui/BUILD | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gerrit-plugin-gwtui/BUILD b/gerrit-plugin-gwtui/BUILD index d9281c88f2..366cf82bce 100644 --- a/gerrit-plugin-gwtui/BUILD +++ b/gerrit-plugin-gwtui/BUILD @@ -78,10 +78,6 @@ java_doc( ], pkgs = [ "com.google.gerrit.plugin", - "com.google.gwtexpui.clippy", - "com.google.gwtexpui.globalkey", - "com.google.gwtexpui.safehtml", - "com.google.gwtexpui.user", ], title = "Gerrit Review GWT Extension API Documentation", ) -- cgit v1.2.3 From 9fb356b2e3404e249133f2345d6603ea2ff8f023 Mon Sep 17 00:00:00 2001 From: Dmitrii Filippov Date: Tue, 21 Apr 2020 14:36:41 +0200 Subject: Fix tests for stable-2.16 branch Add the 'manual' tag to wct test_suite templates, so it is excluded from bazel test //... Change-Id: I73fdddc9c08eeaacff9401ea9531c95e6a782ced (cherry picked from commit ae42cd00bdfa8a34e75c563b62f0151a561cc82b) --- polygerrit-ui/app/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD index 17c45a4881..3a3c586970 100644 --- a/polygerrit-ui/app/BUILD +++ b/polygerrit-ui/app/BUILD @@ -133,6 +133,7 @@ DIRECTORIES = [ tags = [ # Should not run sandboxed. "local", + "manual", "template", ], ) for directory in DIRECTORIES] -- cgit v1.2.3 From 76228a139972144390ea54a727b76cc72b8d7c73 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Mon, 26 Oct 2020 21:25:36 -0600 Subject: Update git submodules * Update plugins/replication from branch 'stable-2.16' to 4cb59f096b84f4369f62c8645db326c61826be79 - Refactor Replication*IT tests to share a base class These classes have very similar setups and duplicate helper methods. Improve maintainability by reducing the duplication. ReplicationQueueIT is not modified because it is merged into ReplicationIT on stable-3.0. Change-Id: Ibc22ae4d0db2d09009f65c0e745f1095c67827ba - ReplicationIT: Add shouldMatch* e2e tests These new tests utilize creating a branch in a way that does not trigger replication so that scheduleFullSync() is responsible for replicating the update. In this way, the tests verify the destination receives the update because scheduleFullSync() matched the given URI. Change-Id: I4ae15d0301a308a12cbca3684915e89ca421e02f - ReplicationStorageIT: Move shouldMatch* tests from ReplicationIT These tests are focused on verifying storage, so they belong in ReplicationStorageIT. Improve these tests to better verify storage correctness by switching the 'now' parameter to false such that replicationDelay is honored and follow the ReplicationStorageIT pattern using a very long delay. These improvements make these tests much more stable. The tests improve the ref matching slightly by comparing to the PushOne.ALL_REFS constant. Also removes the disableDeleteForTesting flag as there are no users of it now. A later change can add ReplicationIT e2e tests for these use cases. Change-Id: Iaa14a7429a40fb62325259efa1c7d7637deef95a - ReplicationStorageIT: Add shouldFire*ChangeRefs tests Copy the shouldFire*IncompleteUri tests as shouldFire*ChangeRefs to fill a gap in test coverage. Change-Id: Ia8df64a8574b776e6a9f7201c0862f1e6794687e - Move storage-based ITs into ReplicationStorageIT Tests in ReplicationStorageIT utilize very long replication delays such that tasks are never expected to complete during the test. This allows test writers to assume the task files are still there. Refactor tests from ReplicationIT into ReplicationStorageIT and focus them on verifying storage correctness. This is mostly a direct copy except that shouldFirePendingOnlyToStoredUri gets renamed and split into two tests. One that validates tasks are fired and another that validates replication completes to the expected destinations. This split is necessary because of the very long delay methodology mentioned above. Code sharing between ReplicationIT and ReplicationStorageIT will be improved in a later commit. Change-Id: I41179c20a10354953cff3628368dfd5f910cc940 --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index 64617a846c..4cb59f096b 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 64617a846c9fa06215031b2ad34a30d58003a732 +Subproject commit 4cb59f096b84f4369f62c8645db326c61826be79 -- cgit v1.2.3 From 874871da813c588acad41df415ac571db438a67c Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Mon, 19 Oct 2020 13:32:51 -0400 Subject: Documentation: Update dev-release's rc information Change-Id: I674cec44628c24002942a9f446bc13f3668fb1be --- Documentation/dev-release.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Documentation/dev-release.txt b/Documentation/dev-release.txt index 8a7bf79aea..c10457d84e 100644 --- a/Documentation/dev-release.txt +++ b/Documentation/dev-release.txt @@ -26,14 +26,19 @@ need to undergo some stabilization before releasing the final release. * Propose the release with any plans/objectives to the mailing list. +* Release plans usually become a + link:https://www.gerritcodereview.com/news.html[news article] + to be followed up with. + * Create a Gerrit `rc0`. -* If needed create a Gerrit `rc1`. +* If needed create Gerrit `rc1`, `rc2` and `rc3` (one per week, on Mondays + or so; see link:https://www.gerritcodereview.com/news.html[past release plans]). [NOTE] -You may let in a few features to this release. +You may let in a few features to these releases. -* If needed create a Gerrit `rc2`. +* If needed create a Gerrit `rc4`. [NOTE] There should be no new features in this release, only bug fixes. -- cgit v1.2.3 From 4960c9ce28bb3f84c48bedf6bddf28ab14f97033 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 20 Oct 2020 22:41:38 +0300 Subject: Bump Bazel version to 3.7.0 https://github.com/bazelbuild/bazel/releases/tag/3.7.0 Change-Id: I4ed5a44a16f57bc6d1a038fa419d20563b3d6fe8 --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelversion b/.bazelversion index d5c0c99142..7c69a55dbb 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -3.5.1 +3.7.0 -- cgit v1.2.3 From 3cb0544c317b690d087d46a91e5bed0925a65842 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Tue, 27 Oct 2020 20:28:01 -0600 Subject: Update git submodules * Update plugins/replication from branch 'stable-3.0' to 8650a78b2682c90247435cfd807f0d0bacc84f9c - Move storage portion of replicateBranchDeletion ITs All other ITs split e2e and storage tests on stable-2.16, so this change only updates the new replicateBranchDeletion tests that were added in stable-3.0. The e2e check for if the destination branch is removed or not stays in ReplicationIT and the check that a task is created in storage when the branch delete API is invoked moves to ReplicationStorageIT. This split allows the best practices for verifying e2e and storage to be applied independently. Change-Id: Iec7ee090bd614e3442b1f9cb454437c9e05290be - Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Refactor Replication*IT tests to share a base class ReplicationIT: Add shouldMatch* e2e tests ReplicationStorageIT: Move shouldMatch* tests from ReplicationIT ReplicationStorageIT: Add shouldFire*ChangeRefs tests Move storage-based ITs into ReplicationStorageIT ReplicationQueue: Remove unused method This change does not try to reimpose the breakdown of tests that was done in 2.16. That will be done in follow up change(s) to improve reviewability of this change. Change-Id: I83202997610c5ad0d8849cb477ca36db8df760f5 - Refactor Replication*IT tests to share a base class These classes have very similar setups and duplicate helper methods. Improve maintainability by reducing the duplication. ReplicationQueueIT is not modified because it is merged into ReplicationIT on stable-3.0. Change-Id: Ibc22ae4d0db2d09009f65c0e745f1095c67827ba - ReplicationIT: Add shouldMatch* e2e tests These new tests utilize creating a branch in a way that does not trigger replication so that scheduleFullSync() is responsible for replicating the update. In this way, the tests verify the destination receives the update because scheduleFullSync() matched the given URI. Change-Id: I4ae15d0301a308a12cbca3684915e89ca421e02f - ReplicationStorageIT: Move shouldMatch* tests from ReplicationIT These tests are focused on verifying storage, so they belong in ReplicationStorageIT. Improve these tests to better verify storage correctness by switching the 'now' parameter to false such that replicationDelay is honored and follow the ReplicationStorageIT pattern using a very long delay. These improvements make these tests much more stable. The tests improve the ref matching slightly by comparing to the PushOne.ALL_REFS constant. Also removes the disableDeleteForTesting flag as there are no users of it now. A later change can add ReplicationIT e2e tests for these use cases. Change-Id: Iaa14a7429a40fb62325259efa1c7d7637deef95a - ReplicationStorageIT: Add shouldFire*ChangeRefs tests Copy the shouldFire*IncompleteUri tests as shouldFire*ChangeRefs to fill a gap in test coverage. Change-Id: Ia8df64a8574b776e6a9f7201c0862f1e6794687e - Move storage-based ITs into ReplicationStorageIT Tests in ReplicationStorageIT utilize very long replication delays such that tasks are never expected to complete during the test. This allows test writers to assume the task files are still there. Refactor tests from ReplicationIT into ReplicationStorageIT and focus them on verifying storage correctness. This is mostly a direct copy except that shouldFirePendingOnlyToStoredUri gets renamed and split into two tests. One that validates tasks are fired and another that validates replication completes to the expected destinations. This split is necessary because of the very long delay methodology mentioned above. Code sharing between ReplicationIT and ReplicationStorageIT will be improved in a later commit. Change-Id: I41179c20a10354953cff3628368dfd5f910cc940 - ReplicationQueue: Remove unused method And drop the misleading @VisibleForTesting annotation from the method the removed method was wrapping. scheduleFullSync() is public so that PushAll can call it. Change-Id: I0139e653654fcaf20de68dddfb5ea85560a323d0 --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index 5b1ae38e61..8650a78b26 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 5b1ae38e61ce31b18fc13e0783977b1421bd0c6a +Subproject commit 8650a78b2682c90247435cfd807f0d0bacc84f9c -- cgit v1.2.3 From d8712a9e9ec260663cb517b8c78ec2523430eaf4 Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Wed, 28 Oct 2020 19:23:20 +0000 Subject: Update git submodules * Update plugins/replication from branch 'stable-2.16' to 53e083fd0f17d1403b4d150e66655907c1ea139d - Merge "ReplicationTasksStorage: Add multi-primary unit tests" into stable-2.16 - ReplicationTasksStorage: Add multi-primary unit tests These tests examine the replication scenarios under multi-primary setup making use of the api calls present in ReplicationTasksStorage class similarly as done in single primary setup. These tests ensure that the replication compatibility in multi-primary setup is not broken. Change-Id: I375b731829f3c0640d3a7a98635e1e5c526908ca --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index 4cb59f096b..53e083fd0f 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 4cb59f096b84f4369f62c8645db326c61826be79 +Subproject commit 53e083fd0f17d1403b4d150e66655907c1ea139d -- cgit v1.2.3 From eea0403e36de16fc5eb57cd30dbe274630114353 Mon Sep 17 00:00:00 2001 From: Adithya Chakilam Date: Wed, 28 Oct 2020 20:04:04 +0000 Subject: Update git submodules * Update plugins/replication from branch 'stable-3.1' to 61321228045db5c612f321896c9bd07569c44820 - Merge "ReplicationTasksStorage: Add multi-primary unit tests" into stable-3.1 - ReplicationTasksStorage: Add multi-primary unit tests These tests examine the replication scenarios under multi-primary setup making use of the api calls present in ReplicationTasksStorage class similarly as done in single primary setup. These tests ensure that the replication compatability in multi-primary setup is not broken. Change-Id: Ib2d0017c4d2ac3f4cfc7262b68b09a3a357e1337 --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index ea2e737a54..6132122804 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit ea2e737a549d72e88d6a6f4d7eb8efe5bf62536c +Subproject commit 61321228045db5c612f321896c9bd07569c44820 -- cgit v1.2.3 From 911fc801c90250d973df3042ba446d8c50ccd6f1 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Wed, 28 Oct 2020 20:34:31 +0000 Subject: Update git submodules * Update plugins/replication from branch 'stable-3.1' to 2be86dab82510bcda4740b9a003e9f64ad43033b - Merge changes I0ef708ab,I81d27fd4 into stable-3.1 * changes: Move shouldCleanupTasksAfterNewProjectReplication test Merge branch 'stable-3.0' into stable-3.1 - Move shouldCleanupTasksAfterNewProjectReplication test This test is focused on the storage level, so move it to ReplicationStorageIT. Slightly improve it to use the new best practices for specifying test timeouts. Change-Id: I0ef708ab7813ee09d6f115d3151d2d12b9984a80 - Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Move storage portion of replicateBranchDeletion ITs Refactor Replication*IT tests to share a base class ReplicationIT: Add shouldMatch* e2e tests ReplicationStorageIT: Move shouldMatch* tests from ReplicationIT ReplicationStorageIT: Add shouldFire*ChangeRefs tests Move storage-based ITs into ReplicationStorageIT ReplicationQueue: Remove unused method This change does not try to reimpose the breakdown of tests that was done in 3.0. That will be done in follow up change(s) to improve reviewability of this change. Change-Id: I81d27fd47da8eecad3aca36d8e6400679fb564a3 - Move storage portion of replicateBranchDeletion ITs All other ITs split e2e and storage tests on stable-2.16, so this change only updates the new replicateBranchDeletion tests that were added in stable-3.0. The e2e check for if the destination branch is removed or not stays in ReplicationIT and the check that a task is created in storage when the branch delete API is invoked moves to ReplicationStorageIT. This split allows the best practices for verifying e2e and storage to be applied independently. Change-Id: Iec7ee090bd614e3442b1f9cb454437c9e05290be - Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Refactor Replication*IT tests to share a base class ReplicationIT: Add shouldMatch* e2e tests ReplicationStorageIT: Move shouldMatch* tests from ReplicationIT ReplicationStorageIT: Add shouldFire*ChangeRefs tests Move storage-based ITs into ReplicationStorageIT ReplicationQueue: Remove unused method This change does not try to reimpose the breakdown of tests that was done in 2.16. That will be done in follow up change(s) to improve reviewability of this change. Change-Id: I83202997610c5ad0d8849cb477ca36db8df760f5 - Refactor Replication*IT tests to share a base class These classes have very similar setups and duplicate helper methods. Improve maintainability by reducing the duplication. ReplicationQueueIT is not modified because it is merged into ReplicationIT on stable-3.0. Change-Id: Ibc22ae4d0db2d09009f65c0e745f1095c67827ba - ReplicationIT: Add shouldMatch* e2e tests These new tests utilize creating a branch in a way that does not trigger replication so that scheduleFullSync() is responsible for replicating the update. In this way, the tests verify the destination receives the update because scheduleFullSync() matched the given URI. Change-Id: I4ae15d0301a308a12cbca3684915e89ca421e02f - ReplicationStorageIT: Move shouldMatch* tests from ReplicationIT These tests are focused on verifying storage, so they belong in ReplicationStorageIT. Improve these tests to better verify storage correctness by switching the 'now' parameter to false such that replicationDelay is honored and follow the ReplicationStorageIT pattern using a very long delay. These improvements make these tests much more stable. The tests improve the ref matching slightly by comparing to the PushOne.ALL_REFS constant. Also removes the disableDeleteForTesting flag as there are no users of it now. A later change can add ReplicationIT e2e tests for these use cases. Change-Id: Iaa14a7429a40fb62325259efa1c7d7637deef95a - ReplicationStorageIT: Add shouldFire*ChangeRefs tests Copy the shouldFire*IncompleteUri tests as shouldFire*ChangeRefs to fill a gap in test coverage. Change-Id: Ia8df64a8574b776e6a9f7201c0862f1e6794687e - Move storage-based ITs into ReplicationStorageIT Tests in ReplicationStorageIT utilize very long replication delays such that tasks are never expected to complete during the test. This allows test writers to assume the task files are still there. Refactor tests from ReplicationIT into ReplicationStorageIT and focus them on verifying storage correctness. This is mostly a direct copy except that shouldFirePendingOnlyToStoredUri gets renamed and split into two tests. One that validates tasks are fired and another that validates replication completes to the expected destinations. This split is necessary because of the very long delay methodology mentioned above. Code sharing between ReplicationIT and ReplicationStorageIT will be improved in a later commit. Change-Id: I41179c20a10354953cff3628368dfd5f910cc940 - ReplicationQueue: Remove unused method And drop the misleading @VisibleForTesting annotation from the method the removed method was wrapping. scheduleFullSync() is public so that PushAll can call it. Change-Id: I0139e653654fcaf20de68dddfb5ea85560a323d0 --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index 6132122804..2be86dab82 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 61321228045db5c612f321896c9bd07569c44820 +Subproject commit 2be86dab82510bcda4740b9a003e9f64ad43033b -- cgit v1.2.3