X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbottlenecks%2Fbottlenecks-project-jobs.yml;h=a0abb9331a58bed5abaff28f4f59c2611d3908ef;hb=5a681846dd3c0ef0dd290384bbbcfe678683d923;hp=28b49bc8b0bcce864160af282de15fddc743ac99;hpb=a546c809cd2c42b90f36355b63fd9c6bf3f4a2a1;p=releng.git

diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml
index 28b49bc8b..a0abb9331 100644
--- a/jjb/bottlenecks/bottlenecks-project-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml
@@ -19,14 +19,18 @@
             gs-pathname: ''
             #This is used for different test suite dependent packages storage
             gs-packagepath: '/{suite}'
-        - brahmaputra:
+            disabled: false
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             gs-packagepath: '/{stream}/{suite}'
+            disabled: false
 
     suite:
         - 'rubbos'
         - 'vstf'
+        - 'posca_stress_traffic'
+        - 'posca_stress_ping'
 
 ################################
 # job templates
@@ -35,21 +39,20 @@
 - job-template:
     name: 'bottlenecks-verify-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -67,28 +70,26 @@
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
     builders:
-         - shell: |
-             echo "bottlenecks: verify job"
-         #TO DO: this should be changed when the unittest ready
+        - bottlenecks-hello
+        #- bottlenecks-unit-tests
 
 - job-template:
     name: 'bottlenecks-merge-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -101,15 +102,19 @@
                       branch-pattern: '**/{branch}'
 
     builders:
-         - shell: |
-             echo "bottlenecks: merge"
+        - bottlenecks-hello
+        #- bottlenecks-unit-tests
 
 - job-template:
     name: 'bottlenecks-{suite}-upload-artifacts-{stream}'
 
+
+    disabled: '{obj:disabled}'
+
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 1
@@ -119,15 +124,13 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - bottlenecks-parameter:
             gs-packagepath: '{gs-packagepath}'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     builders:
         - 'bottlenecks-builder-upload-artifact'
@@ -186,3 +189,35 @@
             echo "Bottlenecks: cleanup cache used for storage downloaded packages"
 
             /bin/rm -rf $CACHE_DIR
+
+- builder:
+    name: bottlenecks-unit-tests
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            set -o pipefail
+
+            echo "Running unit tests..."
+            cd $WORKSPACE
+            virtualenv $WORKSPACE/bottlenecks_venv
+            source $WORKSPACE/bottlenecks_venv/bin/activate
+
+            # install python packages
+            easy_install -U setuptools
+            easy_install -U pip
+            pip install -r requirements.txt
+
+            # unit tests
+            /bin/bash $WORKSPACE/tests.sh
+
+            deactivate
+
+- builder:
+    name: bottlenecks-hello
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+
+            echo "hello"