Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Set Gerrit to 2.15.19
Fetch plugins from archive-ci.gerritforge.com
Set Gerrit to 2.14.21
Change-Id: I18d737a2639a52f28dc92a90d101f500d70395dd
diff --git a/deb-repo/Makefile b/deb-repo/Makefile
index 34e50ff..ffc932e 100644
--- a/deb-repo/Makefile
+++ b/deb-repo/Makefile
@@ -9,7 +9,7 @@
MIRROR_URL=http://mirrorlist.$(VENDOR_LC).com/deb
# Vendor PGP Key ID (default GerritForge)
-PGP_KEY_ID=1871F775
+PGP_KEY_ID=9911F82E27836B7FAE85090D847005AE619067D5
### END OF VARIABLES THAT CAN BE OVERRIDDEN ###
define DEB_RELEASE
@@ -48,7 +48,7 @@
cd server && apt-ftparchive packages dists/gerrit/contrib/binary-i386 > dists/gerrit/contrib/binary-i386/Packages
cd server && apt-ftparchive packages dists/gerrit/contrib/binary-amd64 > dists/gerrit/contrib/binary-amd64/Packages
cd server && apt-ftparchive release dists/gerrit >> Release
- gpg -abs -o server/Release.gpg server/Release
+ gpg -abs --default-key $(PGP_KEY_ID) -o server/Release.gpg server/Release
mv server/Release* server/dists/gerrit/.
.PHONY: clean prepare server
diff --git a/docker/centos7/Makefile b/docker/centos7/Makefile
index f1c48ff..768f8ae 100644
--- a/docker/centos7/Makefile
+++ b/docker/centos7/Makefile
@@ -1,10 +1,10 @@
# Customise the following variable as Make parameters
# to produce a yum.repo for a VENDOR distribution
# Default values are pointing to GerritForge (www.gerritforge.com)
-VERSION=2.15.19
+VERSION=2.16.20
RELEASE=1
REPO_VERSION=1
-REPO_RELEASE=2
+REPO_RELEASE=1
VENDOR=GerritForge
VENDOR_LC=$(shell echo $(VENDOR) | tr A-Z a-z)
IMAGE=$(VENDOR_LC)/gerrit-centos7
@@ -13,7 +13,7 @@
# End of the variables that can be customized
define DOCKERFILE
-FROM centos:7.4.1708
+FROM centos:7.5.1804
MAINTAINER $(VENDOR)
# Allow remote connectivity and sudo
diff --git a/docker/ubuntu16.04/Makefile b/docker/ubuntu16.04/Makefile
index 3f23a35..6aa5a50 100644
--- a/docker/ubuntu16.04/Makefile
+++ b/docker/ubuntu16.04/Makefile
@@ -1,7 +1,7 @@
# Customise the following variable as Make parameters
# to produce a yum.repo for a VENDOR distribution
# Default values are pointing to GerritForge (www.gerritforge.com)
-VERSION=2.15.19
+VERSION=2.16.20
RELEASE=1
VENDOR=GerritForge
VENDOR_LC=$(shell echo $(VENDOR) | tr A-Z a-z)
diff --git a/fpm/Makefile b/fpm/Makefile
index f8caf56..e1c60ce 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,6 +1,7 @@
-VERSION=2.15.19
-URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(VERSION).war
-CI_URL=https://archive-ci.gerritforge.com
+VERSION=2.16.20
+WAR_VERSION=2.16.20
+URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(WAR_VERSION).war
+CI_URL=https://gerrit-ci.gerritforge.com
RELEASE=1
NAME=gerrit
@@ -19,15 +20,15 @@
WEB_URL=https://www.gerritcodereview.com/
WAR=$(BUILD_ROOT)/bin/gerrit.war
-PLUGINS_CI=https://archive-ci.gerritforge.com/job
+PLUGINS_CI=https://gerrit-ci.gerritforge.com/job
LIBS_JOBS= \
- plugin-out-of-the-box-bazel-master-stable-2.15/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
+ plugin-out-of-the-box-bazel-master-stable-2.16/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
PLUGINS_JOBS= \
- plugin-plugin-manager-bazel-stable-2.15/lastSuccessfulBuild/artifact/bazel-bin/plugins/plugin-manager/plugin-manager.jar \
- plugin-avatars-gravatar-bazel-master-stable-2.15/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
- plugin-gitiles-bazel-stable-2.15/lastSuccessfulBuild/artifact/bazel-bin/plugins/gitiles/gitiles.jar \
- plugin-delete-project-bazel-stable-2.15/lastSuccessfulBuild/artifact/bazel-bin/plugins/delete-project/delete-project.jar \
- plugin-uploadvalidator-bazel-stable-2.15/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
+ plugin-plugin-manager-bazel-stable-2.16/lastSuccessfulBuild/artifact/bazel-bin/plugins/plugin-manager/plugin-manager.jar \
+ plugin-avatars-gravatar-bazel-stable-2.16/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
+ plugin-gitiles-bazel-stable-2.16/lastSuccessfulBuild/artifact/bazel-bin/plugins/gitiles/gitiles.jar \
+ plugin-delete-project-bazel-stable-2.16/lastSuccessfulBuild/artifact/bazel-bin/plugins/delete-project/delete-project.jar \
+ plugin-uploadvalidator-bazel-stable-2.16/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
@@ -92,12 +93,12 @@
plugins:
for job in $(PLUGINS_JOBS); \
- do echo ">> Download: $$job" && curl -f -o $(BUILD_ROOT)/plugins/`basename $$job` $(PLUGINS_CI)/$$job; \
+ do set -e && echo ">> Download: $$job" && curl -f -o $(BUILD_ROOT)/plugins/`basename $$job` $(PLUGINS_CI)/$$job; \
done
libs:
for job in $(LIBS_JOBS); \
- do echo ">> Download: $$job" && curl -f -o $(BUILD_ROOT)/lib/`basename $$job` $(PLUGINS_CI)/$$job; \
+ do set -e && echo ">> Download: $$job" && curl -f -o $(BUILD_ROOT)/lib/`basename $$job` $(PLUGINS_CI)/$$job; \
done
$(SCRIPTS_ROOT)/%.sh: scripts/%.sh
diff --git a/fpm/scripts/after-install.sh b/fpm/scripts/after-install.sh
index 89780c6..d8cc02e 100755
--- a/fpm/scripts/after-install.sh
+++ b/fpm/scripts/after-install.sh
@@ -2,8 +2,8 @@
LOG=/tmp/gerrit-installer.log
chmod a+rw $LOG
-[ ! -d /etc/default ] && mkdir -p /etc/default
-echo "GERRIT_SITE=$GERRIT_SITE" > /etc/default/gerritcodereview
+[ -d /etc/default ] || mkdir -p /etc/default
+[ -f /etc/default/gerritcodereview ] || echo "GERRIT_SITE=$GERRIT_SITE" > /etc/default/gerritcodereview
echo ""
echo -n "Initialising Gerrit site ... "
diff --git a/macOS/Makefile b/macOS/Makefile
index e944824..c3831a0 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 2.15.19
+VERSION := 2.16.20
all: server
