Run PolyGerrit and NoteDb tests unconditionally
After the removal of Gerrit v2.14 from the CI, it is not
needed anymore to condition the tests of PolyGerrit and NoteDb.
Change-Id: I1514afd7dd32eec487152e27ee5b03f16ed95bbb
diff --git a/jenkins/gerrit-bazel-test.sh b/jenkins/gerrit-bazel-test.sh
index 5b41b9c..9ce1cd7 100755
--- a/jenkins/gerrit-bazel-test.sh
+++ b/jenkins/gerrit-bazel-test.sh
@@ -21,27 +21,21 @@
bazelisk test --test_env=GERRIT_NOTEDB=OFF $BAZEL_OPTS //...
fi
-if [ "{branch}" == "master" ] || [ "{branch}" == "stable-3.1" ] || [ "{branch}" == "stable-3.0" ] || [ "{branch}" == "stable-2.16" ] || [ "{branch}" == "stable-2.15" ]
-then
- echo 'Test in NoteDb mode'
- echo '----------------------------------------------'
- bazelisk test --test_env=GERRIT_NOTEDB=ON $BAZEL_OPTS //...
-fi
+echo 'Test in NoteDb mode'
+echo '----------------------------------------------'
+bazelisk test --test_env=GERRIT_NOTEDB=ON $BAZEL_OPTS //...
-if [ "{branch}" == "master" ] || [ "{branch}" == "stable-3.1" ] || [ "{branch}" == "stable-3.0" ] || [ "{branch}" == "stable-2.16" ] || [ "{branch}" == "stable-2.15" ]
-then
- echo 'Test PolyGerrit locally'
- echo '----------------------------------------------'
- bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
+echo 'Test PolyGerrit locally'
+echo '----------------------------------------------'
+bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
- if [ -z "$SAUCE_USERNAME" ] || [ -z "$SAUCE_ACCESS_KEY" ]
- then
- echo 'Not running on Sauce Labs because env vars are not set.'
- else
- echo 'Test PolyGerrit on Sauce Labs'
- echo '----------------------------------------------'
- WCT_ARGS='--plugin sauce' bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
- fi
+if [ -z "$SAUCE_USERNAME" ] || [ -z "$SAUCE_ACCESS_KEY" ]
+then
+ echo 'Not running on Sauce Labs because env vars are not set.'
+else
+ echo 'Test PolyGerrit on Sauce Labs'
+ echo '----------------------------------------------'
+ WCT_ARGS='--plugin sauce' bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
fi
exit 0
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
index 26332e3..d74bf34 100755
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -30,23 +30,20 @@
bazelisk test $GERRIT_NOTEDB $BAZEL_OPTS //...
fi
-if [[ "$TARGET_BRANCH" == "master" || "$TARGET_BRANCH" == "stable-3.1" || "$TARGET_BRANCH" == "stable-3.0" || "$TARGET_BRANCH" == "stable-2.16" || "$TARGET_BRANCH" == "stable-2.15" ]]
+if [[ "$MODE" == *"polygerrit"* ]]
then
- if [[ "$MODE" == *"polygerrit"* ]]
+ if [ -z "$DISPLAY" ]
then
- if [ -z "$DISPLAY" ]
- then
- echo 'Not running local tests because env var "DISPLAY" is not set.'
- else
- echo 'Running local tests...'
- bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
- fi
- if [ -z "$SAUCE_USERNAME" ] || [ -z "$SAUCE_ACCESS_KEY" ]
- then
- echo 'Not running on Sauce Labs because env vars are not set.'
- else
- echo 'Running tests on Sauce Labs...'
- WCT_ARGS='--plugin sauce' bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
- fi
+ echo 'Not running local tests because env var "DISPLAY" is not set.'
+ else
+ echo 'Running local tests...'
+ bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
+ fi
+ if [ -z "$SAUCE_USERNAME" ] || [ -z "$SAUCE_ACCESS_KEY" ]
+ then
+ echo 'Not running on Sauce Labs because env vars are not set.'
+ else
+ echo 'Running tests on Sauce Labs...'
+ WCT_ARGS='--plugin sauce' bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
fi
fi
diff --git a/jenkins/gerrit-mvn-build-plugin.sh b/jenkins/gerrit-mvn-build-plugin.sh
index 07f804c..fd1d02c 100644
--- a/jenkins/gerrit-mvn-build-plugin.sh
+++ b/jenkins/gerrit-mvn-build-plugin.sh
@@ -2,15 +2,12 @@
. set-java.sh 8
-if [ "{branch}" == "master" ] || [ "{branch}" == "stable-3.1" ] || [ "{branch}" == "stable-3.0" ] || [ "{branch}" == "stable-2.16" ] || [ "{branch}" == "stable-2.15" ]
-then
- git checkout -f -b gerrit-master gerrit/{branch}
- git submodule update --init
- java -fullversion
- bazelisk version
- bazelisk build api
- ./tools/maven/api.sh install
-fi
+git checkout -f -b gerrit-master gerrit/{branch}
+git submodule update --init
+java -fullversion
+bazelisk version
+bazelisk build api
+./tools/maven/api.sh install
git checkout -f origin/{branch}
mvn package
