From 9b609227f76289c63f65f2297d572cf2409570f9 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Thu, 17 Sep 2015 13:32:03 +0200 Subject: [PATCH] Enable integration-patch-test-{stream} to specify GERRIT_* This is to enable the job to be used in Sandbox. Defines new macros in releng-macros.yaml Change-Id: I9ec33baa624c83512c78909f1667ab668d1ba736 Signed-off-by: Vratko Polak --- jjb/integration/integration-test-jobs.yaml | 4 ++++ jjb/releng-macros.yaml | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index afaae0266..2a4b45f1a 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -362,6 +362,10 @@ artifactNumToKeep: '{build-artifact-num-to-keep}' parameters: + - gerrit-project-parameter: + project: '$GERRIT_PROJECT' + - gerrit-refspec-parameter: + refspec: '$GERRIT_REFSPEC' - project-parameter: project: '$GERRIT_PROJECT' - integration-distribution-git-url diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index df2d8f28c..087529a71 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -16,6 +16,22 @@ default: '{branch}' description: "JJB configured GERRIT_BRANCH parameter" +- parameter: + name: gerrit-project-parameter + parameters: + - string: + name: GERRIT_PROJECT + default: '{project}' + description: "GERRIT_PROJECT parameter if not given by trigger" + +- parameter: + name: gerrit-refspec-parameter + parameters: + - string: + name: GERRIT_REFSPEC + default: '{refspec}' + description: "GERRIT_REFSPEC parameter if not given by trigger" + - scm: name: git-scm scm: -- 2.36.6