commit 6b5d63bad9598fd375fcee7f60c38d9e268bfdad
author Luca Milanesio <luca.milanesio@gmail.com> Wed Apr 13 10:45:15 2022 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> Wed Apr 13 10:45:15 2022 +0100
tree 6c0986a152b2c7b80bda24b09e0702702265843a
parent a7ed8181feeed16a9e359bc88f0941a52187ee6e
parent b57110a9846e85e3dc1608036d07b0315918985c

Merge branch 'stable-3.5'

* stable-3.5:
  Define BRANCH to DRY out stable branch build downloads
  Remove database and reviewdb from gerrit.config
  Set Gerrit to 3.4.4
  Set Gerrit to 3.3.10
  Set Gerrit to 3.4.3
  Set Gerrit to 3.3.9
  Set Gerrit to 3.4.2
  Set Gerrit to 3.3.8
  Set Gerrit to 3.3.7
  Set Gerrit to 3.3.6
  Set Gerrit to 3.3.5
  Set Gerrit to 3.3.4

Change-Id: I4e3ff7dc0c283235b78189536bf39612d336b499

fpm/Makefile

diff --git a/fpm/Makefile b/fpm/Makefile
index d17a461..962087e 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,5 +1,6 @@
 VERSION=3.5.1
 WAR_VERSION=3.5.1
+BRANCH=stable-3.5
 URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(WAR_VERSION).war
 CI_URL=https://gerrit-ci.gerritforge.com
 RELEASE=1
@@ -22,10 +23,10 @@
 WAR=$(BUILD_ROOT)/bin/gerrit.war
 PLUGINS_CI=https://gerrit-ci.gerritforge.com/job
 LIBS_JOBS= \
-  plugin-out-of-the-box-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
+  plugin-out-of-the-box-bazel-master-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
 PLUGINS_JOBS= \
-  plugin-avatars-gravatar-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
-  plugin-uploadvalidator-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
+  plugin-avatars-gravatar-bazel-master-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
+  plugin-uploadvalidator-bazel-master-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
 
 RPM_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm
 DEB_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).deb

fpm/etc/gerrit.config

diff --git a/fpm/etc/gerrit.config b/fpm/etc/gerrit.config
index b479d90..c6abc85 100644
--- a/fpm/etc/gerrit.config
+++ b/fpm/etc/gerrit.config
@@ -1,8 +1,5 @@
 [gerrit]
 	basePath = git
-[database]
-	type = h2
-	database = db/ReviewDB
 [index]
 	type = LUCENE
 [auth]