From d69071f1fadf4e0db9c881f27c07cb527a43589e Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Fri, 12 Jun 2015 13:15:04 +0200
Subject: Fix gs-pathname as Google Storage doesn't handle trailing slash

JIRA: OCTO-89

Change-Id: I85cbb81437c9ae6207d18cfdc4d44baad67fff42
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/genesis/genesis-fuel.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'jjb/genesis')

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index b6c082366..79347b057 100644
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -25,7 +25,7 @@
             gs-pathname: ''
         - stable-arno:
             branch: 'stable/arno'
-            gs-pathname: 'arno'
+            gs-pathname: '/arno'
 
 ########################
 # job templates
@@ -179,7 +179,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
+            branch: '{branch}'
 
     logrotate:
         daysToKeep: 30
@@ -224,7 +224,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
+            branch: '{branch}'
 
     builders:
         - 'fuel-build'
@@ -255,7 +255,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
+            branch: '{branch}'
 
     logrotate:
         daysToKeep: 30
@@ -320,13 +320,9 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
-        - string:
-            name: GS_PATHNAME
-            default: '{gs-pathname}'
-            description: "Subdirectory to store artifacts for different branches."
         - string:
             name: GS_URL
-            default: artifacts.opnfv.org/$PROJECT/$INSTALLER/$GS_PATHNAME
+            default: artifacts.opnfv.org/$PROJECT/$INSTALLER{gs-pathname}
             description: "URL to Google Storage."
 
 ########################
@@ -439,6 +435,7 @@
         - shell: |
             #!/bin/bash
             set -o errexit
+            set -o nounset
             set -o pipefail
 
             # log info to console
@@ -464,6 +461,7 @@
         - shell: |
             #!/bin/bash
             set -o errexit
+            set -o nounset
             set -o pipefail
 
             # get the latest.properties file in order to get info regarding latest artifact
-- 
cgit 1.2.3-korg