Revert "Bazel: Activate RBE configuration on GCP"
This reverts commit 25999b12a38fc65b09a55cdb16f89833b65fe612.
Reason for revert: RBE build is failing on GCP.
Error message is:
ERROR: Failed to init auth credentials: The Application Default
Credentials are not available. They are available if running in
Google Compute Engine. Otherwise, the environment variable
GOOGLE_APPLICATION_CREDENTIALS must be defined pointing to a file
defining the credentials.
Change-Id: I7312ff6d8c2fb1a3993b3d5ec1307ae28009b119
diff --git a/jenkins/checker_definitions.txt b/jenkins/checker_definitions.txt
index f2cbf79..37dd066 100644
--- a/jenkins/checker_definitions.txt
+++ b/jenkins/checker_definitions.txt
@@ -1,17 +1,6 @@
POST /plugins/checks/checkers/ HTTP/1.0
Content-Type: application/json; charset=UTF-8
{
- "uuid": "gerritforge:rbe-a6a0e4682515f3521897c5f950d1394f4619d928",
- "name": "RBE Build/Tests",
- "description": "Builds the code base and executes unit/integration tests on RBE",
- "repository": "gerrit",
- "query": "branch:master",
- "blocking": []
- }
-
-POST /plugins/checks/checkers/ HTTP/1.0
- Content-Type: application/json; charset=UTF-8
- {
"uuid": "gerritforge:notedb-a6a0e4682515f3521897c5f950d1394f4619d928",
"name": "Build/Tests",
"description": "Builds the code base and executes unit/integration tests",
diff --git a/jenkins/gerrit-bazel-build.sh b/jenkins/gerrit-bazel-build.sh
index d02c40b..39049e4 100644
--- a/jenkins/gerrit-bazel-build.sh
+++ b/jenkins/gerrit-bazel-build.sh
@@ -4,9 +4,6 @@
cd gerrit
-echo "Build with mode=$MODE"
-echo '----------------------------------------------'
-
if git show --diff-filter=AM --name-only --pretty="" HEAD | grep -q .bazelversion
then
export BAZEL_OPTS=""
@@ -14,14 +11,6 @@
java -fullversion
bazelisk version
-
-if [[ "$MODE" == *"rbe"* ]]
-then
- # TODO(davido): Figure out why javadoc part of api-rule doesn't work on RBE.
- # See: https://github.com/bazelbuild/bazel/issues/12765 for more background.
- bazelisk build --config=remote --remote_instance_name=projects/api-project-164060093628/instances/default_instance plugins:core release api-skip-javadoc
-else
- bazelisk build $BAZEL_OPTS plugins:core release api
- tools/maven/api.sh install
- tools/eclipse/project.py --bazel bazelisk
-fi
+bazelisk build $BAZEL_OPTS plugins:core release api
+tools/maven/api.sh install
+tools/eclipse/project.py --bazel bazelisk
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
index 102b229..8851b4d 100755
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -7,14 +7,7 @@
echo "Test with mode=$MODE"
echo '----------------------------------------------'
-case $TARGET_BRANCH$MODE in
- masterrbe)
- TEST_TAG_FILTER="-flaky,-elastic,-git-protocol-v2"
- BAZEL_OPTS="--config=remote --remote_instance_name=projects/api-project-164060093628/instances/default_instance"
- ;;
- masterNoteDb)
- TEST_TAG_FILTER="-flaky,elastic,git-protocol-v2"
- ;;
+case $TARGET_BRANCH in
stable-2.*)
TEST_TAG_FILTER="-flaky,-elastic"
;;
@@ -37,7 +30,7 @@
if [[ "$MODE" == *"reviewdb"* ]]
then
GERRIT_NOTEDB="--test_env=GERRIT_NOTEDB=OFF"
- bazelisk test $GERRIT_NOTEDB $BAZEL_OPTS //...
+ bazelisk test $BAZEL_OPTS //...
fi
if [[ "$MODE" == *"notedb"* ]]
@@ -46,11 +39,6 @@
bazelisk test $GERRIT_NOTEDB $BAZEL_OPTS //...
fi
-if [[ "$MODE" == *"rbe"* ]]
-then
- bazelisk test $BAZEL_OPTS //...
-fi
-
if [[ "$MODE" == *"polygerrit"* ]]
then
diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index 81b5739..150738c 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -64,7 +64,6 @@
- reviewdb
- notedb
- polygerrit
- - rbe
description: 'Type of verification to execute'
properties:
- authorization:
diff --git a/vars/gerritPipeline.groovy b/vars/gerritPipeline.groovy
index b5711e8..6f25cd5 100644
--- a/vars/gerritPipeline.groovy
+++ b/vars/gerritPipeline.groovy
@@ -130,9 +130,7 @@
def collectBuildModes() {
Builds.modes = []
- if (env.GERRIT_BRANCH == "master") {
- Builds.modes = ["notedb", "rbe"]
- } else if (env.GERRIT_BRANCH ==~ /stable-3.*/) {
+ if (env.GERRIT_BRANCH ==~ /stable-3.*/ || env.GERRIT_BRANCH == "master") {
Builds.modes = ["notedb"]
} else if (env.GERRIT_BRANCH == "stable-2.16") {
Builds.modes = ["notedb", "reviewdb"]
