Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Fetch plugins from archive-ci.gerritforge.com
Set Gerrit to 2.14.21
Change-Id: I021c71c6363b2ec70eb11005a6ac7a81147e8926
diff --git a/docker/centos7/Makefile b/docker/centos7/Makefile
index 38ae723..5aef37d 100644
--- a/docker/centos7/Makefile
+++ b/docker/centos7/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.14.21
+VERSION=2.15.18
RELEASE=1
REPO_VERSION=1
REPO_RELEASE=2
@@ -13,7 +13,7 @@
# End of the variables that can be customized
define DOCKERFILE
-FROM centos:7.3.1611
+FROM centos:7.4.1708
MAINTAINER $(VENDOR)
# Allow remote connectivity and sudo
diff --git a/docker/ubuntu16.04/Makefile b/docker/ubuntu16.04/Makefile
index 5116319..592ac3c 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.14.21
+VERSION=2.15.18
RELEASE=1
VENDOR=GerritForge
VENDOR_LC=$(shell echo $(VENDOR) | tr A-Z a-z)
diff --git a/fpm/Makefile b/fpm/Makefile
index 07ae3bf..6182344 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,4 +1,4 @@
-VERSION=2.14.21
+VERSION=2.15.18
URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(VERSION).war
CI_URL=https://archive-ci.gerritforge.com
RELEASE=1
@@ -21,13 +21,13 @@
WAR=$(BUILD_ROOT)/bin/gerrit.war
PLUGINS_CI=https://archive-ci.gerritforge.com/job
LIBS_JOBS= \
- plugin-out-of-the-box-bazel-master-stable-2.14/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
+ plugin-out-of-the-box-bazel-master-stable-2.15/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
PLUGINS_JOBS= \
- plugin-plugin-manager-bazel-stable-2.14/lastSuccessfulBuild/artifact/bazel-bin/plugins/plugin-manager/plugin-manager.jar \
- plugin-avatars-gravatar-bazel-master-stable-2.14/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
- plugin-gitiles-bazel-stable-2.14/lastSuccessfulBuild/artifact/bazel-bin/plugins/gitiles/gitiles.jar \
- plugin-delete-project-bazel-stable-2.14/lastSuccessfulBuild/artifact/bazel-bin/plugins/delete-project/delete-project.jar \
- plugin-uploadvalidator-bazel-stable-2.14/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
+ 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
RPM_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm
DEB_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).deb
@@ -88,16 +88,16 @@
rm -Rf $(SCRIPTS_ROOT)
$(WAR): $(basedir $(WAR))
- curl -o $@ $(URL)
+ curl -f -o $@ $(URL)
plugins:
for job in $(PLUGINS_JOBS); \
- do curl -o $(BUILD_ROOT)/plugins/`basename $$job` $(PLUGINS_CI)/$$job; \
+ do echo ">> Download: $$job" && curl -f -o $(BUILD_ROOT)/plugins/`basename $$job` $(PLUGINS_CI)/$$job; \
done
libs:
for job in $(LIBS_JOBS); \
- do curl -o $(BUILD_ROOT)/lib/`basename $$job` $(PLUGINS_CI)/$$job; \
+ do echo ">> Download: $$job" && curl -f -o $(BUILD_ROOT)/lib/`basename $$job` $(PLUGINS_CI)/$$job; \
done
$(SCRIPTS_ROOT)/%.sh: scripts/%.sh
diff --git a/macOS/Makefile b/macOS/Makefile
index deb53b8..d3e184a 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 2.14.21
+VERSION := 2.15.18
all: server