Merge branch 'stable-3.2' into stable-3.3
* stable-3.2:
Use new kafka broker name
Change-Id: Iff07198db59317e41a0e61d122da150948271744
diff --git a/setup_local_env/configs/gerrit.config b/setup_local_env/configs/gerrit.config
index 368f94d..c4df06a 100644
--- a/setup_local_env/configs/gerrit.config
+++ b/setup_local_env/configs/gerrit.config
@@ -40,7 +40,7 @@
allowRemoteAdmin = true
[plugin "websession-flatfile"]
directory = $FAKE_NFS
-[plugin "kafka-events"]
+[plugin "events-kafka"]
sendAsync = true
bootstrapServers = localhost:$BROKER_PORT
groupId = $GROUP_ID
diff --git a/setup_local_env/setup.sh b/setup_local_env/setup.sh
index ba78d30..4266ce2 100755
--- a/setup_local_env/setup.sh
+++ b/setup_local_env/setup.sh
@@ -434,9 +434,9 @@
ing"; exit 1; }
if [ "$BROKER_TYPE" = "kafka" ]; then
-echo "Downloading kafka-events plugin $GERRIT_BRANCH"
- wget $GERRIT_CI/plugin-kafka-events-bazel-$GERRIT_BRANCH/$LAST_BUILD/kafka-events/kafka-events.jar \
- -O $DEPLOYMENT_LOCATION/kafka-events.jar || { echo >&2 "Cannot download kafka-events plugin: Check internet connection. Abort\
+echo "Downloading events-kafka plugin $GERRIT_BRANCH"
+ wget $GERRIT_CI/plugin-events-kafka-bazel-$GERRIT_BRANCH/$LAST_BUILD/events-kafka/events-kafka.jar \
+ -O $DEPLOYMENT_LOCATION/events-kafka.jar || { echo >&2 "Cannot download events-kafka plugin: Check internet connection. Abort\
ing"; exit 1; }
fi
@@ -511,7 +511,7 @@
elif [ $BROKER_TYPE = "gcloud-pubsub" ]; then
cp -f $DEPLOYMENT_LOCATION/events-gcloud-pubsub.jar $LOCATION_TEST_SITE_1/plugins/events-gcloud-pubsub.jar
else
- cp -f $DEPLOYMENT_LOCATION/$BROKER_TYPE-events.jar $LOCATION_TEST_SITE_1/plugins/$BROKER_TYPE-events.jar
+ cp -f $DEPLOYMENT_LOCATION/events-kafka.jar $LOCATION_TEST_SITE_1/plugins/events-kafka.jar
fi
echo "Copy metrics-reporter-prometheus plugin"
