Merge "add google storage path postfix for bottlenecks project"

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index bcc3248..8882879 100644 (file)
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -53,7 +53,6 @@
 
     jobs:
         - 'fuel-{sdn-controller}-{pod}-daily-{stream}'
-        - 'fuel-build-{pod}-daily-{stream}'
         - 'fuel-deploy-{pod}-daily-{stream}'
 
 ########################
@@ -102,13 +101,6 @@
             branch: '{branch}'
 
     builders:
-        - multijob:
-            name: build
-            condition: SUCCESSFUL
-            projects:
-                - name: 'fuel-build-{pod}-daily-{stream}'
-                  git-revision: true
-                  kill-phase-on: FAILURE
         - multijob:
             name: deploy
             condition: SUCCESSFUL
@@ -132,48 +124,6 @@
                   current-parameters: true
                   kill-phase-on: NEVER
 
-- job-template:
-    name: 'fuel-build-{pod}-daily-{stream}'
-
-    concurrent: false
-
-    properties:
-        - throttle:
-            enabled: true
-            max-total: 1
-            max-per-node: 1
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - 'ericsson-ca-build-1-defaults'
-        - '{installer}-defaults'
-        - fuel-ci-parameter:
-            gs-pathname: '{gs-pathname}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - timeout:
-            timeout: 360
-            fail: true
-
-    builders:
-        - shell:
-            !include-raw ./fuel-build.sh
-        - shell:
-            !include-raw ./fuel-upload-artifact.sh
-        - shell:
-            !include-raw ./fuel-workspace-cleanup.sh
-
-    publishers:
-        - email:
-            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
-
 - job-template:
     name: 'fuel-deploy-{pod}-daily-{stream}'
 

diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index a55c785..50df1bd 100644 (file)
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -18,6 +18,7 @@
 #            gs-pathname: '/{stream}'
 
     jobs:
+        - 'fuel-build-daily-{stream}'
         - 'fuel-verify-build-{stream}'
         - 'fuel-merge-build-{stream}'
         - 'fuel-merge-deploy-virtual-{stream}'
@@ -25,6 +26,51 @@
 ########################
 # job templates
 ########################
+- job-template:
+    name: 'fuel-build-daily-{stream}'
+
+    concurrent: false
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - 'ericsson-ca-build-1-defaults'
+        - '{installer}-defaults'
+        - fuel-project-parameter:
+            gs-pathname: '{gs-pathname}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    triggers:
+        - pollscm: '0 H/6 * * *'
+
+    wrappers:
+        - timeout:
+            timeout: 360
+            fail: true
+
+    builders:
+        - shell:
+            !include-raw ./fuel-build.sh
+        - shell:
+            !include-raw ./fuel-upload-artifact.sh
+        - shell:
+            !include-raw ./fuel-workspace-cleanup.sh
+
+    publishers:
+        - email:
+            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
+
 - job-template:
     name: 'fuel-verify-build-{stream}'
 

diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index c01d7ae..f29219c 100644 (file)
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -11,11 +11,11 @@
 # only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
-            branch: 'master'
+            branch: '{stream}'
             gs-pathname: ''
 #        - brahmaputra:
 #            branch: 'stable/brahmaputra'
-#            gs-pathname: '/brahmaputra'
+#            gs-pathname: '/{stream}'
 
 - job-template:
     name: 'ovsnfv-verify-{stream}'
@@ -26,6 +26,10 @@
         - gerrit-parameter:
             branch: '{branch}'
         - 'intel-us-build-2-defaults'
+        - string:
+            name: GS_URL
+            default: '$GS_BASE{gs-pathname}'
+            description: "Directory where the build artifact will be located upon the completion of the build."
 
     scm:
         - gerrit-trigger-scm:
@@ -71,6 +75,10 @@
         - gerrit-parameter:
             branch: '{branch}'
         - 'intel-us-build-2-defaults'
+        - string:
+            name: GS_URL
+            default: '$GS_BASE{gs-pathname}'
+            description: "Directory where the build artifact will be located upon the completion of the build."
 
     scm:
         - gerrit-trigger-scm:
@@ -110,8 +118,8 @@
         - 'intel-us-build-2-defaults'
         - string:
             name: GS_URL
-            default: gs://$GS_BASE{gs-pathname}
-            description: "URL to Google Storage."
+            default: '$GS_BASE{gs-pathname}'
+            description: "Directory where the build artifact will be located upon the completion of the build."
 
     scm:
         - git-scm:

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index b94fd8f..8d6f551 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -9,11 +9,11 @@
             description: "JJB configured PROJECT parameter to identify an opnfv Gerrit project"
         - string:
             name: GS_BASE
-            default: artifacts.opnfv.org/$PROJECT/
+            default: artifacts.opnfv.org/$PROJECT
             description: "URL to Google Storage."
         - string:
             name: GS_BASE_PROXY
-            default: build.opnfv.org/artifacts/$PROJECT/
+            default: build.opnfv.org/artifacts/$PROJECT
             description: "URL to Google Storage proxy"
 
 - parameter:

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 470bf68..0ef6c9b 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -133,7 +133,7 @@
                 -e "POD_NAME=${NODE_NAME}" \
                 -e "EXTERNAL_NETWORK=net04_ext" \
                 opnfv/yardstick \
-                run_tests.sh \
+                run_tests.sh $YARDSTICK_DB_BACKEND \
                 $YARDSTICK_SUITE_NAME
 
             echo "Yardstick: done!"
@@ -177,7 +177,7 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: 'none'
+            default: ''
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -185,7 +185,7 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: 'none'
+            default: ''
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -193,7 +193,7 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: 'db_args'
+            default: '-r 213.77.62.197'
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -201,5 +201,5 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: 'none'
+            default: ''
             description: 'Arguments to use in order to choose the backend DB'