Merge "Correct verify job branch selection"

diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml
index 33035f1..4a6f391 100644 (file)
--- a/jjb/akraino-templates/akraino-jjb-templates.yaml
+++ b/jjb/akraino-templates/akraino-jjb-templates.yaml
@@ -282,7 +282,6 @@
       - lf-infra-parameters:
           project: '{project}'
           stream: '{stream}'
-          refspec: '{refspec}'
           branch: '{branch}'
           lftools-version: '{lftools-version}'
 
@@ -300,7 +299,7 @@
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           git-url: '{git-url}/{project}.git'
-          refspec: '{refspec}'
+          refspec: 'refs/heads/{branch}'
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
@@ -316,8 +315,6 @@
                 exclude-no-code-change: 'false'
             - change-merged-event
             - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: remerge$
             - comment-added-contains-event:
                 comment-contains-value: 'recheck'
             - comment-added-contains-event:
@@ -337,11 +334,9 @@
                   pattern: 'docs/**'
           readable-message: true
 
-
-
     builders:
       - shell: !include-raw-escape:
-          - ../shell/eliot-verify.sh
+          - ../shell/verify.sh
 
     publishers:
       - lf-infra-publish

diff --git a/jjb/eliot/eliot.yaml b/jjb/eliot/eliot.yaml
index c762473..632fe8b 100644 (file)
--- a/jjb/eliot/eliot.yaml
+++ b/jjb/eliot/eliot.yaml
@@ -3,9 +3,9 @@
     name: eliot-project
     project-name: eliot
     project: eliot
-    stream: master
-    refspec: '$GERRIT_REFSPEC'
-    branch: '$GERRIT_BRANCH'
+    stream:
+      - master:
+          branch: master
     build-node: centos7-builder-2c-1g
     jobs:
       - akraino-project-stream-verify

diff --git a/jjb/shell/eliot-verify.sh b/jjb/shell/verify.sh
similarity index 95%
rename from jjb/shell/eliot-verify.sh
rename to jjb/shell/verify.sh
index 1c80a16..eff7d25 100644 (file)
--- a/jjb/shell/eliot-verify.sh
+++ b/jjb/shell/verify.sh
@@ -17,6 +17,6 @@
 set -o errexit
 set -o pipefail
 
-echo "Running eliot verification..."
+echo "Running verify.sh..."
 
 /bin/bash $WORKSPACE/verify.sh