From 39188be0185a0fe44211c9335b6849a9786d1c30 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 12 Nov 2020 13:38:45 -0800 Subject: [PATCH] Use SCM 'gerrit' choosing strategy for kni jobs The KNI jobs appear to be building the master branch even after fetching proposed changes to gerrit. Change the choosing strategy from 'default' to 'gerrit' to correct this. See https://plugins.jenkins.io/gerrit-trigger/ for docs. Change-Id: I028cde257415b2eb297cfa100f68d109df3fac71 Signed-off-by: James E. Blair --- jjb/akraino-templates/akraino-jjb-kni.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml index e75fa4f..df0abf4 100644 --- a/jjb/akraino-templates/akraino-jjb-kni.yaml +++ b/jjb/akraino-templates/akraino-jjb-kni.yaml @@ -80,7 +80,7 @@ submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' submodule-disable: false - choosing-strategy: default + choosing-strategy: gerrit gerrit_verify_triggers: - patchset-created-event: @@ -139,7 +139,7 @@ submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' submodule-disable: false - choosing-strategy: default + choosing-strategy: gerrit basedir: '{project-name}' - akraino-lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' @@ -286,7 +286,7 @@ submodule-recursive: '{submodule-recursive}' submodule-timeout: '{submodule-timeout}' submodule-disable: false - choosing-strategy: default + choosing-strategy: gerrit basedir: 'kni-blueprint-pae' - akraino-lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' -- 2.16.6