From dab7af989aa641fcee66f585ccfbdc47ab64dd16 Mon Sep 17 00:00:00 2001
From: Deepshikha khandelwal <dkhandel@redhat.com>
Date: Wed, 31 Jul 2019 14:38:11 +0530
Subject: Bug fix for a release based pipeline

The nigtly pipeline (release-x) is not running for a particular release
branch it is actually triggered for. It is picking up master branch for every
every trigger.

This patch adds the parameter based trigger for specific refspec and branch

Change-Id: I88b3b0a48d5286d2007c6c1347100b294757a81e
---
 build-gluster-org/jobs/regression-test-burn-in.yml        | 13 ++++++++++++-
 build-gluster-org/jobs/regression-test-with-multiplex.yml | 15 +++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'build-gluster-org')

diff --git a/build-gluster-org/jobs/regression-test-burn-in.yml b/build-gluster-org/jobs/regression-test-burn-in.yml
index b70e8e3..94aebf3 100644
--- a/build-gluster-org/jobs/regression-test-burn-in.yml
+++ b/build-gluster-org/jobs/regression-test-burn-in.yml
@@ -8,7 +8,8 @@
     scm:
     - git:
         branches:
-        - origin/master
+        - $GERRIT_BRANCH
+        refspec: $GERRIT_REFSPEC
         url: git://review.gluster.org/glusterfs.git
         depth: 1
         wipe-workspace: false
@@ -31,6 +32,16 @@
     builders:
     - shell: !include-raw: ../scripts/regression-test-burn-in.sh
 
+    parameters:
+    - string:
+        default: refs/heads/master
+        description: 'For review 12345 and patch set 6, this will be refs/changes/45/12345/6. Default: Tip of master'
+        name: GERRIT_REFSPEC
+    - string:
+        default: master
+        description: 'Name of the branch you want to build from. We usually build from master'
+        name: GERRIT_BRANCH
+
     wrappers:
     - timestamps
     - timeout:
diff --git a/build-gluster-org/jobs/regression-test-with-multiplex.yml b/build-gluster-org/jobs/regression-test-with-multiplex.yml
index 48f9b6a..eeca852 100644
--- a/build-gluster-org/jobs/regression-test-with-multiplex.yml
+++ b/build-gluster-org/jobs/regression-test-with-multiplex.yml
@@ -8,7 +8,8 @@
     scm:
     - git:
         branches:
-        - origin/master
+        - $GERRIT_BRANCH
+        refspec: $GERRIT_REFSPEC
         url: git://review.gluster.org/glusterfs.git
         depth: 1
         wipe-workspace: false
@@ -31,6 +32,16 @@
     builders:
     - shell: !include-raw: ../scripts/regression-test-with-multiplex.sh
 
+    parameters:
+    - string:
+        default: refs/heads/master
+        description: 'For review 12345 and patch set 6, this will be refs/changes/45/12345/6. Default: Tip of master'
+        name: GERRIT_REFSPEC
+    - string:
+        default: master
+        description: 'Name of the branch you want to build from. We usually build from master'
+        name: GERRIT_BRANCH
+
     wrappers:
     - timestamps
     - timeout:
@@ -40,4 +51,4 @@
     - credentials-binding:
         - file:
            credential-id: 4db32c5c-890f-4f06-a1d8-7c9a128884e8
-           variable: LOG_KEY    
+           variable: LOG_KEY
-- 
cgit