Remove excessive test modes
Change-Id: I22a8a7a93f788ab3ef75a96c72b4d295f1b37f19
diff --git a/jenkins/gerrit-bazel-test.sh b/jenkins/gerrit-bazel-test.sh
index a990389..b7e58f7 100755
--- a/jenkins/gerrit-bazel-test.sh
+++ b/jenkins/gerrit-bazel-test.sh
@@ -16,13 +16,9 @@
if [ "{branch}" == "master" ]
then
- echo 'Test in NoteDb mode (Disable ReviewDb)'
+ echo 'Test in NoteDb mode'
echo '----------------------------------------------'
- bazel test --test_env=GERRIT_NOTEDB=DISABLE_CHANGE_REVIEW_DB $BAZEL_OPTS //...
-
- echo 'Test in NoteDb mode (Fused)'
- echo '----------------------------------------------'
- bazel test --test_env=GERRIT_NOTEDB=FUSED $BAZEL_OPTS //...
+ bazel test --test_env=GERRIT_NOTEDB=ON $BAZEL_OPTS //...
fi
if [ "{branch}" == "master" || "{branch}" == "stable-2.14" ]
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
index 6bfad54..41b98d9 100755
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -20,15 +20,9 @@
bazel test $BAZEL_OPTS //...
fi
-if [[ "$MODE" == *"disableChangeReviewDb"* ]]
+if [[ "$MODE" == *"notedb"* ]]
then
- GERRIT_NOTEDB="--test_env=GERRIT_NOTEDB=DISABLE_CHANGE_REVIEW_DB"
- bazel test $GERRIT_NOTEDB $BAZEL_OPTS //...
-fi
-
-if [[ "$MODE" == *"fused"* ]]
-then
- GERRIT_NOTEDB="--test_env=GERRIT_NOTEDB=FUSED"
+ GERRIT_NOTEDB="--test_env=GERRIT_NOTEDB=ON"
bazel test $GERRIT_NOTEDB $BAZEL_OPTS //...
fi
diff --git a/jenkins/gerrit-buck-verifier-test.sh b/jenkins/gerrit-buck-verifier-test.sh
index 880c8e5..105f936 100644
--- a/jenkins/gerrit-buck-verifier-test.sh
+++ b/jenkins/gerrit-buck-verifier-test.sh
@@ -16,9 +16,9 @@
buck test --no-results-cache --exclude flaky
fi
- if [[ "$MODE" == *"disableChangeReviewDb"* ]]
+ if [[ "$MODE" == *"notedb"* ]]
then
- export GERRIT_NOTEDB=DISABLE_CHANGE_REVIEW_DB
+ export GERRIT_NOTEDB=ON
buck test --no-results-cache --exclude flaky
fi
diff --git a/jenkins/gerrit-verifier-change.groovy b/jenkins/gerrit-verifier-change.groovy
index 9d50e99..cc67c0a 100644
--- a/jenkins/gerrit-verifier-change.groovy
+++ b/jenkins/gerrit-verifier-change.groovy
@@ -270,8 +270,7 @@
build.setDescription("""<a href='$changeUrl' target='_blank'>Change #$changeNum</a>""")
if(branch == "master") {
- modes += "disableChangeReviewDb"
- modes += "fused"
+ modes += "notedb"
}
if(branch == "master" || branch == "stable-2.14") {
diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index 68e16ee..f7ec13b 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -54,8 +54,7 @@
name: MODE
choices:
- reviewdb
- - disableChangeReviewDb
- - fused
+ - notedb
- polygerrit
description: "Type of verification to execute"
properties:
