X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-project-jobs.yml;h=56e825e193701e8310eab1f0ce7596c0cd87966d;hb=68a3a74f28122922978c8042be6d799678fdc976;hp=7486d8a1173d320ee2077514e5292b88a11429d4;hpb=443fcbc2e1adf401e303bcce67b0aa33e4b97c2d;p=releng.git

diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index 7486d8a11..56e825e19 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -17,7 +17,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
@@ -67,7 +67,12 @@
           fail: true
 
     builders:
-      - yardstick-unit-tests-and-docs-build
+      - yardstick-unit-tests-python-27
+      - yardstick-unit-tests-python-3
+      - yardstick-functional-tests-python-27
+      - yardstick-functional-tests-python-3
+      - yardstick-coverage-tests
+      - yardstick-pep8-tests
 
 - job-template:
     name: 'yardstick-merge-{stream}'
@@ -82,7 +87,8 @@
       - string:
           name: GS_URL
           default: '$GS_BASE{gs-pathname}'
-          description: "Directory where the build artifact will be located upon the completion     of the build."
+          description: "Directory where the build artifact will be located upon\
+            \ the completion of the build."
 
     scm:
       - git-scm
@@ -108,22 +114,125 @@
           fail: true
 
     builders:
-      - yardstick-unit-tests-and-docs-build
+      - yardstick-unit-tests-python-27
+      - yardstick-unit-tests-python-3
+      - yardstick-functional-tests-python-27
+      - yardstick-functional-tests-python-3
+      - yardstick-coverage-tests
+      - yardstick-pep8-tests
 
 ################################
 # job builders
 ################################
 
 - builder:
-    name: yardstick-unit-tests-and-docs-build
+    name: yardstick-unit-tests-python-27
     builders:
       - shell: |
           #!/bin/bash
           set -o errexit
           set -o pipefail
 
+          sudo apt-get -y autoremove
           sudo apt-get install -y build-essential python-dev python3-dev
+          sudo apt-get -y clean && sudo apt-get -y autoremove
 
-          echo "Running unit tests..."
+          echo "Running unit tests in Python 2.7 ..."
           cd $WORKSPACE
-          tox
+          tox -epy27
+
+- builder:
+    name: yardstick-unit-tests-python-3
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+
+          sudo apt-get -y autoremove
+          sudo apt-get install -y build-essential python-dev python3-dev
+          sudo apt-get -y clean && sudo apt-get -y autoremove
+
+          echo "Running unit tests in Python 3 ..."
+          cd $WORKSPACE
+          tox -epy3
+
+- builder:
+    name: yardstick-functional-tests-python-27
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+
+          sudo apt-get -y autoremove
+          sudo apt-get install -y build-essential python-dev python3-dev rabbitmq-server
+          sudo apt-get -y clean && sudo apt-get -y autoremove
+
+          echo "Configure RabbitMQ service"
+          sudo service rabbitmq-server restart
+          sudo rabbitmqctl start_app
+          if [ -z "$(sudo rabbitmqctl list_users | grep yardstick)" ]; then
+            sudo rabbitmqctl add_user yardstick yardstick
+            sudo rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
+          fi
+
+          echo "Running functional tests in Python 2.7 ..."
+          cd $WORKSPACE
+          tox -efunctional
+
+- builder:
+    name: yardstick-functional-tests-python-3
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+
+          sudo apt-get -y autoremove
+          sudo apt-get install -y build-essential python-dev python3-dev rabbitmq-server
+          sudo apt-get -y clean && sudo apt-get -y autoremove
+
+          echo "Configure RabbitMQ service"
+          sudo service rabbitmq-server restart
+          sudo rabbitmqctl start_app
+          if [ -z "$(sudo rabbitmqctl list_users | grep yardstick)" ]; then
+            sudo rabbitmqctl add_user yardstick yardstick
+            sudo rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
+          fi
+
+          echo "Running functional tests in Python 3 ..."
+          cd $WORKSPACE
+          tox -efunctional-py3
+
+- builder:
+    name: yardstick-coverage-tests
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+
+          sudo apt-get -y autoremove
+          sudo apt-get install -y build-essential python-dev python3-dev
+          sudo apt-get -y clean && sudo apt-get -y autoremove
+
+          echo "Running coverage tests ..."
+          cd $WORKSPACE
+          tox -ecoverage
+
+- builder:
+    name: yardstick-pep8-tests
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+
+          sudo apt-get -y autoremove
+          sudo apt-get install -y build-essential python-dev python3-dev
+          sudo apt-get -y clean && sudo apt-get -y autoremove
+
+          echo "Running style guidelines (PEP8) tests ..."
+          cd $WORKSPACE
+          tox -epep8