commit 7436ce6169a09a40f4c4b76f5d0cc5408dd7b52a
author Marcin Czech <maczech@gmail.com> Fri Jan 10 14:42:54 2020 +0100
committer Marcin Czech <maczech@gmail.com> Fri Jan 10 13:44:40 2020 +0000
tree 798e1db8b2ad6af31428f60057d9a7a4d4d6a533
parent faf8bd17ee69d7ac068cd2b804512f0fd84671f8

Replace websession-flatfile with websession-broker for local setup

Feature: Issue 11600
Change-Id: Ied0f98fbe36fb422b4235cc70ec7d018ef80d32e

setup_local_env/configs/gerrit.config

diff --git a/setup_local_env/configs/gerrit.config b/setup_local_env/configs/gerrit.config
index 9c5ca34..6092cc1 100644
--- a/setup_local_env/configs/gerrit.config
+++ b/setup_local_env/configs/gerrit.config
@@ -41,7 +41,7 @@
 [plugin "kafka-events"]
     bootstrapServers = localhost:$KAFKA_PORT
     groupId = $KAFKA_GROUP_ID
-    numberOfSubscribers = 4
+    numberOfSubscribers = 5
     securityProtocol = PLAINTEXT
     pollingIntervalMs = 1000
     enableAutoCommit = true

setup_local_env/setup.sh

diff --git a/setup_local_env/setup.sh b/setup_local_env/setup.sh
index dc58d00..9927e53 100755
--- a/setup_local_env/setup.sh
+++ b/setup_local_env/setup.sh
@@ -152,7 +152,7 @@
     echo "[--multisite-lib-file]          Location to lib multi-site.jar file"
     echo
     echo "[--new-deployment]              Cleans up previous gerrit deployment and re-installs it. default true"
-    echo "[--get-websession-plugin]       Download websession-flatfile plugin from CI lastSuccessfulBuild; default true"
+    echo "[--get-websession-plugin]       Download websession-broker plugin from CI lastSuccessfulBuild; default true"
     echo "[--deployment-location]         Base location for the test deployment; default /tmp"
     echo
     echo "[--gerrit-canonical-host]       The default host for Gerrit to be accessed through; default localhost"
@@ -182,7 +182,7 @@
     shift
   ;;
   "--get-websession-plugin")
-    DOWNLOAD_WEBSESSION_FLATFILE=$2
+    DOWNLOAD_WEBSESSION_PLUGIN=$2
     shift
     shift
   ;;
@@ -274,7 +274,7 @@
 
 # Defaults
 NEW_INSTALLATION=${NEW_INSTALLATION:-"true"}
-DOWNLOAD_WEBSESSION_FLATFILE=${DOWNLOAD_WEBSESSION_FLATFILE:-"true"}
+DOWNLOAD_WEBSESSION_PLUGIN=${DOWNLOAD_WEBSESSION_PLUGIN:-"true"}
 DEPLOYMENT_LOCATION=${DEPLOYMENT_LOCATION:-"/tmp"}
 export GERRIT_CANONICAL_HOSTNAME=${GERRIT_CANONICAL_HOSTNAME:-"localhost"}
 export GERRIT_CANONICAL_PORT=${GERRIT_CANONICAL_PORT:-"8080"}
@@ -319,16 +319,16 @@
 else
   cp -f $MULTISITE_LIB_LOCATION $DEPLOYMENT_LOCATION/multi-site.jar  >/dev/null 2>&1 || { echo >&2 "$MULTISITE_LIB_LOCATION: Not able to copy the file. Aborting"; exit 1; }
 fi
-if [ $DOWNLOAD_WEBSESSION_FLATFILE = "true" ];then
-  echo "Downloading websession-flatfile plugin stable 3.0"
-  wget https://gerrit-ci.gerritforge.com/view/Plugins-stable-3.0/job/plugin-websession-flatfile-bazel-master-stable-3.0/lastSuccessfulBuild/artifact/bazel-bin/plugins/websession-flatfile/websession-flatfile.jar \
-  -O $DEPLOYMENT_LOCATION/websession-flatfile.jar || { echo >&2 "Cannot download websession-flatfile plugin: Check internet connection. Abort\
+if [ $DOWNLOAD_WEBSESSION_PLUGIN = "true" ];then
+  echo "Downloading websession-broker plugin stable 3.0"
+  wget https://gerrit-ci.gerritforge.com/view/Plugins-stable-3.0/job/plugin-websession-broker-gh-bazel-stable-3.0/lastSuccessfulBuild/artifact/bazel-bin/plugins/websession-broker/websession-broker.jar \
+  -O $DEPLOYMENT_LOCATION/websession-broker.jar || { echo >&2 "Cannot download websession-broker plugin: Check internet connection. Abort\
 ing"; exit 1; }
   wget https://gerrit-ci.gerritforge.com/view/Plugins-stable-3.0/job/plugin-healthcheck-bazel-stable-3.0/lastSuccessfulBuild/artifact/bazel-bin/plugins/healthcheck/healthcheck.jar \
   -O $DEPLOYMENT_LOCATION/healthcheck.jar || { echo >&2 "Cannot download healthcheck plugin: Check internet connection. Abort\
 ing"; exit 1; }
 else
-  echo "Without the websession-flatfile; user login via haproxy will fail."
+  echo "Without the websession-broker; user login via haproxy will fail."
 fi
 
 echo "Downloading zookeeper plugin stable 3.0"
@@ -376,8 +376,8 @@
   echo "Copy multi-site library to lib directory"
   cp -f $DEPLOYMENT_LOCATION/multi-site.jar $LOCATION_TEST_SITE_1/lib/multi-site.jar
 
-  echo "Copy websession-flatfile plugin"
-  cp -f $DEPLOYMENT_LOCATION/websession-flatfile.jar $LOCATION_TEST_SITE_1/plugins/websession-flatfile.jar
+  echo "Copy websession-broker plugin"
+  cp -f $DEPLOYMENT_LOCATION/websession-broker.jar $LOCATION_TEST_SITE_1/plugins/websession-broker.jar
 
   echo "Copy healthcheck plugin"
   cp -f $DEPLOYMENT_LOCATION/healthcheck.jar $LOCATION_TEST_SITE_1/plugins/healthcheck.jar