Merge branch 'stable-3.7' into stable-3.8 * stable-3.7: Download global-refdb from CI rather than from Maven Introduce function to refactor artifact download Download events-broker from CI rather than from Maven Cascade to pull-replication master branch if stable branch not found Cascade to healthcheck-master-branch if healthcheck-branch not found Change-Id: I2a1a5c317bfa322e171224acf0da40c93d7090aa
diff --git a/e2e-tests/test.sh b/e2e-tests/test.sh index b58b526..b103720 100755 --- a/e2e-tests/test.sh +++ b/e2e-tests/test.sh
@@ -16,11 +16,11 @@ LOCATION="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" LOCAL_ENV="$( cd "${LOCATION}/../setup_local_env" >/dev/null 2>&1 && pwd )" -GERRIT_BRANCH=stable-3.7 +GERRIT_BRANCH=stable-3.8 GERRIT_CI=https://gerrit-ci.gerritforge.com/view/Plugins-$GERRIT_BRANCH/job LAST_BUILD=lastSuccessfulBuild/artifact/bazel-bin/plugins DEF_MULTISITE_LOCATION=${LOCATION}/../../../bazel-bin/plugins/multi-site/multi-site.jar -DEF_GERRIT_IMAGE=3.7.4 +DEF_GERRIT_IMAGE=3.8.1 DEF_GERRIT_HEALTHCHECK_START_PERIOD=60s DEF_GERRIT_HEALTHCHECK_INTERVAL=5s DEF_GERRIT_HEALTHCHECK_TIMEOUT=5s
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl index df9123f..7d855cf 100644 --- a/external_plugin_deps.bzl +++ b/external_plugin_deps.bzl
@@ -3,6 +3,6 @@ def external_plugin_deps(): maven_jar( name = "global-refdb", - artifact = "com.gerritforge:global-refdb:3.7.2.1", - sha1 = "be8177669a281f8d14e9e3b3231ee86a806710d3", + artifact = "com.gerritforge:global-refdb:3.8.0-rc5", + sha1 = "3f54f99e4ddf454c119e8ac3183bba7e9d7c7897", )
diff --git a/setup_local_env/setup.sh b/setup_local_env/setup.sh index 4290af5..32880a2 100755 --- a/setup_local_env/setup.sh +++ b/setup_local_env/setup.sh
@@ -16,7 +16,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -GERRIT_BRANCH=stable-3.7 +GERRIT_BRANCH=stable-3.8 GERRIT_CI=https://gerrit-ci.gerritforge.com/view/Plugins-$GERRIT_BRANCH/job LAST_BUILD=lastSuccessfulBuild/artifact/bazel-bin/plugins
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/ProjectVersionRefUpdateImpl.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/ProjectVersionRefUpdateImpl.java index 64048ab..03271aa 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/ProjectVersionRefUpdateImpl.java +++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/validation/ProjectVersionRefUpdateImpl.java
@@ -14,6 +14,7 @@ package com.googlesource.gerrit.plugins.multisite.validation; +import static com.google.gerrit.server.update.context.RefUpdateContext.RefUpdateType.PLUGIN; import static java.nio.charset.StandardCharsets.UTF_8; import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; @@ -30,6 +31,7 @@ import com.google.gerrit.server.events.RefUpdatedEvent; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.GitRepositoryManager; +import com.google.gerrit.server.update.context.RefUpdateContext; import com.google.inject.Inject; import com.googlesource.gerrit.plugins.multisite.ProjectVersionLogger; import java.io.IOException; @@ -279,7 +281,8 @@ logger.atFine().log( "Updating local version for project %s with version %d", projectNameKey.get(), newVersionNumber); - try (Repository repository = gitRepositoryManager.openRepository(projectNameKey)) { + try (RefUpdateContext ctx = RefUpdateContext.open(PLUGIN); + Repository repository = gitRepositoryManager.openRepository(projectNameKey)) { RefUpdate refUpdate = getProjectVersionRefUpdate(repository, newVersionNumber); RefUpdate.Result result = refUpdate.update(); if (!isSuccessful(result)) {