Merge branch 'stable-3.2' * stable-3.2: e2e-tests: Replace value of 1 with reused constant Use stable-3.2 branch for multi-site local setup Change-Id: I7cb112123daea7cf234bbd82a6c1ec80d3b2d706
diff --git a/setup_local_env/setup.sh b/setup_local_env/setup.sh index 9438965..84037ad 100755 --- a/setup_local_env/setup.sh +++ b/setup_local_env/setup.sh
@@ -16,7 +16,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -GERRIT_BRANCH=master +GERRIT_BRANCH=stable-3.2 GERRIT_CI=https://gerrit-ci.gerritforge.com/view/Plugins-$GERRIT_BRANCH/job LAST_BUILD=lastSuccessfulBuild/artifact/bazel-bin/plugins EVENTS_BROKER_VER=`grep 'com.gerritforge:events-broker' $(dirname $0)/../external_plugin_deps.bzl | cut -d '"' -f 2 | cut -d ':' -f 3` @@ -344,7 +344,7 @@ wget $GERRIT_CI/plugin-websession-broker-bazel-master-$GERRIT_BRANCH/$LAST_BUILD/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 $GERRIT_CI/plugin-healthcheck-bazel-master-$GERRIT_BRANCH/$LAST_BUILD/healthcheck/healthcheck.jar \ + wget $GERRIT_CI/plugin-healthcheck-bazel-$GERRIT_BRANCH/$LAST_BUILD/healthcheck/healthcheck.jar \ -O $DEPLOYMENT_LOCATION/healthcheck.jar || { echo >&2 "Cannot download healthcheck plugin: Check internet connection. Abort\ ing"; exit 1; } else @@ -352,7 +352,7 @@ fi echo "Downloading zookeeper plugin $GERRIT_BRANCH" - wget $GERRIT_CI/plugin-zookeeper-refdb-bazel-master-$GERRIT_BRANCH/$LAST_BUILD/zookeeper-refdb/zookeeper-refdb.jar \ + wget $GERRIT_CI/plugin-zookeeper-refdb-bazel-$GERRIT_BRANCH/$LAST_BUILD/zookeeper-refdb/zookeeper-refdb.jar \ -O $DEPLOYMENT_LOCATION/zookeeper-refdb.jar || { echo >&2 "Cannot download zookeeper plugin: Check internet connection. Abort\ ing"; exit 1; }
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CloneUsingMultiGerrit1.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CloneUsingMultiGerrit1.scala index ba54314..f1d2727 100644 --- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CloneUsingMultiGerrit1.scala +++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CloneUsingMultiGerrit1.scala
@@ -45,15 +45,15 @@ setUp( createProject.test.inject( nothingFor(stepWaitTime(createProject) seconds), - atOnceUsers(1) + atOnceUsers(single) ), test.inject( nothingFor(stepWaitTime(this) seconds), - atOnceUsers(1) + atOnceUsers(single) ), deleteProject.test.inject( nothingFor(createProject.maxExecutionTime + maxExecutionTime seconds), - atOnceUsers(1) + atOnceUsers(single) ), ).protocols(gitProtocol, httpProtocol) }
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala index f6e610b..51dd72d 100644 --- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala +++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala
@@ -46,19 +46,19 @@ setUp( createProject.test.inject( nothingFor(stepWaitTime(createProject) seconds), - atOnceUsers(1) + atOnceUsers(single) ), test.inject( nothingFor(stepWaitTime(this) seconds), - atOnceUsers(1) + atOnceUsers(single) ), deleteChange.test.inject( nothingFor(stepWaitTime(deleteChange) seconds), - atOnceUsers(1) + atOnceUsers(single) ).protocols(deleteChange.httpForReplica), deleteProject.test.inject( nothingFor(stepWaitTime(deleteProject) seconds), - atOnceUsers(1) + atOnceUsers(single) ), ).protocols(httpProtocol) }
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerrit.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerrit.scala index 5fd3f41..520c1a3 100644 --- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerrit.scala +++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerrit.scala
@@ -35,6 +35,6 @@ setUp( test.inject( - atOnceUsers(1) + atOnceUsers(single) )).protocols(httpProtocol) }
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerritTwice.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerritTwice.scala index 83f0f79..68508c7 100644 --- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerritTwice.scala +++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerritTwice.scala
@@ -31,23 +31,23 @@ setUp( createProject.test.inject( nothingFor(stepWaitTime(createProject) seconds), - atOnceUsers(1) + atOnceUsers(single) ), deleteProject.test.inject( nothingFor(stepWaitTime(deleteProject) seconds), - atOnceUsers(1) + atOnceUsers(single) ), createItAgain.test.inject( nothingFor(stepWaitTime(createItAgain) seconds), - atOnceUsers(1) + atOnceUsers(single) ), verifyProject.test.inject( nothingFor(stepWaitTime(verifyProject) seconds), - atOnceUsers(1) + atOnceUsers(single) ), deleteItAfter.test.inject( nothingFor(stepWaitTime(deleteItAfter) seconds), - atOnceUsers(1) + atOnceUsers(single) ), ).protocols(gitProtocol, httpProtocol) }
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala index e086efe..91ab1a9 100644 --- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala +++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala
@@ -49,6 +49,6 @@ setUp( test.inject( - atOnceUsers(1) + atOnceUsers(single) )).protocols(httpForReplica) }
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteProjectUsingMultiGerrit.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteProjectUsingMultiGerrit.scala index f199e5e..8bcc648 100644 --- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteProjectUsingMultiGerrit.scala +++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteProjectUsingMultiGerrit.scala
@@ -35,6 +35,6 @@ setUp( test.inject( - atOnceUsers(1) + atOnceUsers(single) )).protocols(httpProtocol) }