Fix parameters expansions for verification jobs
The unification of BUCK and Bazel verification jobs
introduced a bug that DID not expand the parameters in
the execution scripts: result was that *all tests* where
disabled.
This has generated instability on Gerrit master and we need
to restore the normal testing behaviour.
Change-Id: I1e151fb53f7d4d6f22cce641c7ed2a1bd3722c96
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
index 8a11464..775b16b 100644
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -6,15 +6,15 @@
. set-java.sh 8
- echo 'Test with mode={mode}'
+ echo "Test with mode=$MODE"
echo '----------------------------------------------'
- if [ "{mode}" == "notedb" ]
+ if [ "$MODE" == "notedb" ]
then
GERRIT_NOTEDB="--test_env=GERRIT_NOTEDB=READ_WRITE"
fi
- if [ "{mode}" == "default" ] || [ "{mode}" == "notedb" ]
+ if [ "$MODE" == "default" ] || [ "$MODE" == "notedb" ]
then
bazel test $GERRIT_NOTEDB \
--ignore_unsupported_sandboxing --test_output errors \
@@ -22,7 +22,7 @@
--test_verbose_timeout_warnings --build_tests_only //...
fi
- if [ "{mode}" == "polygerrit" ]
+ if [ "$MODE" == "polygerrit" ]
then
if [ -z "$DISPLAY" ]
then
diff --git a/jenkins/gerrit-buck-verifier-test.sh b/jenkins/gerrit-buck-verifier-test.sh
index 462b60e..4c74ddf 100644
--- a/jenkins/gerrit-buck-verifier-test.sh
+++ b/jenkins/gerrit-buck-verifier-test.sh
@@ -8,20 +8,20 @@
SOURCE_LEVEL=$(grep "source_level" .buckconfig || echo "source_level=7")
. set-java.sh $(echo $SOURCE_LEVEL | cut -d '=' -f 2 | tr -d '[[:space:]]')
- echo 'Test with mode={mode}'
+ echo "Test with mode=$MODE"
echo '----------------------------------------------'
- if [ "{mode}" == "notedb" ]
+ if [ "$MODE" == "notedb" ]
then
export GERRIT_NOTEDB=READ_WRITE
fi
- if [ "{mode}" == "default" ] || [ "{mode}" == "notedb" ]
+ if [ "$MODE" == "default" ] || [ "$MODE" == "notedb" ]
then
buck test --no-results-cache --exclude flaky
fi
- if [ "{mode}" == "polygerrit" ]
+ if [ "$MODE" == "polygerrit" ]
then
if [ -z "$DISPLAY" ]
then
diff --git a/jenkins/gerrit-verifier-change.groovy b/jenkins/gerrit-verifier-change.groovy
index d31b73b..80b9422 100644
--- a/jenkins/gerrit-verifier-change.groovy
+++ b/jenkins/gerrit-verifier-change.groovy
@@ -142,8 +142,8 @@
def b
ignore(FAILURE) {
retry ( Globals.numRetryBuilds ) {
- b = build("Gerrit-verifier-default", REFSPEC: refspec, BRANCH: sha1,
- CHANGE_URL: changeUrl)
+ b = build("Gerrit-verifier", REFSPEC: refspec, BRANCH: sha1,
+ CHANGE_URL: changeUrl, MODE: "default")
}
}
def result = waitForResult(b)
@@ -152,8 +152,8 @@
if (result == Result.SUCCESS && polygerritTouched(changeNum, sha1)) {
ignore(FAILURE) {
retry(Globals.numRetryBuilds) {
- b = build("Gerrit-verifier-polygerrit", REFSPEC: refspec, BRANCH: sha1,
- CHANGE_URL: changeUrl)
+ b = build("Gerrit-verifier", REFSPEC: refspec, BRANCH: sha1,
+ CHANGE_URL: changeUrl, MODE: "polygerrit")
}
}
@@ -165,8 +165,8 @@
if(result == Result.SUCCESS && branch=="master") {
ignore(FAILURE) {
retry ( Globals.numRetryBuilds ) {
- b = build("Gerrit-verifier-notedb", REFSPEC: refspec, BRANCH: sha1,
- CHANGE_URL: changeUrl)
+ b = build("Gerrit-verifier", REFSPEC: refspec, BRANCH: sha1,
+ CHANGE_URL: changeUrl, MODE: "notedb")
}
}
diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index 6ed5ee6..b6adc5b 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -1,14 +1,4 @@
- builder:
- name: test-gerrit-buck
- builders:
- - shell: !include-raw-escape: gerrit-buck-verifier-test.sh
-
-- builder:
- name: test-gerrit-bazel
- builders:
- - shell: !include-raw-escape: gerrit-bazel-verifier-test.sh
-
-- builder:
name: fetch-all-submodules
builders:
- shell: |
@@ -33,8 +23,8 @@
echo "Updating all submodules ..."
git submodule update || ( fetch_submodules && git submodule update )
-- job-template:
- name: '{name}-{mode}'
+- job:
+ name: Gerrit-verifier
description: "Gerrit build of open change with BUCK\n"
concurrent: true
parameters:
@@ -47,6 +37,13 @@
- string:
name: BRANCH
description: "Git branch or SHA1 to checkout"
+ - choice:
+ name: MODE
+ choices:
+ - default
+ - notedb
+ - polygerrit
+ description: "Type of verification to execute"
logrotate:
numToKeep: 256
@@ -71,11 +68,10 @@
builders:
- fetch-all-submodules
- shell: !include-raw-escape gerrit-buck-build.sh
- - test-gerrit-buck:
- mode: "{mode}"
+ - shell: !include-raw-escape gerrit-buck-verifier-test.sh
- shell: !include-raw-escape gerrit-bazel-build.sh
- - test-gerrit-bazel:
- mode: "{mode}"
+ - shell: !include-raw-escape gerrit-bazel-verifier-test.sh
+
wrappers:
- xvfb:
installation-name: Xvfb
@@ -97,15 +93,6 @@
- groovy-postbuild:
script: "manager.logContains('timed out') ? manager.buildAborted() : false"
-- project:
- name: Gerrit-verifier
- mode:
- - default
- - polygerrit
- - notedb
- jobs:
- - '{name}-{mode}'
-
- job:
name: 'Gerrit-verifier-change'
project-type: flow
