commit 8645bd8ce6a43e81ba7dc8587cda0a9a6b5ad469
author Zack Williams <zdw@opennetworking.org> Wed Oct 03 15:01:38 2018 +0000
committer Gerrit Code Review <gerrit@opencord.org> Wed Oct 03 15:01:38 2018 +0000
tree a996a2ad72c4f842ba7b6b868d71a1a465c0ae56
parent 2a1e24be8be2f3741147d02a07bff0950c8c3037
parent cd3eb20b5efc755ad788635424bb39544cf4ba31

Merge "Use the 'gerrit' choosing-strategy so code is properly checked"

jjb/charts.yaml

diff --git a/jjb/charts.yaml b/jjb/charts.yaml
index b8c74a9..b250975 100644
--- a/jjb/charts.yaml
+++ b/jjb/charts.yaml
@@ -41,7 +41,7 @@
           refspec: ''
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
-          choosing-strategy: default
+          choosing-strategy: 'gerrit'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     node: '{build-node}'

jjb/siab-e2e.yaml

diff --git a/jjb/siab-e2e.yaml b/jjb/siab-e2e.yaml
index ee8e720..6a902ec 100644
--- a/jjb/siab-e2e.yaml
+++ b/jjb/siab-e2e.yaml
@@ -36,7 +36,7 @@
           refspec: '{refspec}'
           branch: '{branch}'
           submodule-recursive: 'false'
-          choosing-strategy: default
+          choosing-strategy: 'gerrit'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           basedir: 'cord/automation-tools'
 

jjb/sonar.yaml

diff --git a/jjb/sonar.yaml b/jjb/sonar.yaml
index 205079e..6e66097 100644
--- a/jjb/sonar.yaml
+++ b/jjb/sonar.yaml
@@ -67,7 +67,7 @@
           refspec: ''
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
-          choosing-strategy: default
+          choosing-strategy: 'gerrit'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     node: 'ubuntu16.04-basebuild-1c-2g'

jjb/verify/abstract-olt.yaml

diff --git a/jjb/verify/abstract-olt.yaml b/jjb/verify/abstract-olt.yaml
index 880d49b..838322b 100644
--- a/jjb/verify/abstract-olt.yaml
+++ b/jjb/verify/abstract-olt.yaml
@@ -49,7 +49,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
-          choosing-strategy: default
+          choosing-strategy: 'gerrit'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           basedir: '{project}'
 

jjb/verify/voltha-go.yaml

diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index ff68b67..cc7a872 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -50,7 +50,7 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
-          choosing-strategy: default
+          choosing-strategy: 'gerrit'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           basedir: '{project}'