Enable virtual deploy job for fuel

[releng.git] / jjb / genesis / genesis-fuel.yml

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index 6dd16ab..88ac66a 100644 (file)
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -15,7 +15,7 @@
         - 'genesis-fuel-daily-{stream}'
         - 'genesis-fuel-build-{stream}'
         - 'genesis-fuel-deploy-{stream}'
-        - 'genesis-fuel-deploy-virtual'
+        - 'genesis-fuel-deploy-virtual-master'
 
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
@@ -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
@@ -268,11 +268,11 @@
         - 'fuel-deploy'
 
 - job-template:
-    name: 'genesis-fuel-deploy-virtual'
+    name: 'genesis-fuel-deploy-virtual-master'
 
     project-type: freestyle
 
-    disabled: true
+    disabled: false
 
     node: ericsson-build
 
@@ -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."
 
 ########################