From 86edf3422072a7b3f6f4a28c9f046e32fa9d10bf Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Sun, 13 Dec 2015 01:54:02 +0100
Subject: [PATCH] Fix compass jobs to stop using hardcoded branch name

Some jobs use hardcoded branch name master which will cause issues
when we branch for brahmaputra. In order to use var for branch name
some jobs appended stream.

Please note that this will result in removal of the jobs without stream
in them and creation of new ones, causing you to lose logs.

Change-Id: I65b498b189941f7137786c5d230373c7f5ecd492
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/compass4nfv/compass4nfv.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 40402011c..1a0a6f746 100644
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -7,8 +7,8 @@
     jobs:
         - 'compass-verify-{stream}'
         - 'compass-daily-{stream}'
-        - 'compass-build-iso'
-        - 'compass-build-ppa'
+        - 'compass-build-iso-{stream}'
+        - 'compass-build-ppa-{stream}'
         - 'compass-deploy-virtual-{flavor}'
         - 'compass-deploy-bare-huawei-us'
 
@@ -56,7 +56,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
         - compass-parameter:
             installer: '{installer}'
         - string:
@@ -86,7 +86,7 @@
                 project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'
@@ -147,7 +147,7 @@
             block: true
 
 - job-template:
-    name: 'compass-build-iso'
+    name: 'compass-build-iso-{stream}'
 
     node: ericsson-build
 
@@ -169,7 +169,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: '{branch}'
 
     builders:
         - 'builder-compass-build-iso'
@@ -177,7 +177,7 @@
         - 'builder-compass-workspace-cleanup'
 
 - job-template:
-    name: 'compass-build-ppa'
+    name: 'compass-build-ppa-{stream}'
 
     description: "build ppa(using docker) in huawei lab"
 
@@ -201,7 +201,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: '{branch}'
 
     triggers:
         - timed: 'H 16 * * *'
-- 
2.16.6