From 8a22036008a17d2b7ff33dd7214b179ff103ba17 Mon Sep 17 00:00:00 2001
From: Eric Ball <eball@linuxfoundation.org>
Date: Wed, 13 Mar 2019 09:44:42 -0700
Subject: [PATCH] Correct verify job branch selection

The verify job was not picking up the correct branch, as it had been
modeled after the merge jobs, which are single-branch. Also made the
verify jobs more generic, as they had been designed specific to the
eliot project.

Change-Id: I3bacc22bffb89c4b7378c1ada7bd0af988c75a15
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---
 global-jjb                                       | 2 +-
 jjb/akraino-templates/akraino-jjb-templates.yaml | 9 ++-------
 jjb/eliot/eliot.yaml                             | 6 +++---
 jjb/shell/{eliot-verify.sh => verify.sh}         | 2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)
 rename jjb/shell/{eliot-verify.sh => verify.sh} (95%)

diff --git a/global-jjb b/global-jjb
index 8b56734..4ada8fb 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 8b56734eada742094399d6e52cbc2ddef7b39b2c
+Subproject commit 4ada8fbad994cdcb78c547742f4fe97456949193
diff --git a/jjb/akraino-templates/akraino-jjb-templates.yaml b/jjb/akraino-templates/akraino-jjb-templates.yaml
index 33035f1..4a6f391 100644
--- 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
--- 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
--- 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
-- 
2.16.6