X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenesis%2Fgenesis-fuel.yml;h=88ac66a182da14c7f65d202c05ac346f41fc2782;hb=cab57447b21f1d02a61dc161e804607f04aab8f6;hp=d482ee7ae49ee41244f361508fd9646166054cbf;hpb=698a98f58688be1f508b0518f9d7a3f6b7c4e4bc;p=releng.git

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index d482ee7ae..88ac66a18 100644
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -10,23 +10,29 @@
     installer: 'fuel'
 
     jobs:
-        - 'genesis-fuel-verify'
+        - 'genesis-fuel-verify-{stream}'
         - 'genesis-fuel-merge'
         - 'genesis-fuel-daily-{stream}'
-        - 'genesis-fuel-build'
-        - 'genesis-fuel-deploy'
-        - 'genesis-fuel-deploy-virtual'
+        - 'genesis-fuel-build-{stream}'
+        - 'genesis-fuel-deploy-{stream}'
+        - 'genesis-fuel-deploy-virtual-master'
 
+    # stream:    branch with - in place of / (eg. stable-arno)
+    # branch:    branch (eg. stable/arno)
     stream:
         - master:
             branch: 'master'
+            gs-pathname: ''
+        - stable-arno:
+            branch: 'stable/arno'
+            gs-pathname: '/arno'
 
 ########################
 # job templates
 ########################
 
 - job-template:
-    name: 'genesis-fuel-verify'
+    name: 'genesis-fuel-verify-{stream}'
 
     project-type: freestyle
 
@@ -49,9 +55,10 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
         - fuel-parameter:
             installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - gerrit-trigger-scm:
@@ -80,7 +87,7 @@
                 project-pattern: 'genesis'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
                     pattern: 'common/**'
@@ -118,6 +125,7 @@
             branch: 'master'
         - fuel-parameter:
             installer: '{installer}'
+            gs-pathname: ''
 
     scm:
         - gerrit-trigger-scm:
@@ -165,15 +173,13 @@
             project: '{project}'
         - fuel-parameter:
             installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
-
-    triggers:
-        - timed: 'H */6 * * *'
+            branch: '{branch}'
 
     logrotate:
         daysToKeep: 30
@@ -183,15 +189,11 @@
 
     builders:
         - trigger-builds:
-          - project: 'genesis-fuel-build'
+          - project: 'genesis-fuel-build-{stream}'
             git-revision: true
             block: true
         - trigger-builds:
-          - project: 'genesis-fuel-deploy-virtual'
-            git-revision: true
-            block: false
-        - trigger-builds:
-          - project: 'genesis-fuel-deploy'
+          - project: 'genesis-fuel-deploy-{stream}'
             git-revision: true
             block: true
         - trigger-builds:
@@ -199,7 +201,7 @@
             block: true
 
 - job-template:
-    name: 'genesis-fuel-build'
+    name: 'genesis-fuel-build-{stream}'
 
     project-type: freestyle
 
@@ -216,12 +218,13 @@
             project: '{project}'
         - fuel-parameter:
             installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
+            branch: '{branch}'
 
     builders:
         - 'fuel-build'
@@ -229,7 +232,7 @@
         - 'fuel-workspace-cleanup'
 
 - job-template:
-    name: 'genesis-fuel-deploy'
+    name: 'genesis-fuel-deploy-{stream}'
 
     project-type: freestyle
 
@@ -242,6 +245,7 @@
             project: '{project}'
         - fuel-parameter:
             installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
         - string:
             name: GIT_BASE
             default: ssh://gerrit.opnfv.org:29418/$PROJECT
@@ -251,7 +255,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
+            branch: '{branch}'
 
     logrotate:
         daysToKeep: 30
@@ -264,7 +268,7 @@
         - 'fuel-deploy'
 
 - job-template:
-    name: 'genesis-fuel-deploy-virtual'
+    name: 'genesis-fuel-deploy-virtual-master'
 
     project-type: freestyle
 
@@ -277,6 +281,7 @@
             project: '{project}'
         - fuel-parameter:
             installer: '{installer}'
+            gs-pathname: ''
 
     scm:
         - git-scm:
@@ -317,7 +322,7 @@
             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_URL
-            default: artifacts.opnfv.org/$PROJECT/$INSTALLER
+            default: artifacts.opnfv.org/$PROJECT/$INSTALLER{gs-pathname}
             description: "URL to Google Storage."
 
 ########################
@@ -459,11 +464,6 @@
             set -o nounset
             set -o pipefail
 
-            # log info to console
-            echo "Downloading the $INSTALLER artifact. This could take some time..."
-            echo "--------------------------------------------------------"
-            echo
-
             # get the latest.properties file in order to get info regarding latest artifact
             curl -s -o $WORKSPACE/latest.properties http://$GS_URL/latest.properties
 
@@ -473,6 +473,12 @@
             # source the file so we get OPNFV vars
             source latest.properties
 
+            # log info to console
+            echo "Downloading the $INSTALLER artifact using URL http://$OPNFV_ARTIFACT_URL"
+            echo "This could take some time..."
+            echo "--------------------------------------------------------"
+            echo
+
             # download the file
             curl -s -o $WORKSPACE/opnfv.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1