Merge "barometer: Add job definition for barometer-collectd-experimental image"

[releng.git] / jjb / yardstick / yardstick-project-jobs.yaml

diff --git a/jjb/yardstick/yardstick-project-jobs.yaml b/jjb/yardstick/yardstick-project-jobs.yaml
index ace2e02..74734b8 100644 (file)
--- a/jjb/yardstick/yardstick-project-jobs.yaml
+++ b/jjb/yardstick/yardstick-project-jobs.yaml
@@ -17,11 +17,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - gambia: &gambia
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-      - fraser:
+      - hunter: &hunter
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
@@ -71,9 +67,7 @@
           fail: true
 
     builders:
-      - 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
@@ -118,9 +112,7 @@
           fail: true
 
     builders:
-      - 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
@@ -129,22 +121,6 @@
 # job builders
 ################################
 
-- builder:
-    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 in Python 2.7 ..."
-          cd $WORKSPACE
-          tox -epy27
-
 - builder:
     name: yardstick-unit-tests-python-3
     builders:
@@ -161,30 +137,6 @@
           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: