Merge branch 'stable-3.9' into stable-3.10
* stable-3.9:
Add sentinel to prevent out of sync with global-refdb
Verify global-refdb formatting using GJF 1.7
Change-Id: I942d7fe24453a9fb1308a9952ecbd13da71517eb
diff --git a/Jenkinsfile b/Jenkinsfile
index 1b1137b..3217274 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
-pluginPipeline(formatCheckId: 'gerritforge:global-refdb-format-59a34d6c50367a468c810e28d733855abc059f13',
+ pluginPipeline(formatCheckId: 'gerritforge:global-refdb-format-59a34d6c50367a468c810e28d733855abc059f13',
buildCheckId: 'gerritforge:global-refdb-59a34d6c50367a468c810e28d733855abc059f13')
diff --git a/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/RefUpdateValidatorTest.java b/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/RefUpdateValidatorTest.java
index 2e5f4ff..435db8f 100644
--- a/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/RefUpdateValidatorTest.java
+++ b/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/RefUpdateValidatorTest.java
@@ -242,7 +242,6 @@
.when(sharedRefDb)
.isUpToDate(any(Project.NameKey.class), any(Ref.class));
doReturn(true).when(sharedRefDb).isUpToDate(A_TEST_PROJECT_NAME_KEY, localRef);
-
when(sharedRefDb.compareAndPut(any(Project.NameKey.class), any(Ref.class), any(ObjectId.class)))
.thenThrow(GlobalRefDbSystemError.class);
when(rollbackFunction.invoke(any())).thenReturn(Result.LOCK_FAILURE);
